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

5 files changed, 7 insertions, 22 deletions

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