5 files changed, 12 insertions, 11 deletions
diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc
index 3daab18..fe06d8b 100644
--- a/chrome/browser/session_history_uitest.cc
+++ b/chrome/browser/session_history_uitest.cc
@@ -483,9 +483,9 @@ TEST_F(SessionHistoryTest, JavascriptHistory) {
   // NotificationService.)
 }
 
-// This test is flaky and has been disabled. It looks like the server does not
-// start fast enough, and the navigation fails (with 404). See bug 8444.
-TEST_F(SessionHistoryTest, DISABLED_LocationReplace) {
+// This test is flaky. It looks like the server does not start fast enough,
+// and the navigation fails (with 404). See http://crbug.com/8444.
+TEST_F(SessionHistoryTest, FLAKY_LocationReplace) {
   // Test that using location.replace doesn't leave the title of the old page
   // visible.
   scoped_refptr<HTTPTestServer> server =
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index 70a4a39..491ba8a 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -200,8 +200,8 @@ TEST_F(TabRestoreUITest, MiddleTab) {
 
 // Close a tab, switch windows, then restore the tab. The tab should be in its
 // original window and position, and active.
-// Disabled because flacky. See http://crbug.com/14132 and 11213.
-TEST_F(TabRestoreUITest, DISABLED_RestoreToDifferentWindow) {
+// This test is flaky. See http://crbug.com/14132 and 11213.
+TEST_F(TabRestoreUITest, FLAKY_RestoreToDifferentWindow) {
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
 
   // This call is virtually guaranteed to pass, assuming that Chromium is the
@@ -336,8 +336,8 @@ TEST_F(TabRestoreUITest, DISABLED_DontLoadRestoredTab) {
 
 // Open a window with multiple tabs, close a tab, then close the window.
 // Restore both and make sure the tab goes back into the window.
-// Disabled because flakey. See http://crbug.com/14132
-TEST_F(TabRestoreUITest, DISABLED_RestoreWindowAndTab) {
+// This test is flaky. See http://crbug.com/14132
+TEST_F(TabRestoreUITest, FLAKY_RestoreWindowAndTab) {
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   CheckActiveWindow(browser_proxy.get());
 
diff --git a/chrome/browser/views/find_bar_host_browsertest.cc b/chrome/browser/views/find_bar_host_browsertest.cc
index 6c108de..35b1b6e 100644
--- a/chrome/browser/views/find_bar_host_browsertest.cc
+++ b/chrome/browser/views/find_bar_host_browsertest.cc
@@ -419,7 +419,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
 // Make sure Find box disappears on Navigate but not on Refresh.
 // Flaky, see http://crbug.com/16447.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
-                       DISABLED_FindDisappearOnNavigate) {
+                       FLAKY_FindDisappearOnNavigate) {
   HTTPTestServer* server = StartHTTPServer();
 
   // First we navigate to our special focus tracking page.
@@ -497,7 +497,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
 // Make sure Find box moves out of the way if it is obscuring the active match.
 // Flaky, see http://crbug.com/16447.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
-                       DISABLED_FindMovesWhenObscuring) {
+                       FLAKY_FindMovesWhenObscuring) {
   HTTPTestServer* server = StartHTTPServer();
 
   GURL url = server->TestServerPageW(kMoveIfOver);
diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc
index 2c36d36..851727a 100644
--- a/chrome/browser/views/tabs/tab_dragging_test.cc
+++ b/chrome/browser/views/tabs/tab_dragging_test.cc
@@ -234,7 +234,7 @@ TEST_F(TabDraggingTest, DISABLED_Tab1Tab3) {
 // Drag Tab_1 into the position of Tab_3, and press ESCAPE before releasing the
 // left mouse button.
 // Flaky, see http://crbug.com/21092.
-TEST_F(TabDraggingTest, DISABLED_Tab1Tab3Escape) {
+TEST_F(TabDraggingTest, FLAKY_Tab1Tab3Escape) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<WindowProxy> window(browser->GetWindow());
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 9b19c5e..333ce95 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -1071,7 +1071,8 @@ TEST_F(AutomationProxyVisibleTest, DISABLED_AutocompleteMatchesTest) {
   EXPECT_FALSE(matches.empty());
 }
 
-// Disabled because flaky see bug #5314.
+// This test is flaky, see http://crbug.com/5314. Disabled because it hangs
+// on Mac (http://crbug.com/25039).
 TEST_F(AutomationProxyTest, DISABLED_AppModalDialogTest) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());