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

content/browser/site_per_process_browsertest.cc

 // Copyright (c) 2012 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 "content/browser/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 217 matching lines @@
     events_received_.push_back(event.type());
   };
 
  private:
   RenderWidgetHost* host_;
   std::vector<blink::WebInputEvent::Type> events_received_;
 
   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) {
 #if defined(OS_ANDROID)
   return GetFrameDeviceScaleFactor(shell->web_contents());
 #else
   return 1.0;
 #endif
 }
 
@@ skipping 479 matching lines @@
     return result;
   }
 };
 
 bool operator==(const ParsedFeaturePolicyDeclaration& first,
                 const ParsedFeaturePolicyDeclaration& second) {
   return std::tie(first.feature, first.matches_all_origins, first.origins) ==
          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(
       "a.com", "/cross_site_iframe_factory.html?a(b)"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
 
   // On Android forcing device scale factor does not work for tests, therefore
   // we ensure that make frame and iframe have the same DIP scale there, but
   // not necessarily kDeviceScaleFactor.
   const double expected_dip_scale =
@@ skipping 9144 matching lines @@
 
   // Try the same navigation, but use the browser-initiated path.
   NavigateFrameToURL(root->child_at(0), frame_url);
   EXPECT_FALSE(root->child_at(0)->render_manager()->pending_frame_host());
   EXPECT_EQ(root->child_at(0)->current_url(), redirected_url);
   EXPECT_EQ(b_site_instance,
             root->child_at(0)->current_frame_host()->GetSiteInstance());
 }
 
 }  // namespace content