Fix page zoom to be frame-centric for out-of-process frames.

content/browser/host_zoom_map_impl_browsertest.cc

Index: content/browser/host_zoom_map_impl_browsertest.cc
diff --git a/content/browser/host_zoom_map_impl_browsertest.cc b/content/browser/host_zoom_map_impl_browsertest.cc
index fbfdc3c62e54886f54c3c429c3dfd4062217baa8..c4f6120f8627bc6d064b63e59c98045aa2f17219 100644
--- a/content/browser/host_zoom_map_impl_browsertest.cc
+++ b/content/browser/host_zoom_map_impl_browsertest.cc
@@ -8,19 +8,25 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/content_browser_test.h"
+#include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
+#include "net/dns/mock_host_resolver.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class HostZoomMapImplBrowserTest : public ContentBrowserTest {
+ protected:
+  void SetUpOnMainThread() override {
+    host_resolver()->AddRule("*", "127.0.0.1");
+    ASSERT_TRUE(embedded_test_server()->Start());
+  }
 };
 
 void RunTestForURL(const GURL& url,
                    Shell* shell,
                    double host_zoom_level,
                    double temp_zoom_level) {
-  shell->LoadURL(url);
   WebContents* web_contents = shell->web_contents();
 
   HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>(
@@ -49,7 +55,10 @@ void RunTestForURL(const GURL& url,
 // stored by host value, and can distinguish temporary zoom levels from
 // these.
 IN_PROC_BROWSER_TEST_F(HostZoomMapImplBrowserTest, GetZoomForView_Host) {
-  GURL url("http://abc.com");
+  GURL url(embedded_test_server()->GetURL("abc.com", "/"));
+
+  // We must navigate so the WebContents has a committed entry.
+  EXPECT_TRUE(NavigateToURL(shell(), url));
 
   HostZoomMap* host_zoom_map =
       HostZoomMap::GetForWebContents(shell()->web_contents());
@@ -68,7 +77,10 @@ IN_PROC_BROWSER_TEST_F(HostZoomMapImplBrowserTest, GetZoomForView_Host) {
 // from these.
 IN_PROC_BROWSER_TEST_F(HostZoomMapImplBrowserTest,
                        GetZoomForView_HostAndScheme) {

[alexmos, 2016/04/07 23:48:08]

The existing tests don't seem to cover the OOPIF cases.  Were you planning to
add a new test for that?

[wjmaclean, 2016/04/08 20:13:29]

Yes, but I like to write tests once the rest of the CL has settled. Once I know
the approach is ok, then I'll add some tests before a final LGTM.

-  GURL url("http://abc.com");
+  GURL url(embedded_test_server()->GetURL("abc.com", "/"));
+
+  // We must navigate so the WebContents has a committed entry.
+  EXPECT_TRUE(NavigateToURL(shell(), url));
 
   HostZoomMap* host_zoom_map =
       HostZoomMap::GetForWebContents(shell()->web_contents());