Initial Implementation of Iframe Attribute for Feature Policy (Part 3)

content/browser/site_per_process_browsertest.cc

Index: content/browser/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 8067488dd7c255d192deea444136fb149b9c7531..d81dccb4934daa64ae032e8ff803cfc3b7252648 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -235,15 +235,6 @@ class TestInputEventObserver : public RenderWidgetHost::InputEventObserver {
   DISALLOW_COPY_AND_ASSIGN(TestInputEventObserver);
 };
 
-double GetFrameDeviceScaleFactor(const 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;
-}
-
 // This method returns the scale factor on Android and 1.0 on other
 // platforms in order to adjust coordinates appropriately.
 double GetAdjustmentScaleFactorForAndroid(Shell* shell) {
@@ -743,6 +734,15 @@ bool operator==(const ParsedFeaturePolicyDeclaration& first,
          std::tie(second.feature, second.matches_all_origins, second.origins);
 }
 
+double GetFrameDeviceScaleFactor(const ToRenderFrameHost& adapter) {

[jochen (gone - plz use gerrit), 2017/03/20 07:22:37]

why did you move this?

+  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(SitePerProcessHighDPIBrowserTest,
                        SubframeLoadsWithCorrectDeviceScaleFactor) {
   GURL main_url(embedded_test_server()->GetURL(