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 71a110d715a6edf0190907bbb8a242aa19500e79..76d8f412226a81ef1220d33562366d13166725d7 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) { |
iclelland
2017/03/16 19:51:23
This is still a bit weird -- I think you might nee
|
- 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) { |
+ 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( |