| 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 f88e6e790cddbbfcb044563d20a85707d9d978e9..1e1411e62f87b98f29753a7a5682aca3d7a4aab9 100644
|
| --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| @@ -870,9 +870,9 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, WebContentsViewReparent) {
|
| EXPECT_TRUE(rwhva->has_snapped_to_boundary());
|
| }
|
|
|
| -// Flaky on Windows, likely for the same reason as other flaky overscroll tests.
|
| -// http://crbug.com/305722
|
| -#if defined(OS_WIN)
|
| +// Flaky on some platforms, likely for the same reason as other flaky overscroll
|
| +// tests. http://crbug.com/305722
|
| +#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
| #define MAYBE_OverscrollNavigationTouchThrottling \
|
| DISABLED_OverscrollNavigationTouchThrottling
|
| #else
|
|
|