Disable Flaky BrowserSideFlingBrowserTest.AutoscrollFling

BrowserSideFlingBrowserTest.AutoscrollFling is flaking on ChromeOS, so I'm
disabling it.

TBR=dtapuska@chromium.org
TEST=BrowserSideFlingBrowserTest.AutoscrollFling

Bug: 838769
Change-Id: I1d8bc6ed78c9e15258ff90ccef9535e42d8189cf
Reviewed-on: https://chromium-review.googlesource.com/1042029Reviewed-by: Jonathan Ross <jonross@chromium.org>
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555707}

content/browser/renderer_host/input/fling_browsertest.cc

@@ -85,10 +85,11 @@ class BrowserSideFlingBrowserTest : public ContentBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(BrowserSideFlingBrowserTest);
 };
 
-#if !defined(OS_ANDROID)
-#define MAYBE_AutoscrollFling AutoscrollFling
-#else
+// TODO(sahel): This test is flaking on OS_CHROMEOS https://crbug.com/838769
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
 #define MAYBE_AutoscrollFling DISABLED_AutoscrollFling
+#else
+#define MAYBE_AutoscrollFling AutoscrollFling
 #endif
 IN_PROC_BROWSER_TEST_F(BrowserSideFlingBrowserTest, MAYBE_AutoscrollFling) {
   LoadURL(kBrowserFlingDataURL);
@@ -155,4 +156,4 @@ IN_PROC_BROWSER_TEST_F(BrowserSideFlingBrowserTest,
   }
 }
 
-}  // namespace content
\ No newline at end of file
+}  // namespace content