Mark some disabled tests as flaky to increase test coverage.

chrome/browser/tab_restore_uitest.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #if defined(OS_WIN)
 #include "base/win_util.h"
 #endif
@@ skipping 182 matching lines @@
 
   // And make sure everything looks right.
   ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
   EXPECT_EQ(starting_tab_count + 3, tab_count);
   EXPECT_EQ(closed_tab_index, GetActiveTabIndex());
   EXPECT_EQ(url1_, GetActiveTabURL());
 }
 
 // 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
   // active application, which will establish a baseline for later calls to
   // CheckActiveWindow(). See comments in that function.
   CheckActiveWindow(browser_proxy.get());
 
   int starting_tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&starting_tab_count));
   int tab_count = AddSomeTabs(browser_proxy.get(), 3);
@@ skipping 114 matching lines @@
   bool is_timeout = false;
   bool enabled =
     browser_proxy->IsPageMenuCommandEnabledWithTimeout(IDC_RESTORE_TAB,
         action_max_timeout_ms(), &is_timeout);
   if (!is_timeout)
     ASSERT_FALSE(enabled);
 }
 
 // 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());
 
   int starting_tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&starting_tab_count));
   int tab_count = AddSomeTabs(browser_proxy.get(), 3);
 
   // Close one in the middle
   int closed_tab_index = starting_tab_count + 1;
   scoped_refptr<TabProxy> new_tab(browser_proxy->GetTab(closed_tab_index));
@@ skipping 244 matching lines @@
   GURL url;
   ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
   EXPECT_TRUE(url == url1_);
 
   restored_tab_proxy = browser_proxy->GetTab(initial_tab_count + 1);
   ASSERT_TRUE(restored_tab_proxy.get());
   ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
   ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
   EXPECT_TRUE(url == url2_);
 }