GTTF: remove FAILS_ prefix, part 1

See http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium/handling-a-failing-test
and https://groups.google.com/a/chromium.org/d/topic/chromium-dev/_OwJ_GWfOaY/discussion

BUG=none

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

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

33 files changed, 45 insertions, 60 deletions

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index f0e4231..2dfcdb5 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -116,7 +116,7 @@ _BANNED_OBJC_FUNCTIONS = (
 _BANNED_CPP_FUNCTIONS = (
     # Make sure that gtest's FRIEND_TEST() macro is not used; the
     # FRIEND_TEST_ALL_PREFIXES() macro from base/gtest_prod_util.h should be
-    # used instead since that allows for FLAKY_, FAILS_ and DISABLED_ prefixes.
+    # used instead since that allows for FLAKY_ and DISABLED_ prefixes.
     (
       'FRIEND_TEST(',
       (
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 0502741..b762abb 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -267,7 +267,7 @@ TEST_F(ShellTest, IsScreenLocked) {
 
 // Fails on Mac, see http://crbug.com/115662
 #if defined(OS_MACOSX)
-#define MAYBE_ManagedWindowModeBasics FAILS_ManagedWindowModeBasics
+#define MAYBE_ManagedWindowModeBasics DISABLED_ManagedWindowModeBasics
 #else
 #define MAYBE_ManagedWindowModeBasics ManagedWindowModeBasics
 #endif
diff --git a/ash/wm/base_layout_manager_unittest.cc b/ash/wm/base_layout_manager_unittest.cc
index daaa153..4070099 100644
--- a/ash/wm/base_layout_manager_unittest.cc
+++ b/ash/wm/base_layout_manager_unittest.cc
@@ -126,7 +126,7 @@ TEST_F(BaseLayoutManagerTest, FullscreenRootWindowResize) {
 // Fails on Mac only.  Need to be implemented.  http://crbug.com/111279.
 #if defined(OS_MACOSX)
 #define MAYBE_RootWindowResizeShrinksWindows \
-  FAILS_RootWindowResizeShrinksWindows
+  DISABLED_RootWindowResizeShrinksWindows
 #else
 #define MAYBE_RootWindowResizeShrinksWindows RootWindowResizeShrinksWindows
 #endif
diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc
index ce7ee5d..6bcb819 100644
--- a/ash/wm/shelf_layout_manager_unittest.cc
+++ b/ash/wm/shelf_layout_manager_unittest.cc
@@ -187,7 +187,7 @@ class ShelfLayoutManagerTest : public ash::test::AshTestBase {
 
 // Fails on Mac only.  Need to be implemented.  http://crbug.com/111279.
 #if defined(OS_MACOSX)
-#define MAYBE_SetVisible FAILS_SetVisible
+#define MAYBE_SetVisible DISABLED_SetVisible
 #else
 #define MAYBE_SetVisible SetVisible
 #endif
diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc
index 6bab61c..ddee670 100644
--- a/ash/wm/toplevel_window_event_handler_unittest.cc
+++ b/ash/wm/toplevel_window_event_handler_unittest.cc
@@ -462,7 +462,7 @@ TEST_F(ToplevelWindowEventHandlerTest, GestureDrag) {
 
 // Verifies pressing escape resets the bounds to the original bounds.
 #if defined(OS_MACOSX)
-#define MAYBE_EscapeReverts FAILS_EscapeReverts
+#define MAYBE_EscapeReverts DISABLED_EscapeReverts
 #else
 #define MAYBE_EscapeReverts EscapeReverts
 #endif
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index 4b83e69..f1d9b45 100644
--- a/ash/wm/window_manager_unittest.cc
+++ b/ash/wm/window_manager_unittest.cc
@@ -457,7 +457,7 @@ TEST_F(WindowManagerTest, MouseEventCursors) {
 }
 
 #if defined(OS_MACOSX)
-#define MAYBE_TransformActivate FAILS_TransformActivate
+#define MAYBE_TransformActivate DISABLED_TransformActivate
 #else
 #define MAYBE_TransformActivate TransformActivate
 #endif
diff --git a/base/debug/stack_trace_unittest.cc b/base/debug/stack_trace_unittest.cc
index 925f619..6a35dac 100644
--- a/base/debug/stack_trace_unittest.cc
+++ b/base/debug/stack_trace_unittest.cc
@@ -16,7 +16,7 @@ namespace debug {
 // See comments in the #ifdef soup if you intend to change this.
 #if defined(OS_WIN)
 // Always fails on Windows: crbug.com/32070
-#define MAYBE_OutputToStream FAILS_OutputToStream
+#define MAYBE_OutputToStream DISABLED_OutputToStream
 #else
 #define MAYBE_OutputToStream OutputToStream
 #endif
diff --git a/base/gtest_prod_util.h b/base/gtest_prod_util.h
index 1f0ce61..3289e63 100644
--- a/base/gtest_prod_util.h
+++ b/base/gtest_prod_util.h
@@ -21,8 +21,7 @@
 #define FRIEND_TEST_ALL_PREFIXES(test_case_name, test_name) \
   FRIEND_TEST(test_case_name, test_name); \
   FRIEND_TEST(test_case_name, DISABLED_##test_name); \
-  FRIEND_TEST(test_case_name, FLAKY_##test_name); \
-  FRIEND_TEST(test_case_name, FAILS_##test_name)
+  FRIEND_TEST(test_case_name, FLAKY_##test_name)
 
 // C++ compilers will refuse to compile the following code:
 //
@@ -62,7 +61,6 @@
 #define FORWARD_DECLARE_TEST(test_case_name, test_name) \
   class test_case_name##_##test_name##_Test; \
   class test_case_name##_##DISABLED_##test_name##_Test; \
-  class test_case_name##_##FLAKY_##test_name##_Test; \
-  class test_case_name##_##FAILS_##test_name##_Test
+  class test_case_name##_##FLAKY_##test_name##_Test
 
 #endif  // BASE_GTEST_PROD_UTIL_H_
diff --git a/base/json/json_parser.h b/base/json/json_parser.h
index ae927a3..020ac25 100644
--- a/base/json/json_parser.h
+++ b/base/json/json_parser.h
@@ -31,8 +31,7 @@ friend class test_case_name##_##test_name##_Test
 #define FRIEND_TEST_ALL_PREFIXES(test_case_name, test_name) \
   FRIEND_TEST(test_case_name, test_name); \
   FRIEND_TEST(test_case_name, DISABLED_##test_name); \
-  FRIEND_TEST(test_case_name, FLAKY_##test_name); \
-  FRIEND_TEST(test_case_name, FAILS_##test_name)
+  FRIEND_TEST(test_case_name, FLAKY_##test_name)
 #endif  // OS_CHROMEOS
 
 namespace base {
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc
index fcfd9c8..e8abb1a 100644
--- a/base/message_loop_unittest.cc
+++ b/base/message_loop_unittest.cc
@@ -1643,7 +1643,7 @@ TEST(MessageLoopTest, PostDelayedTask_SharedTimer_SubPump) {
 // TODO(darin): MessageLoop does not support deleting all tasks in the
 // destructor.
 // Fails, http://crbug.com/50272.
-TEST(MessageLoopTest, FAILS_EnsureDeletion) {
+TEST(MessageLoopTest, DISABLED_EnsureDeletion) {
   RunTest_EnsureDeletion(MessageLoop::TYPE_DEFAULT);
   RunTest_EnsureDeletion(MessageLoop::TYPE_UI);
   RunTest_EnsureDeletion(MessageLoop::TYPE_IO);
@@ -1652,7 +1652,7 @@ TEST(MessageLoopTest, FAILS_EnsureDeletion) {
 // TODO(darin): MessageLoop does not support deleting all tasks in the
 // destructor.
 // Fails, http://crbug.com/50272.
-TEST(MessageLoopTest, FAILS_EnsureDeletion_Chain) {
+TEST(MessageLoopTest, DISABLED_EnsureDeletion_Chain) {
   RunTest_EnsureDeletion_Chain(MessageLoop::TYPE_DEFAULT);
   RunTest_EnsureDeletion_Chain(MessageLoop::TYPE_UI);
   RunTest_EnsureDeletion_Chain(MessageLoop::TYPE_IO);
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index b0c7c22..2ab5c36 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -128,11 +128,6 @@ bool TestSuite::IsMarkedFlaky(const testing::TestInfo& test) {
 }
 
 // static
-bool TestSuite::IsMarkedFailing(const testing::TestInfo& test) {
-  return strncmp(test.name(), "FAILS_", 6) == 0;
-}
-
-// static
 bool TestSuite::IsMarkedMaybe(const testing::TestInfo& test) {
   return strncmp(test.name(), "MAYBE_", 6) == 0;
 }
@@ -141,7 +136,7 @@ bool TestSuite::IsMarkedMaybe(const testing::TestInfo& test) {
 bool TestSuite::ShouldIgnoreFailure(const testing::TestInfo& test) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(kStrictFailureHandling))
     return false;
-  return IsMarkedFlaky(test) || IsMarkedFailing(test);
+  return IsMarkedFlaky(test);
 }
 
 // static
@@ -209,13 +204,6 @@ int TestSuite::Run() {
            flaky_count == 1 ? "TEST" : "TESTS");
   }
 
-  // Display the number of tests with ignored failures (FAILS).
-  int failing_count = GetTestCount(&TestSuite::IsMarkedFailing);
-  if (failing_count) {
-    printf("  YOU HAVE %d %s with ignored failures (FAILS prefix)\n\n",
-           failing_count, failing_count == 1 ? "test" : "tests");
-  }
-
 #if defined(OS_MACOSX)
   // This MUST happen before Shutdown() since Shutdown() tears down
   // objects (such as NotificationService::current()) that Cocoa
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 78299ee..7b6174a 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -295,7 +295,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
 #define MAYBE_NormalKeyEvents DISABLED_NormalKeyEvents
 #elif defined(OS_LINUX)
 // http://crbug.com/129235
-#define MAYBE_NormalKeyEvents FAILS_NormalKeyEvents
+#define MAYBE_NormalKeyEvents DISABLED_NormalKeyEvents
 #else
 #define MAYBE_NormalKeyEvents NormalKeyEvents
 #endif
@@ -399,7 +399,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_NormalKeyEvents) {
 
 #if defined(OS_LINUX)
 // http://crbug.com/129235
-#define MAYBE_CtrlKeyEvents FAILS_CtrlKeyEvents
+#define MAYBE_CtrlKeyEvents DISABLED_CtrlKeyEvents
 #else
 #define MAYBE_CtrlKeyEvents CtrlKeyEvents
 #endif
@@ -529,7 +529,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_CommandKeyEvents) {
 #define MAYBE_AccessKeys DISABLED_AccessKeys
 #elif defined(OS_LINUX)
 // http://crbug.com/129235
-#define MAYBE_AccessKeys FAILS_AccessKeys
+#define MAYBE_AccessKeys DISABLED_AccessKeys
 #else
 #define MAYBE_AccessKeys AccessKeys
 #endif
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index 26a2fb4..806e8b3 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -717,7 +717,7 @@ TEST_F(ProtocolHandlerRegistryTest, TestOSRegistration) {
 #if defined(OS_LINUX)
 // TODO(benwells): When Linux support is more reliable and
 // http://crbut.com/88255 is fixed this test will pass.
-#define MAYBE_TestOSRegistrationFailure FAILS_TestOSRegistrationFailure
+#define MAYBE_TestOSRegistrationFailure DISABLED_TestOSRegistrationFailure
 #else
 #define MAYBE_TestOSRegistrationFailure TestOSRegistrationFailure
 #endif
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index e1e3dc4..f9ca9e4 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -2703,7 +2703,7 @@ TEST_F(ExtensionServiceTest, DISABLED_DISABLED_UpdatePendingTheme) {
 
 #if defined(OS_CHROMEOS)
 // Always fails on ChromeOS: http://crbug.com/79737
-#define MAYBE_UpdatePendingExternalCrx FAILS_UpdatePendingExternalCrx
+#define MAYBE_UpdatePendingExternalCrx DISABLED_UpdatePendingExternalCrx
 #else
 #define MAYBE_UpdatePendingExternalCrx UpdatePendingExternalCrx
 #endif
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
index a00ee77..63d12ac 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -208,7 +208,7 @@ class WindowOpenPanelTest : public ExtensionApiTest {
 #if defined(USE_ASH)
 // On Ash, this currently fails because we're currently opening new panel
 // windows as popup windows instead.
-#define MAYBE_WindowOpenPanel FAILS_WindowOpenPanel
+#define MAYBE_WindowOpenPanel DISABLED_WindowOpenPanel
 #else
 #define MAYBE_WindowOpenPanel WindowOpenPanel
 #endif
@@ -219,7 +219,7 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, MAYBE_WindowOpenPanel) {
 #if defined(USE_ASH)
 // On Ash, this currently fails because we're currently opening new panel
 // windows as popup windows instead.
-#define MAYBE_WindowOpenPanelDetached FAILS_WindowOpenPanelDetached
+#define MAYBE_WindowOpenPanelDetached DISABLED_WindowOpenPanelDetached
 #else
 #define MAYBE_WindowOpenPanelDetached WindowOpenPanelDetached
 #endif
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 50f09e0d..cd0a67a 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -1290,7 +1290,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) {
 #elif defined(OS_MACOSX)
 // http://crbug.com/100514
 #define MAYBE_PrerenderIframeDelayLoadPlugin \
-        FAILS_PrerenderIframeDelayLoadPlugin
+        DISABLED_PrerenderIframeDelayLoadPlugin
 #else
 #define MAYBE_PrerenderIframeDelayLoadPlugin PrerenderIframeDelayLoadPlugin
 #endif
diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc
index 332b212..55ac962 100644
--- a/chrome/browser/process_singleton_browsertest.cc
+++ b/chrome/browser/process_singleton_browsertest.cc
@@ -219,7 +219,7 @@ class ProcessSingletonTest : public InProcessBrowserTest {
 
 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
 // http://crbug.com/58219
-#define MAYBE_StartupRaceCondition FAILS_StartupRaceCondition
+#define MAYBE_StartupRaceCondition DISABLED_StartupRaceCondition
 #else
 #define MAYBE_StartupRaceCondition StartupRaceCondition
 #endif
diff --git a/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc
index 76c2dff..8ebe52c 100644
--- a/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc
@@ -49,7 +49,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, CustomTheme) {
 
 // TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
 #if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, FAILS_NativeTheme) {
+IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, DISABLED_NativeTheme) {
 #else
 IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, NativeTheme) {
 #endif  // OS_CHROMEOS
diff --git a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
index fa09a6c..a188aa3 100644
--- a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
@@ -58,7 +58,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, CustomTheme) {
 // TCM ID - 3599303.
 // TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
 #if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, FAILS_NativeTheme) {
+IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DISABLED_NativeTheme) {
 #else
 IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, NativeTheme) {
 #endif  // OS_CHROMEOS
@@ -107,7 +107,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DefaultTheme) {
 // TCM ID - 7292065.
 // TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
 #if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, FAILS_NativeDefaultRace) {
+IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DISABLED_NativeDefaultRace) {
 #else
 IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, NativeDefaultRace) {
 #endif  // OS_CHROMEOS
@@ -132,7 +132,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, NativeDefaultRace) {
 // TCM ID - 7294077.
 // TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
 #if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, FAILS_CustomNativeRace) {
+IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DISABLED_CustomNativeRace) {
 #else
 IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, CustomNativeRace) {
 #endif  // OS_CHROMEOS
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 51e3181..dc6bcda 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -123,7 +123,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) {
 #if defined(USE_ASH)
 // This test fails on Ash because task manager treats view type
 // Panels differently for Ash.
-#define MAYBE_NoticePanelChanges FAILS_NoticePanelChanges
+#define MAYBE_NoticePanelChanges DISABLED_NoticePanelChanges
 #else
 #define MAYBE_NoticePanelChanges NoticePanelChanges
 #endif
@@ -256,7 +256,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillBGContents) {
 #if defined(USE_ASH)
 // This test fails on Ash because task manager treats view type
 // Panels differently for Ash.
-#define MAYBE_KillPanelExtension FAILS_KillPanelExtension
+#define MAYBE_KillPanelExtension DISABLED_KillPanelExtension
 #else
 #define MAYBE_KillPanelExtension KillPanelExtension
 #endif
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index a64ff63..346b8ac 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -71,7 +71,7 @@ using content::WebContents;
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 // TODO(jcampan): http://crbug.com/23683 for linux.
 // TODO(suzhe): http://crbug.com/49737 for mac.
-#define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage
+#define MAYBE_TabsRememberFocusFindInPage DISABLED_TabsRememberFocusFindInPage
 #elif defined(OS_WIN)
 // Flaky, http://crbug.com/62537.
 #define MAYBE_TabsRememberFocusFindInPage DISABLED_TabsRememberFocusFindInPage
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
index 39cfaf0..0dc9507 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
@@ -366,7 +366,7 @@ IN_PROC_BROWSER_TEST_F(
 #if defined(OS_MACOSX)
 // http://crbug.com/100467
 IN_PROC_BROWSER_TEST_F(
-    FullscreenControllerTest, FAILS_TabEntersPresentationModeFromWindowed) {
+    FullscreenControllerTest, DISABLED_TabEntersPresentationModeFromWindowed) {
   ASSERT_TRUE(test_server()->Start());
 
   AddTabAtIndexAndWait(
diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc
index b67bb8f..45a1cfb 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/web_ui_browsertest.cc
@@ -516,7 +516,7 @@ WebUIBrowserTest* WebUIBrowserExpectFailTest::s_test_ = NULL;
 IN_PROC_BROWSER_TEST_F(WebUIBrowserExpectFailTest, TestFailsFast) {
   AddLibrary(FilePath(FILE_PATH_LITERAL("sample_downloads.js")));
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIDownloadsURL));
-  EXPECT_FATAL_FAILURE(RunJavascriptTestNoReturn("FAILS_BogusFunctionName"),
+  EXPECT_FATAL_FAILURE(RunJavascriptTestNoReturn("DISABLED_BogusFunctionName"),
                        "WebUITestHandler::Observe");
 }
 
@@ -534,7 +534,7 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserExpectFailTest, TestFailsAsyncFast) {
   AddLibrary(FilePath(FILE_PATH_LITERAL("sample_downloads.js")));
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIDownloadsURL));
   EXPECT_FATAL_FAILURE(
-      RunJavascriptAsyncTestNoReturn("FAILS_BogusFunctionName"),
+      RunJavascriptAsyncTestNoReturn("DISABLED_BogusFunctionName"),
       "WebUITestHandler::Observe");
 }
 
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index c8eef0d..f68064a 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -34,7 +34,7 @@
 #if defined(USE_AURA)
 // This test fails http://crbug.com/84854, and is very flaky on CrOS and
 // somewhat flaky on other Linux.
-#define MAYBE_ForceShutdown FAILS_ForceShutdown
+#define MAYBE_ForceShutdown DISABLED_ForceShutdown
 #else
 #if defined(OS_LINUX) || defined(OS_WIN)
 #define MAYBE_ForceShutdown DISABLED_ForceShutdown
diff --git a/chrome/test/data/webui/sample_downloads.js b/chrome/test/data/webui/sample_downloads.js
index 5d4dad9..e2f255c 100644
--- a/chrome/test/data/webui/sample_downloads.js
+++ b/chrome/test/data/webui/sample_downloads.js
@@ -8,7 +8,7 @@ function testAssertFalse() {
   assertFalse(false);
 }
 
-function FAILS_testAssertFalse() {
+function DISABLED_testAssertFalse() {
   assertFalse(true);
   assertFalse(false);
 }
diff --git a/chrome/test/perf/dom_checker_uitest.cc b/chrome/test/perf/dom_checker_uitest.cc
index b145b51..be5f243 100644
--- a/chrome/test/perf/dom_checker_uitest.cc
+++ b/chrome/test/perf/dom_checker_uitest.cc
@@ -230,7 +230,7 @@ class DomCheckerTest : public UITest {
 };
 
 // Always fails, see but http://crbug.com/21321
-TEST_F(DomCheckerTest, FAILS_File) {
+TEST_F(DomCheckerTest, DISABLED_File) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest))
     return;
 
@@ -243,7 +243,7 @@ TEST_F(DomCheckerTest, FAILS_File) {
 // expected results file that didn't exist.  Fixing that bug revealed
 // that the expected results weren't correct anyway.
 // http://crbug.com/21321
-TEST_F(DomCheckerTest, FAILS_Http) {
+TEST_F(DomCheckerTest, DISABLED_Http) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest))
     return;
 
diff --git a/chrome/test/perf/tab_switching_test.cc b/chrome/test/perf/tab_switching_test.cc
index 92f3b11..e2ba2a4 100644
--- a/chrome/test/perf/tab_switching_test.cc
+++ b/chrome/test/perf/tab_switching_test.cc
@@ -189,12 +189,12 @@ class TabSwitchingUITest : public UIPerfTest {
 // This is failing, and taking forever to finish when doing so.
 // http://crbug.com/102162
 
-TEST_F(TabSwitchingUITest, FAILS_TabSwitch) {
+TEST_F(TabSwitchingUITest, DISABLED_TabSwitch) {
   RunTabSwitchingUITest("t", true);
 }
 
 // Started failing with a webkit roll in r49936. See http://crbug.com/46751
-TEST_F(TabSwitchingUITest, FAILS_TabSwitchRef) {
+TEST_F(TabSwitchingUITest, DISABLED_TabSwitchRef) {
   UseReferenceBuild();
   RunTabSwitchingUITest("t_ref", true);
 }
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index baf4c6b..4532076 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -905,7 +905,7 @@ class UaTemplateFileResponse : public test_server::FileResponse {
 //
 // This test currently fails because GCF does not add the chromeframe header
 // to requests that mshtml initiates via IInternetSession::CreateBinding.
-TEST_F(ChromeFrameTestWithWebServer, FAILS_FullTabModeIE_RefreshMshtmlTest) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_RefreshMshtmlTest) {
   const wchar_t* kPages[] = {
     L"mshtml_refresh_test.html",
     L"mshtml_refresh_test_popup.html",
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 40b3a16..6908d15 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -825,7 +825,7 @@ TEST_F(RenderWidgetHostTest, PaintAtSize) {
 
 // Fails on Linux Aura, see http://crbug.com/100344
 #if defined(USE_AURA) && !defined(OS_WIN)
-#define MAYBE_HandleKeyEventsWeSent FAILS_HandleKeyEventsWeSent
+#define MAYBE_HandleKeyEventsWeSent DISABLED_HandleKeyEventsWeSent
 #else
 #define MAYBE_HandleKeyEventsWeSent HandleKeyEventsWeSent
 #endif
diff --git a/ui/base/events/event_unittest.cc b/ui/base/events/event_unittest.cc
index 4bdd830..a0872ed 100644
--- a/ui/base/events/event_unittest.cc
+++ b/ui/base/events/event_unittest.cc
@@ -101,8 +101,8 @@ TEST(EventTest, Repeated) {
 
 // Bug 99129.
 #if defined(USE_AURA)
-#define MAYBE_KeyEvent FAILS_KeyEvent
-#define MAYBE_KeyEventDirectUnicode FAILS_KeyEventDirectUnicode
+#define MAYBE_KeyEvent DISABLED_KeyEvent
+#define MAYBE_KeyEventDirectUnicode DISABLED_KeyEventDirectUnicode
 #else
 #define MAYBE_KeyEvent KeyEvent
 #define MAYBE_KeyEventDirectUnicode KeyEventDirectUnicode
diff --git a/ui/gfx/platform_font_pango_unittest.cc b/ui/gfx/platform_font_pango_unittest.cc
index 6f1571e..24c9aa9 100644
--- a/ui/gfx/platform_font_pango_unittest.cc
+++ b/ui/gfx/platform_font_pango_unittest.cc
@@ -14,7 +14,7 @@ namespace gfx {
 
 // Fails on Chrome OS: http://crbug.com/124451
 #if defined(OS_CHROMEOS)
-#define MAYBE_FamilyList FAILS_FamilyList
+#define MAYBE_FamilyList DISABLED_FamilyList
 #else
 #define MAYBE_FamilyList FamilyList
 #endif
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index a3c9cb9..509bd87 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -186,7 +186,7 @@ class TestTabbedPane : public TabbedPane {
 
 // Tests that NativeControls do set the focused View appropriately on the
 // FocusManager.
-TEST_F(FocusManagerTest, FAILS_FocusNativeControls) {
+TEST_F(FocusManagerTest, DISABLED_FocusNativeControls) {
   TestTextfield* textfield = new TestTextfield();
   TestTabbedPane* tabbed_pane = new TestTabbedPane();
   tabbed_pane->set_use_native_win_control(true);
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc
index 7580d4e..be715d5 100644
--- a/webkit/tools/test_shell/plugin_tests.cc
+++ b/webkit/tools/test_shell/plugin_tests.cc
@@ -168,7 +168,7 @@ BOOL CALLBACK EnumChildProc(HWND hwnd, LPARAM lparam) {
 // Tests that hiding/showing the parent frame hides/shows the plugin.
 // Fails for WIN. http://crbug.com/111601
 #if defined(OS_WIN)
-#define MAYBE_PluginVisibilty FAILS_PluginVisibilty
+#define MAYBE_PluginVisibilty DISABLED_PluginVisibilty
 #else
 #define MAYBE_PluginVisibilty PluginVisibilty
 #endif