| Index: chrome/browser/apps/web_view_browsertest.cc
|
| diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc
|
| index 6e778f40e3cba6bcbe589b506c77e7149f1e7138..a62d3dcd3a41cf217ff7d6cf0be5272cc02861e0 100644
|
| --- a/chrome/browser/apps/web_view_browsertest.cc
|
| +++ b/chrome/browser/apps/web_view_browsertest.cc
|
| @@ -37,6 +37,7 @@
|
| #include "net/test/embedded_test_server/embedded_test_server.h"
|
| #include "net/test/embedded_test_server/http_request.h"
|
| #include "net/test/embedded_test_server/http_response.h"
|
| +#include "ui/gfx/switches.h"
|
| #include "ui/gl/gl_switches.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -771,6 +772,17 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
|
| content::WebContents* embedder_web_contents_;
|
| };
|
|
|
| +class WebViewDPITest : public WebViewTest {
|
| + protected:
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + WebViewTest::SetUpCommandLine(command_line);
|
| + command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor,
|
| + base::StringPrintf("%f", scale()));
|
| + }
|
| +
|
| + static float scale() { return 2.0f; }
|
| +};
|
| +
|
| // This test verifies that hiding the guest triggers WebContents::WasHidden().
|
| IN_PROC_BROWSER_TEST_F(WebViewTest, GuestVisibilityChanged) {
|
| LoadAppWithGuest("web_view/visibility_changed");
|
| @@ -894,13 +906,26 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestAutosizeAfterNavigation) {
|
| TestHelper("testAutosizeAfterNavigation", "web_view/shim", NO_TEST_SERVER);
|
| }
|
|
|
| +IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeHeight) {
|
| + TestHelper("testAutosizeHeight", "web_view/shim", NO_TEST_SERVER);
|
| +}
|
| +
|
| IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeHeight) {
|
| TestHelper("testAutosizeHeight", "web_view/shim", NO_TEST_SERVER);
|
| }
|
|
|
| +IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeBeforeNavigation) {
|
| + TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER);
|
| +}
|
| +
|
| IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeBeforeNavigation) {
|
| TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER);
|
| }
|
| +
|
| +IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeRemoveAttributes) {
|
| + TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER);
|
| +}
|
| +
|
| IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeRemoveAttributes) {
|
| TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER);
|
| }
|
|
|