Flakiness cleanup: disable flaky tests under chrome/browser/

Part 3 of 4.

See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6

BUG=25926,114208,29110,91745,40932,43575,114185,57884,102687,107744,85294,108511,72201,69249,93158,38427,11007,51698,39507,45675,78803,86469,45162,45281,86769
TBR=akalin

Review URL: https://chromiumcodereview.appspot.com/9398008

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

12 files changed, 42 insertions, 74 deletions

diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index 3c6dd8b..29942b0 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -180,7 +180,7 @@ class ExistingUserControllerTest : public CrosInProcessBrowserTest {
 };
 
 // Test is flaky: crbug.com/25926
-IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, FLAKY_NewUserLogin) {
+IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, DISABLED_NewUserLogin) {
   EXPECT_CALL(*mock_login_display_host_, SetStatusAreaEnabled(false))
       .Times(1);
   EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))
diff --git a/chrome/browser/extensions/extension_webnavigation_apitest.cc b/chrome/browser/extensions/extension_webnavigation_apitest.cc
index ce92470..45b6287 100644
--- a/chrome/browser/extensions/extension_webnavigation_apitest.cc
+++ b/chrome/browser/extensions/extension_webnavigation_apitest.cc
@@ -118,7 +118,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationOpenTab) {
 }
 
 // This test has been timing out: 114208.
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_WebNavigationReferenceFragment) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
+                       DISABLED_WebNavigationReferenceFragment) {
   FrameNavigationState::set_allow_extension_scheme(true);
 
   CommandLine::ForCurrentProcess()->AppendSwitch(
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc
index 8428a6d..ac57c7b 100644
--- a/chrome/browser/sessions/session_restore_uitest.cc
+++ b/chrome/browser/sessions/session_restore_uitest.cc
@@ -377,7 +377,7 @@ TEST_F(SessionRestoreUITest, NormalAndPopup) {
 // we restore the tabbed browser url.
 // Flaky: http://crbug.com/29110
 TEST_F(SessionRestoreUITest,
-       FLAKY_RestoreAfterClosingTabbedBrowserWithAppAndLaunching) {
+       DISABLED_RestoreAfterClosingTabbedBrowserWithAppAndLaunching) {
   NavigateToURL(url1_);
 
   // Launch an app.
@@ -444,7 +444,7 @@ TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) {
 // Unfortunately, the fix at http://codereview.chromium.org/6546078
 // breaks NTP background image refreshing, so ThemeSource had to revert to
 // replacing the existing data source.
-TEST_F(SessionRestoreUITest, FLAKY_ShareProcessesOnRestore) {
+TEST_F(SessionRestoreUITest, DISABLED_ShareProcessesOnRestore) {
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get() != NULL);
   int tab_count;
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 9023228..7501bfd 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -280,7 +280,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPWithBrokenHTTPSResource) {
 
 // http://crbug.com/91745
 #if defined(OS_CHROMEOS)
-#define MAYBE_TestOKHTTPS FLAKY_TestOKHTTPS
+#define MAYBE_TestOKHTTPS DISABLED_TestOKHTTPS
 #else
 #define MAYBE_TestOKHTTPS TestOKHTTPS
 #endif
@@ -314,16 +314,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) {
 
 // Visits a page with https error and don't proceed (and ensure we can still
 // navigate at that point):
-#if defined(OS_WIN)
 // Disabled, flakily exceeds test timeout, http://crbug.com/43575.
-#define MAYBE_TestHTTPSExpiredCertAndDontProceed \
-    DISABLED_TestHTTPSExpiredCertAndDontProceed
-#else
 // Marked as flaky, see bug 40932.
-#define MAYBE_TestHTTPSExpiredCertAndDontProceed \
-    FLAKY_TestHTTPSExpiredCertAndDontProceed
-#endif
-IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSExpiredCertAndDontProceed) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestHTTPSExpiredCertAndDontProceed) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(https_server_.Start());
   ASSERT_TRUE(https_server_expired_.Start());
@@ -368,17 +361,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSExpiredCertAndDontProceed) {
 }
 
 // Visits a page with https error and then goes back using Browser::GoBack.
-#if defined(OS_MACOSX)
 // See bug 114185.
-#define MAYBE_TestHTTPSExpiredCertAndGoBackViaButton \
-        DISABLED_TestHTTPSExpiredCertAndGoBackViaButton
-#else
 // Marked as flaky, see bug 40932.
-#define MAYBE_TestHTTPSExpiredCertAndGoBackViaButton \
-        FLAKY_TestHTTPSExpiredCertAndGoBackViaButton
-#endif
 IN_PROC_BROWSER_TEST_F(SSLUITest,
-                       MAYBE_TestHTTPSExpiredCertAndGoBackViaButton) {
+                       DISABLED_TestHTTPSExpiredCertAndGoBackViaButton) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(https_server_expired_.Start());
 
@@ -413,16 +399,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest,
 }
 
 // Visits a page with https error and then goes back using GoToOffset.
-#if defined(OS_MACOSX)
 // See bug 114185.
-#define MAYBE_TestHTTPSExpiredCertAndGoBackViaMenu \
-        DISABLED_TestHTTPSExpiredCertAndGoBackViaMenu
-#else
 // Marked as flaky, see bug 40932.
-#define MAYBE_TestHTTPSExpiredCertAndGoBackViaMenu \
-        FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu
-#endif
-IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSExpiredCertAndGoBackViaMenu) {
+IN_PROC_BROWSER_TEST_F(SSLUITest,
+                       DISABLED_TestHTTPSExpiredCertAndGoBackViaMenu) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(https_server_expired_.Start());
 
@@ -449,7 +429,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSExpiredCertAndGoBackViaMenu) {
 
 // Visits a page with https error and then goes forward using GoToOffset.
 // Marked as flaky, see bug 40932.
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoForward) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestHTTPSExpiredCertAndGoForward) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(https_server_expired_.Start());
 
