Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: chrome/browser/apps/web_view_browsertest.cc

Issue 93703007: Disable WebViewTest.Size for flakiness on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "apps/ui/native_app_window.h" 5 #include "apps/ui/native_app_window.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/apps/app_browsertest_util.h" 9 #include "chrome/browser/apps/app_browsertest_util.h"
10 #include "chrome/browser/automation/automation_util.h" 10 #include "chrome/browser/automation/automation_util.h"
(...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after
1014 // Now close the app while interstitial page being shown in guest. 1014 // Now close the app while interstitial page being shown in guest.
1015 apps::ShellWindow* window = GetFirstShellWindow(); 1015 apps::ShellWindow* window = GetFirstShellWindow();
1016 window->GetBaseWindow()->Close(); 1016 window->GetBaseWindow()->Close();
1017 } 1017 }
1018 1018
1019 IN_PROC_BROWSER_TEST_F(WebViewTest, ShimSrcAttribute) { 1019 IN_PROC_BROWSER_TEST_F(WebViewTest, ShimSrcAttribute) {
1020 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/src_attribute")) 1020 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/src_attribute"))
1021 << message_; 1021 << message_;
1022 } 1022 }
1023 1023
1024 IN_PROC_BROWSER_TEST_F(WebViewTest, Size) { 1024 // Disabled on Windows for flaky failures: crbug.com/329032
1025 #if defined(OS_WIN)
1026 #define MAYBE_Size DISABLED_Size
1027 #else
1028 #define MAYBE_Size Size
1029 #endif
1030 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_Size) {
1025 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/size")) << message_; 1031 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/size")) << message_;
1026 } 1032 }
1027 1033
1028 // This test verifies that prerendering has been disabled inside <webview>. 1034 // This test verifies that prerendering has been disabled inside <webview>.
1029 // This test is here rather than in PrerenderBrowserTest for testing convenience 1035 // This test is here rather than in PrerenderBrowserTest for testing convenience
1030 // only. If it breaks then this is a bug in the prerenderer. 1036 // only. If it breaks then this is a bug in the prerenderer.
1031 IN_PROC_BROWSER_TEST_F(WebViewTest, NoPrerenderer) { 1037 IN_PROC_BROWSER_TEST_F(WebViewTest, NoPrerenderer) {
1032 ASSERT_TRUE(StartEmbeddedTestServer()); 1038 ASSERT_TRUE(StartEmbeddedTestServer());
1033 content::WebContents* guest_web_contents = 1039 content::WebContents* guest_web_contents =
1034 LoadGuest( 1040 LoadGuest(
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
1867 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, 1873 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor,
1868 WebViewCaptureTest, 1874 WebViewCaptureTest,
1869 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); 1875 ::testing::Values(std::string(switches::kDisableThreadedCompositing)));
1870 1876
1871 // http://crbug.com/171744 1877 // http://crbug.com/171744
1872 #if !defined(OS_MACOSX) 1878 #if !defined(OS_MACOSX)
1873 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, 1879 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor,
1874 WebViewCaptureTest, 1880 WebViewCaptureTest,
1875 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); 1881 ::testing::Values(std::string(switches::kEnableThreadedCompositing)));
1876 #endif 1882 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698