diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 21:09:58 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 21:09:58 +0000 |
| commit | ed53d9280107546a775aa8d2eab019986ed17b3b (patch) | |
| tree | e67332ffc21df4cb4bbeabe14f81f7759fd5d377 | |
| parent | 042b7f24c2af6deabeddd6a31b5fada277b046ff (diff) | |
| download | chromium_src-ed53d9280107546a775aa8d2eab019986ed17b3b.zip chromium_src-ed53d9280107546a775aa8d2eab019986ed17b3b.tar.gz chromium_src-ed53d9280107546a775aa8d2eab019986ed17b3b.tar.bz2 | |
Disable WebContentsViewAuraTest.OverscrollScreenshot on Windows as its flaky.
BUG=357311
TBR=sadrul
Review URL: https://codereview.chromium.org/213703007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259987 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/web_contents/web_contents_view_aura_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc index 9b0b16b..adfebd1 100644 --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc @@ -380,7 +380,13 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, // - interactively, when user does an overscroll gesture // - interactively, when user navigates in history without the overscroll // gesture. -IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, OverscrollScreenshot) { +#if defined(OS_WIN) +// http://crbug.com/357311 +#define MAYBE_OverscrollScreenshot DISABLED_OverscrollScreenshot +#else +#define MAYBE_OverscrollScreenshot OverscrollScreenshot +#endif +IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, MAYBE_OverscrollScreenshot) { // Disable the test for WinXP. See http://crbug/294116. #if defined(OS_WIN) if (base::win::GetVersion() < base::win::VERSION_VISTA) { |