| Index: content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| 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 f3f8c905df22a73d55062c2b3f01d56e6bc0e05d..2319e404a7c5cf5417de477e786832b8d2345da0 100644
|
| --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| @@ -377,13 +377,9 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
|
| // - interactively, when user does an overscroll gesture
|
| // - interactively, when user navigates in history without the overscroll
|
| // gesture.
|
| -#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) {
|
| +// Flaky on Windows and ChromeOS (http://crbug.com/357311). Might be related to
|
| +// OverscrollNavigation test.
|
| +IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, DISABLED_OverscrollScreenshot) {
|
| // Disable the test for WinXP. See http://crbug/294116.
|
| #if defined(OS_WIN)
|
| if (base::win::GetVersion() < base::win::VERSION_VISTA) {
|
|
|