Fix device scale factor for interstitials.

chrome/browser/chrome_site_per_process_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "ui/display/display_switches.h"
 #include "url/gurl.h"
 
 class ChromeSitePerProcessTest : public InProcessBrowserTest {
  public:
   ChromeSitePerProcessTest() {}
   ~ChromeSitePerProcessTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     content::IsolateAllSitesForTesting(command_line);
   }
 
   void SetUpOnMainThread() override {
     host_resolver()->AddRule("*", "127.0.0.1");
     ASSERT_TRUE(embedded_test_server()->Start());
     content::SetupCrossSiteRedirector(embedded_test_server());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeSitePerProcessTest);
 };
 
+class SitePerProcessHighDPIExpiredCertBrowserTest
+    : public ChromeSitePerProcessTest {
+ public:
+  const double kDeviceScaleFactor = 2.0;
+
+  SitePerProcessHighDPIExpiredCertBrowserTest()
+      : https_server_expired_(net::EmbeddedTestServer::TYPE_HTTPS) {
+    https_server_expired_.SetSSLConfig(net::EmbeddedTestServer::CERT_EXPIRED);
+  }
+
+  net::EmbeddedTestServer https_server_expired_;
+
+ protected:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    ChromeSitePerProcessTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitchASCII(
+        switches::kForceDeviceScaleFactor,
+        base::StringPrintf("%f", kDeviceScaleFactor));
+  }
+
+  void SetUpOnMainThread() override {
+    ChromeSitePerProcessTest::SetUpOnMainThread();
+    ASSERT_TRUE(https_server_expired_.Start());
+  }
+};
+
+double GetFrameDeviceScaleFactor(const content::ToRenderFrameHost& adapter) {
+  double device_scale_factor;
+  const char kGetFrameDeviceScaleFactor[] =
+      "window.domAutomationController.send(window.devicePixelRatio);";
+  EXPECT_TRUE(ExecuteScriptAndExtractDouble(adapter, kGetFrameDeviceScaleFactor,
+                                            &device_scale_factor));
+  return device_scale_factor;
+}
+
+IN_PROC_BROWSER_TEST_F(SitePerProcessHighDPIExpiredCertBrowserTest,
+                       InterstitialLoadsWithCorrectDeviceScaleFactor) {
+  GURL main_url(embedded_test_server()->GetURL(
+      "a.com", "/cross_site_iframe_factory.html?a(b)"));
+  ui_test_utils::NavigateToURL(browser(), main_url);
+
+  EXPECT_EQ(SitePerProcessHighDPIExpiredCertBrowserTest::kDeviceScaleFactor,
+            GetFrameDeviceScaleFactor(
+                browser()->tab_strip_model()->GetActiveWebContents()));
+
+  // Navigate to page with expired cert.
+  GURL bad_cert_url(https_server_expired_.GetURL("c.com", "/title1.html"));
+  ui_test_utils::NavigateToURL(browser(), bad_cert_url);
+  WaitForInterstitialAttach(
+      browser()->tab_strip_model()->GetActiveWebContents());
+  EXPECT_TRUE(browser()
+                  ->tab_strip_model()
+                  ->GetActiveWebContents()
+                  ->ShowingInterstitialPage());
+
+  // Here we check the device scale factor in use via the interstitial's
+  // RenderFrameHost; doing the check directly via the 'active web contents'
+  // does not give us the device scale factor for the interstitial.
+  content::RenderFrameHost* interstitial_frame_host =
+      browser()
+          ->tab_strip_model()
+          ->GetActiveWebContents()
+          ->GetInterstitialPage()
+          ->GetMainFrame();
+
+  EXPECT_EQ(SitePerProcessHighDPIExpiredCertBrowserTest::kDeviceScaleFactor,
+            GetFrameDeviceScaleFactor(interstitial_frame_host));
+

[wjmaclean, 2016/08/23 18:16:01]

I'm aware of this blank line, and will remove it in the next patch.

+}
+
 // Verify that browser shutdown path works correctly when there's a
 // RenderFrameProxyHost for a child frame.
 IN_PROC_BROWSER_TEST_F(ChromeSitePerProcessTest, RenderFrameProxyHostShutdown) {
   GURL main_url(embedded_test_server()->GetURL(
         "a.com",
         "/frame_tree/page_with_two_frames_remote_and_local.html"));
   ui_test_utils::NavigateToURL(browser(), main_url);
 }
 
 // Verify that origin replication allows JS access to localStorage, database,
@@ skipping 114 matching lines @@
       main_lost_focus = true;
     if (status == "\"popup-got-focus\"")
       popup_got_focus = true;
     if (main_lost_focus && popup_got_focus)
       break;
   }
 
   // The popup should be focused now.
   EXPECT_EQ(popup, browser()->tab_strip_model()->GetActiveWebContents());
 }