Index: chrome/browser/apps/guest_view/web_view_browsertest.cc |
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc |
index 613aef1296ec2118a26f018b8ba341b215895546..e78969b336dd7285235381ade25caff184ad44b4 100644 |
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc |
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc |
@@ -745,6 +745,18 @@ class WebViewDPITest : public WebViewTest { |
static float scale() { return 2.0f; } |
}; |
+class WebViewWithZoomForDSFTest : public WebViewTest { |
+ protected: |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
+ WebViewTest::SetUpCommandLine(command_line); |
+ command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, |
+ base::StringPrintf("%f", scale())); |
+ command_line->AppendSwitch(switches::kEnableUseZoomForDSF); |
+ } |
+ |
+ static float scale() { return 2.0f; } |
+}; |
+ |
class WebContentsAudioMutedObserver : public content::WebContentsObserver { |
public: |
explicit WebContentsAudioMutedObserver(content::WebContents* web_contents) |
@@ -939,6 +951,10 @@ IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeHeight) { |
TestHelper("testAutosizeHeight", "web_view/shim", NO_TEST_SERVER); |
} |
+IN_PROC_BROWSER_TEST_F(WebViewWithZoomForDSFTest, Shim_TestAutosizeHeight) { |
+ TestHelper("testAutosizeHeight", "web_view/shim", NO_TEST_SERVER); |
+} |
+ |
IN_PROC_BROWSER_TEST_F(WebViewSizeTest, Shim_TestAutosizeHeight) { |
TestHelper("testAutosizeHeight", "web_view/shim", NO_TEST_SERVER); |
} |
@@ -947,6 +963,11 @@ IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeBeforeNavigation) { |
TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER); |
} |
+IN_PROC_BROWSER_TEST_F(WebViewWithZoomForDSFTest, |
+ Shim_TestAutosizeBeforeNavigation) { |
+ TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER); |
+} |
+ |
IN_PROC_BROWSER_TEST_F(WebViewSizeTest, Shim_TestAutosizeBeforeNavigation) { |
TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER); |
} |
@@ -955,6 +976,11 @@ IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeRemoveAttributes) { |
TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); |
} |
+IN_PROC_BROWSER_TEST_F(WebViewWithZoomForDSFTest, |
+ Shim_TestAutosizeRemoveAttributes) { |
+ TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); |
+} |
+ |
IN_PROC_BROWSER_TEST_F(WebViewSizeTest, Shim_TestAutosizeRemoveAttributes) { |
TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); |
} |