@@ -612,7 +592,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest,
 // - frames content is replaced with warning
 // - images and scripts are filtered out entirely
 // Marked as flaky, see bug 40932.
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContents) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnsafeContents) {
   ASSERT_TRUE(https_server_.Start());
   ASSERT_TRUE(https_server_expired_.Start());
 
@@ -957,7 +937,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectBadToGoodHTTPS) {
 
 // Visit a page over good https that is a redirect to a page with bad https.
 // Marked as flaky, see bug 40932.
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectGoodToBadHTTPS) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestRedirectGoodToBadHTTPS) {
   ASSERT_TRUE(https_server_.Start());
   ASSERT_TRUE(https_server_expired_.Start());
 
@@ -993,7 +973,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToGoodHTTPS) {
 }
 
 // Visit a page over http that is a redirect to a page with bad HTTPS.
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectHTTPToBadHTTPS) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestRedirectHTTPToBadHTTPS) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(https_server_expired_.Start());
 
@@ -1016,7 +996,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectHTTPToBadHTTPS) {
 // Visit a page over https that is a redirect to a page with http (to make sure
 // we don't keep the secure state).
 // Marked as flaky, see bug 40932.
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectHTTPSToHTTP) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestRedirectHTTPSToHTTP) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(https_server_.Start());
 
