diff options
Diffstat (limited to 'chrome/browser/apps/web_view_browsertest.cc')
| -rw-r--r-- | chrome/browser/apps/web_view_browsertest.cc | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc index c28bdf8..4e6a565 100644 --- a/chrome/browser/apps/web_view_browsertest.cc +++ b/chrome/browser/apps/web_view_browsertest.cc @@ -20,6 +20,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents_delegate.h" +#include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/fake_speech_recognition_manager.h" #include "net/test/embedded_test_server/embedded_test_server.h" @@ -258,6 +259,17 @@ class WebViewTest : public extensions::PlatformAppBrowserTest { } } + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + const testing::TestInfo* const test_info = + testing::UnitTest::GetInstance()->current_test_info(); + + // Force SW rendering to check autosize bug. + if (!strncmp(test_info->name(), "AutoSizeSW", strlen("AutosizeSW"))) + command_line->AppendSwitch(switches::kDisableForceCompositingMode); + + extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line); + } + // This method is responsible for initializing a packaged app, which contains // multiple webview tags. The tags have different partition identifiers and // their WebContent objects are returned as output. The method also verifies @@ -567,6 +579,20 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, << message_; } +IN_PROC_BROWSER_TEST_F(WebViewTest, AutoSize) { + ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize")) + << message_; +} + +#if !defined(OS_CHROMEOS) +// This test ensures <webview> doesn't crash in SW rendering when autosize is +// turned on. +IN_PROC_BROWSER_TEST_F(WebViewTest, AutoSizeSW) { + ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize")) + << message_; +} +#endif + IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeAfterNavigation) { TestHelper("testAutosizeAfterNavigation", "DoneShimTest.PASSED", @@ -587,9 +613,8 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeRemoveAttributes) { "web_view/shim"); } -// This test is flaky. crbug.com/282116 IN_PROC_BROWSER_TEST_F(WebViewTest, - DISABLED_Shim_TestAutosizeWithPartialAttributes) { + Shim_TestAutosizeWithPartialAttributes) { TestHelper("testAutosizeWithPartialAttributes", "DoneShimTest.PASSED", "DoneShimTest.FAILED", |