Update a bunch of FLAKY_ tests to match current reality

Mostly this is removing FLAKY_ where the bug was fixed but the label never removed, but also switches some FLAKY_ to platform-specific FAILS_.

BUG=28372,32048,32070,35341,45561,48544,48562,52858
TEST=N/A

Review URL: http://codereview.chromium.org/4087009

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

9 files changed, 16 insertions, 45 deletions

diff --git a/base/debug/stack_trace_unittest.cc b/base/debug/stack_trace_unittest.cc
index e8e1e19..ce5f313 100644
--- a/base/debug/stack_trace_unittest.cc
+++ b/base/debug/stack_trace_unittest.cc
@@ -14,8 +14,13 @@ namespace debug {
 
 // Note: On Linux, this test currently only fully works on Debug builds.
 // See comments in the #ifdef soup if you intend to change this.
-// Flaky, crbug.com/32070.
-TEST(StackTrace, FLAKY_OutputToStream) {
+#if defined(OS_WIN)
+// Always fails on Windows: crbug.com/32070
+#define MAYBE_OutputToStream FAILS_OutputToStream
+#else
+#define MAYBE_OutputToStream OutputToStream
+#endif
+TEST(StackTrace, MAYBE_OutputToStream) {
   StackTrace trace;
 
   // Dump the trace into a string.
diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
index a3eb3ef..4c1884f 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
+++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
@@ -344,8 +344,7 @@ class DevToolsRemoteListenSocketTest: public PlatformTest {
 };
 
 // This test is flaky; see comment in ::TestServerSend.
-// http://code.google.com/p/chromium/issues/detail?id=48562
-TEST_F(DevToolsRemoteListenSocketTest, FLAKY_ServerSend) {
+TEST_F(DevToolsRemoteListenSocketTest, ServerSend) {
   tester_->TestServerSend();
 }
 
diff --git a/chrome/browser/metrics/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc
index cc71c5a..93889c5 100644
--- a/chrome/browser/metrics/metrics_service_uitest.cc
+++ b/chrome/browser/metrics/metrics_service_uitest.cc
@@ -73,10 +73,6 @@ TEST_F(MetricsServiceTest, CloseRenderersNormally) {
   EXPECT_EQ(0, local_state->GetInteger(prefs::kStabilityRendererCrashCount));
 }
 
-#if defined(OS_WIN)
-// http://crbug.com/32048
-#define CrashRenderers FLAKY_CrashRenders
-#endif
 TEST_F(MetricsServiceTest, CrashRenderers) {
   // This doesn't make sense to test in single process mode.
   if (in_process_renderer_)
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
index bc4ac2b..67cbe92 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -191,10 +191,6 @@ TEST_F(ResourceDispatcherTest, CrossSiteOnunloadCookie) {
 }
 
 #if !defined(OS_MACOSX)
-#if defined(OS_WIN)
-// http://crbug.com/32048
-#define CrossSiteAfterCrash FLAKY_CrossSiteAfterCrash
-#endif
 // Tests that the onbeforeunload and onunload logic is shortcutted if the old
 // renderer is gone.  In that case, we don't want to wait for the old renderer
 // to run the handlers.
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
index 0dc44d9..96e3205 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -162,10 +162,7 @@ class RendererCrashTest : public UITest {
 #define EXPECTED_CRASH_CRASHES 1
 #endif
 
-#if defined(OS_WIN)
-// http://crbug.com/32048
-#define Crash FLAKY_Crash
-#elif defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS)
 // http://crbug.com/43115
 #define Crash DISABLED_Crash
 #elif defined(OS_MACOSX)
diff --git a/chrome/test/startup/shutdown_test.cc b/chrome/test/startup/shutdown_test.cc
index d1c3c8a..c92cc2f 100644
--- a/chrome/test/startup/shutdown_test.cc
+++ b/chrome/test/startup/shutdown_test.cc
@@ -122,28 +122,17 @@ TEST_F(ShutdownTest, SimpleUserQuit) {
                   true, /* important */ SIMPLE, UITest::USER_QUIT);
 }
 
-// http://crbug.com/52858
-#if defined(OS_MACOSX)
-#define MAYBE_SimpleSessionEnding FLAKY_SimpleSessionEnding
-#define MAYBE_TwentyTabsWindowClose FLAKY_TwentyTabsWindowClose
-#define MAYBE_TwentyTabsUserQuit FLAKY_TwentyTabsUserQuit
-#else
-#define MAYBE_SimpleSessionEnding SimpleSessionEnding
-#define MAYBE_TwentyTabsWindowClose TwentyTabsWindowClose
-#define MAYBE_TwentyTabsUserQuit TwentyTabsUserQuit
-#endif
-
-TEST_F(ShutdownTest, MAYBE_SimpleSessionEnding) {
+TEST_F(ShutdownTest, SimpleSessionEnding) {
   RunShutdownTest("shutdown", "simple-session-ending",
                   true, /* important */ SIMPLE, UITest::SESSION_ENDING);
 }
 
-TEST_F(ShutdownTest, MAYBE_TwentyTabsWindowClose) {
+TEST_F(ShutdownTest, TwentyTabsWindowClose) {
   RunShutdownTest("shutdown", "twentytabs-window-close",
                   true, /* important */ TWENTY_TABS, UITest::WINDOW_CLOSE);
 }
 
-TEST_F(ShutdownTest, MAYBE_TwentyTabsUserQuit) {
+TEST_F(ShutdownTest, TwentyTabsUserQuit) {
   RunShutdownTest("shutdown", "twentytabs-user-quit",
                   true, /* important */ TWENTY_TABS, UITest::USER_QUIT);
 }
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 31bdaf9..df381ab 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -297,13 +297,7 @@ TEST_F(StartupTest, PerfFewTabsReference) {
   RunPerfTestWithManyTabs("few_tabs", "cmdline-ref", 5, 2, false);
 }
 
-// http://crbug.com/52858
-#if defined(OS_MACOSX)
-#define MAYBE_PerfRestoreFewTabs FLAKY_PerfRestoreFewTabs
-#else
-#define MAYBE_PerfRestoreFewTabs PerfRestoreFewTabs
-#endif
-TEST_F(StartupTest, MAYBE_PerfRestoreFewTabs) {
+TEST_F(StartupTest, PerfRestoreFewTabs) {
   RunPerfTestWithManyTabs("few_tabs", "restore", 5, 2, true);
 }
 
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index be46943..0fc336d 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -45,9 +45,7 @@ TEST_F(NPAPITesterBase, Arguments) {
 }
 
 // Test invoking many plugins within a single page.
-// Test still flaky under valgrind
-// http://crbug.com/28372, http://crbug.com/45561
-TEST_F(NPAPITesterBase, FLAKY_ManyPlugins) {
+TEST_F(NPAPITesterBase, ManyPlugins) {
   const FilePath test_case(FILE_PATH_LITERAL("many_plugins.html"));
   GURL url(ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case));
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
@@ -336,8 +334,7 @@ TEST_F(NPAPITesterBase, EnsureScriptingWorksInDestroy) {
 
 // This test uses a Windows Event to signal to the plugin that it should crash
 // on NP_Initialize.
-// This is flaky. http://crbug.com/32048
-TEST_F(NPAPITesterBase, FLAKY_NoHangIfInitCrashes) {
+TEST_F(NPAPITesterBase, NoHangIfInitCrashes) {
   if (UITest::in_process_renderer())
     return;
 
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index c3a0332..db057ff 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -920,9 +920,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_DeleteCookieTest) {
 const wchar_t kAnchorUrlNavigate[] =
     L"fulltab_anchor_url_navigate.html#chrome_frame";
 
-// http://code.google.com/p/chromium/issues/detail?id=35341
-TEST_F(ChromeFrameTestWithWebServer,
-       FLAKY_FullTabModeIE_AnchorUrlNavigateTest) {
+TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_AnchorUrlNavigateTest) {
   if (IsIBrowserServicePatchEnabled()) {
     LOG(ERROR) << "Not running test. IBrowserServicePatch is in place.";
     return;