Flakiness cleanup: disable flaky tests under chrome/test/

chrome/test/reliability/automated_ui_test_test.cc

Index: chrome/test/reliability/automated_ui_test_test.cc
diff --git a/chrome/test/reliability/automated_ui_test_test.cc b/chrome/test/reliability/automated_ui_test_test.cc
index 671ace77c43233c63b1fb9080ad7c44d5b27b4eb..e430e6c21a76187ba9899ff0035b5acfd314088f 100644
--- a/chrome/test/reliability/automated_ui_test_test.cc
+++ b/chrome/test/reliability/automated_ui_test_test.cc
@@ -80,10 +80,10 @@ TEST_F(AutomatedUITestBase, RestoreTab) {
 
 #if defined(OS_WIN)
 // crbug.com/96049
-#define MAYBE_CloseTab FLAKY_CloseTab
+#define MAYBE_CloseTab DISABLED_CloseTab
 #elif defined(OS_MACOSX)
 // crbug.com/112821
-#define MAYBE_CloseTab FLAKY_CloseTab
+#define MAYBE_CloseTab DISABLED_CloseTab
 #else
 #define MAYBE_CloseTab CloseTab
 #endif
@@ -133,7 +133,7 @@ TEST_F(AutomatedUITestBase, MAYBE_CloseTab) {
 }
 
 // Flakiness tracked there: http://crbug.com/96049.
-TEST_F(AutomatedUITestBase, FLAKY_OpenBrowserWindow) {
+TEST_F(AutomatedUITestBase, DISABLED_OpenBrowserWindow) {
   int num_browser_windows;
   int tab_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
@@ -181,7 +181,7 @@ TEST_F(AutomatedUITestBase, FLAKY_OpenBrowserWindow) {
 
 // Flaky, see http://crbug.com/96039.
 #if defined(OS_WIN) || defined(OS_MACOSX)
-#define MAYBE_CloseBrowserWindow FLAKY_CloseBrowserWindow
+#define MAYBE_CloseBrowserWindow DISABLED_CloseBrowserWindow
 #else
 #define MAYBE_CloseBrowserWindow CloseBrowserWindow
 #endif
@@ -224,7 +224,7 @@ TEST_F(AutomatedUITestBase, MAYBE_CloseBrowserWindow) {
 
 // Flaky, see http://crbug.com/113046.
 #if defined(OS_MACOSX)
-#define MAYBE_IncognitoWindow FLAKY_IncognitoWindow
+#define MAYBE_IncognitoWindow DISABLED_IncognitoWindow
 #else
 #define MAYBE_IncognitoWindow IncognitoWindow
 #endif
@@ -265,7 +265,7 @@ TEST_F(AutomatedUITestBase, MAYBE_IncognitoWindow) {
 // Flaky, see http://crbug.com/96039.
 #if defined(OS_WIN)
 #define MAYBE_OpenCloseBrowserWindowWithAccelerator \
-        FLAKY_OpenCloseBrowserWindowWithAccelerator
+        DISABLED_OpenCloseBrowserWindowWithAccelerator
 #else
 #define MAYBE_OpenCloseBrowserWindowWithAccelerator \
         OpenCloseBrowserWindowWithAccelerator
@@ -309,7 +309,7 @@ TEST_F(AutomatedUITestBase, MAYBE_OpenCloseBrowserWindowWithAccelerator) {
 
 // Flaky, see http://crbug.com/96039.
 #if defined(OS_MACOSX)
-#define MAYBE_Navigate FLAKY_Navigate
+#define MAYBE_Navigate DISABLED_Navigate
 #else
 #define MAYBE_Navigate Navigate
 #endif
@@ -345,7 +345,7 @@ TEST_F(AutomatedUITestBase, MAYBE_Navigate) {
 
 // Flaky, see http://crbug.com/81050.
 #if defined(OS_MACOSX)
-#define MAYBE_SelectTab FLAKY_SelectTab
+#define MAYBE_SelectTab DISABLED_SelectTab
 #else
 #define MAYBE_SelectTab SelectTab
 #endif
@@ -419,7 +419,7 @@ TEST_F(AutomatedUITestBase, ShowDownloads) {
 
 // Flaky, see http://crbug.com/81050.
 #if defined(OS_MACOSX)
-#define MAYBE_ShowHistory FLAKY_ShowHistory
+#define MAYBE_ShowHistory DISABLED_ShowHistory
 #else
 #define MAYBE_ShowHistory ShowHistory
 #endif