Re-enabling the OverscrollScreenshot test on ChromeOS while keeping it disabled

for Ozone. The Ozone flake hasn't been reported on non-ozone trybots.
Created a separate bug for Ozone flake: http://crbug.com/399676 and added some analysis.

BUG=357311

Review URL: https://codereview.chromium.org/428303003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287545 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/web_contents/web_contents_view_aura_browsertest.cc

@@ -383,9 +383,15 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
 //  - interactively, when user does an overscroll gesture
 //  - interactively, when user navigates in history without the overscroll
 //    gesture.
-// Flaky (http://crbug.com/357311). Might be related to
+// Flaky on Windows (http://crbug.com/357311). Might be related to
 // OverscrollNavigation test.
-IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, DISABLED_OverscrollScreenshot) {
+// Flaky on Ozone (http://crbug.com/399676).
+#if defined(OS_WIN) || defined(USE_OZONE)
+#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) {