@@ -1148,7 +1128,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) {
 // From a bad HTTPS top frame:
 // - navigate to an OK HTTPS frame (expected to be still authentication broken).
 // Marked as flaky, see bug 40932.
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestBadFrameNavigation) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestBadFrameNavigation) {
   ASSERT_TRUE(https_server_.Start());
   ASSERT_TRUE(https_server_expired_.Start());
 
@@ -1248,7 +1228,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) {
 }
 
 // Marked as flaky, see bug 40932.
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorkerFiltered) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnsafeContentsInWorkerFiltered) {
   ASSERT_TRUE(https_server_.Start());
   ASSERT_TRUE(https_server_expired_.Start());
 
@@ -1267,7 +1247,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorkerFiltered) {
 }
 
 // Marked as flaky, see bug 40932.
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorker) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnsafeContentsInWorker) {
   ASSERT_TRUE(https_server_.Start());
   ASSERT_TRUE(https_server_expired_.Start());
 
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
index 2390313..60c44b3 100644
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
@@ -1198,7 +1198,8 @@ TEST_F(ProfileSyncServiceAutofillTest, ProcessUserChangeRemoveProfile) {
   ASSERT_EQ(0U, new_sync_profiles.size());
 }
 
-TEST_F(ProfileSyncServiceAutofillTest, FLAKY_ServerChangeRace) {
+// http://crbug.com/57884
+TEST_F(ProfileSyncServiceAutofillTest, DISABLED_ServerChangeRace) {
   // Once for MergeDataAndStartSyncing() and twice for ProcessSyncChanges(), via
   // LoadAutofillData().
   EXPECT_CALL(autofill_table_, GetAllAutofillEntries(_)).
diff --git a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
index f542c4a..c0857f6 100644
--- a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
@@ -48,7 +48,8 @@ class TwoClientAutofillSyncTest : public SyncTest {
 };
 
 // Flaky, http://crbug.com/102687
-IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, FLAKY_WebDataServiceSanity) {
+IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest,
+                       DISABLED_WebDataServiceSanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Client0 adds a key.
diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
index 808b1a2..09f5bac 100644
--- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
@@ -929,7 +929,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_HoistBMs10LevelUp) {
 // Test Scribe ID - 371968.
 // Flaky. http://crbug.com/107744.
 IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
-                       FLAKY_SC_SinkBMs10LevelDown) {
+                       DISABLED_SC_SinkBMs10LevelDown) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AllModelsMatchVerifier());
 
diff --git a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
index 0134830..00dd5f8 100644
--- a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
@@ -144,7 +144,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, BothChanged) {
 
 // Flaky on OSX (number of conflicting nodes is off). http://crbug.com/85294.
 #if defined(OS_MACOSX)
-#define MAYBE_FirstChangesAndSetsPassphrase FLAKY_FirstChangesAndSetsPassphrase
+#define MAYBE_FirstChangesAndSetsPassphrase DISABLED_FirstChangesAndSetsPassphrase
 #else
 #define MAYBE_FirstChangesAndSetsPassphrase FirstChangesAndSetsPassphrase
 #endif
@@ -197,7 +197,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
 // Flaky on OSX (number of conflicting nodes is off). http://crbug.com/85294.
 #if defined(OS_MACOSX)
 #define MAYBE_FirstChangesWhileSecondWaitingForPassphrase \
-        FLAKY_FirstChangesWhileSecondWaitingForPassphrase
+        DISABLED_FirstChangesWhileSecondWaitingForPassphrase
 #else
 #define MAYBE_FirstChangesWhileSecondWaitingForPassphrase \
         FirstChangesWhileSecondWaitingForPassphrase
@@ -306,7 +306,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
 // Flaky on OSX (number of conflicting nodes is off). http://crbug.com/85294.
 #if defined(OS_MACOSX)
 #define MAYBE_SecondChangesBeforeEncrAndPassphraseChange \
-        FLAKY_SecondChangesBeforeEncrAndPassphraseChange
+        DISABLED_SecondChangesBeforeEncrAndPassphraseChange
 #else
 #define MAYBE_SecondChangesBeforeEncrAndPassphraseChange \
         SecondChangesBeforeEncrAndPassphraseChange
@@ -366,7 +366,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
 // Flaky on OSX (number of conflicting nodes is off). http://crbug.com/85294.
 #if defined(OS_MACOSX)
 #define MAYBE_BothChangeWithEncryptionAndPassphrase \
-        FLAKY_BothChangeWithEncryptionAndPassphrase
+        DISABLED_BothChangeWithEncryptionAndPassphrase
 #else
 #define MAYBE_BothChangeWithEncryptionAndPassphrase \
         BothChangeWithEncryptionAndPassphrase
diff --git a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
index a979fc2..d940933 100644
--- a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
@@ -152,7 +152,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, AddExpiredThenUpdate) {
 
 // TCM: 3705291
 // flaky, see crbug.com/108511
-IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, FLAKY_AddThenDelete) {
+IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, DISABLED_AddThenDelete) {
   const string16 kHistoryUrl(
       ASCIIToUTF16("http://www.add-one-history.google.com/"));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
@@ -213,7 +213,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, DisableEnableSync) {
 }
 
 // flaky, see crbug.com/108511
-IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, FLAKY_AddOneDeleteOther) {
+IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, DISABLED_AddOneDeleteOther) {
   const string16 kHistoryUrl(
       ASCIIToUTF16("http://www.add-one-delete-history.google.com/"));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
@@ -245,7 +245,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, FLAKY_AddOneDeleteOther) {
 
 // flaky, see crbug.com/108511
 IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest,
-                       FLAKY_AddOneDeleteOtherAddAgain) {
+                       DISABLED_AddOneDeleteOtherAddAgain) {
   const string16 kHistoryUrl(
       ASCIIToUTF16("http://www.add-delete-add-history.google.com/"));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
diff --git a/chrome/browser/tab_contents/view_source_uitest.cc b/chrome/browser/tab_contents/view_source_uitest.cc
index f097a6e..38f2e43 100644
--- a/chrome/browser/tab_contents/view_source_uitest.cc
+++ b/chrome/browser/tab_contents/view_source_uitest.cc
@@ -40,7 +40,7 @@ class ViewSourceTest : public UITest {
 // set in the html was set successfully (it shouldn't because we rendered the
 // page in view source).
 // Flaky; see http://crbug.com/72201.
-TEST_F(ViewSourceTest, FLAKY_DoesBrowserRenderInViewSource) {
+TEST_F(ViewSourceTest, DISABLED_DoesBrowserRenderInViewSource) {
   ASSERT_TRUE(test_server_.Start());
 
   std::string cookie = "viewsource_cookie";
@@ -95,7 +95,7 @@ TEST_F(ViewSourceTest, ViewSourceInMenuEnabledOnANormalPage) {
 // from the menu.
 //
 // Occasionally crashes on all platforms, see http://crbug.com/69249
-TEST_F(ViewSourceTest, FLAKY_ViewSourceInMenuDisabledWhileViewingSource) {
+TEST_F(ViewSourceTest, DISABLED_ViewSourceInMenuDisabledWhileViewingSource) {
   ASSERT_TRUE(test_server_.Start());
 
   GURL url_viewsource(chrome::kViewSourceScheme + std::string(":") +
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 07c07d2..4cec9b0 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -398,7 +398,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
 
 #if defined(OS_LINUX) || defined(OS_WIN)
 // http://crbug.com/93158.
-#define MAYBE_ReloadExtension FLAKY_ReloadExtension
+#define MAYBE_ReloadExtension DISABLED_ReloadExtension
 #else
 #define MAYBE_ReloadExtension ReloadExtension
 #endif
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index 7058e27..c5bd16a 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -196,25 +196,13 @@ TEST_F(UnloadTest, CrossSiteInfiniteUnloadSync) {
   NavigateToNolistenersFileTwice();
 }
 
-// TODO(creis): This test is currently failing intermittently on Linux and
-// consistently on Mac and Vista.  http://crbug.com/38427
-#if defined(OS_MACOSX)
-#define MAYBE_CrossSiteInfiniteUnloadAsyncInputEvent \
-    DISABLED_CrossSiteInfiniteUnloadAsyncInputEvent
-#elif defined(OS_WIN)
-#define MAYBE_CrossSiteInfiniteUnloadAsyncInputEvent \
-    DISABLED_CrossSiteInfiniteUnloadAsyncInputEvent
-#else
-// Flaky on Linux.  http://crbug.com/38427
-#define MAYBE_CrossSiteInfiniteUnloadAsyncInputEvent \
-    FLAKY_CrossSiteInfiniteUnloadAsyncInputEvent
-#endif
-
 // Navigate to a page with an infinite unload handler.
 // Then an async crosssite request followed by an input event to ensure that
 // the short unload timeout (not the long input event timeout) is used.
+// TODO(creis): This test is currently failing intermittently on Linux and
+// consistently on Mac and Vista.  http://crbug.com/38427
 // See crbug.com/11007.
-TEST_F(UnloadTest, MAYBE_CrossSiteInfiniteUnloadAsyncInputEvent) {
+TEST_F(UnloadTest, DISABLED_CrossSiteInfiniteUnloadAsyncInputEvent) {
   // Tests makes no sense in single-process mode since the renderer is hung.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
     return;
@@ -244,7 +232,7 @@ TEST_F(UnloadTest, MAYBE_CrossSiteInfiniteUnloadAsyncInputEvent) {
 // Then two two async crosssite requests to ensure
 // we don't get confused and think we're closing the tab.
 // This test is flaky on the valgrind UI bots. http://crbug.com/39057
-TEST_F(UnloadTest, FLAKY_CrossSiteInfiniteBeforeUnloadAsync) {
+TEST_F(UnloadTest, DISABLED_CrossSiteInfiniteBeforeUnloadAsync) {
   // Tests makes no sense in single-process mode since the renderer is hung.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
     return;
@@ -274,7 +262,7 @@ TEST_F(UnloadTest, BrowserCloseNoUnloadListeners) {
 
 // Tests closing the browser on a page with an unload listener registered.
 // Test marked as flaky in http://crbug.com/51698
-TEST_F(UnloadTest, FLAKY_BrowserCloseUnload) {
+TEST_F(UnloadTest, DISABLED_BrowserCloseUnload) {
   LoadUrlAndQuitBrowser(UNLOAD_HTML, L"unload");
 }
 
@@ -331,7 +319,7 @@ TEST_F(UnloadTest, BrowserTerminateBeforeUnload) {
 #if defined(OS_LINUX)
 // Fails sometimes on Linux valgrind. http://crbug.com/45675
 #define MAYBE_BrowserCloseWithInnerFocusedFrame \
-    FLAKY_BrowserCloseWithInnerFocusedFrame
+    DISABLED_BrowserCloseWithInnerFocusedFrame
 #else
 #define MAYBE_BrowserCloseWithInnerFocusedFrame \
     BrowserCloseWithInnerFocusedFrame
@@ -371,14 +359,11 @@ TEST_F(UnloadTest, BrowserCloseInfiniteUnload) {
   LoadUrlAndQuitBrowser(INFINITE_UNLOAD_HTML, L"infiniteunload");
 }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_CHROMEOS)
 // Flakily fails, times out: http://crbug.com/78803
-#define MAYBE_BrowserCloseInfiniteBeforeUnload \
-    DISABLED_BrowserCloseInfiniteBeforeUnload
-#elif defined(OS_CHROMEOS)
 // Flakily fails: http://crbug.com/86469
 #define MAYBE_BrowserCloseInfiniteBeforeUnload \
-    FLAKY_BrowserCloseInfiniteBeforeUnload
+    DISABLED_BrowserCloseInfiniteBeforeUnload
 #else
 #define MAYBE_BrowserCloseInfiniteBeforeUnload BrowserCloseInfiniteBeforeUnload
 #endif
@@ -444,7 +429,7 @@ TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnloadAlert) {
 #elif defined(OS_CHROMEOS)
 // http://crbug.com/86769
 #define MAYBE_BrowserCloseTabWhenOtherTabHasListener \
-    FLAKY_BrowserCloseTabWhenOtherTabHasListener
+    DISABLED_BrowserCloseTabWhenOtherTabHasListener
 #else
 #define MAYBE_BrowserCloseTabWhenOtherTabHasListener \
     BrowserCloseTabWhenOtherTabHasListener