Removes FLAKY from a couple of tests as they have not failed in the

chrome/browser/tab_restore_uitest.cc

 // Copyright (c) 2011 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"
 #include "base/test/test_timeouts.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
 // http://code.google.com/p/chromium/issues/detail?id=14774
 #if (defined(OS_WIN) || defined(OS_CHROMEOS)) && !defined(NDEBUG)
 #define MAYBE_BasicRestoreFromClosedWindow DISABLED_BasicRestoreFromClosedWindow
 #else
 #define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow
 #endif
 
-// http://crbug.com/
+// http://crbug.com/48911
 #if defined(OS_CHROMEOS) && !defined(NDEBUG)
 #define MAYBE_RestoreWindowAndTab DISABLED_RestoreWindowAndTab
 #define MAYBE_RestoreWindow DISABLED_RestoreWindow
+#define MAYBE_RestoreToDifferentWindow DISABLED_RestoreToDifferentWindow
+#define MAYBE_RestoreIntoSameWindow DISABLED_RestoreIntoSameWindow
 #else
 #define MAYBE_RestoreWindowAndTab RestoreWindowAndTab
 #define MAYBE_RestoreWindow RestoreWindow
+#define MAYBE_RestoreToDifferentWindow RestoreToDifferentWindow
+#define MAYBE_RestoreIntoSameWindow RestoreIntoSameWindow
 #endif
 
 class TabRestoreUITest : public UITest {
  public:
   TabRestoreUITest() : UITest() {
     FilePath path_prefix(test_data_directory_);
     path_prefix = path_prefix.AppendASCII("session_history");
     url1_ = net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html"));
     url2_ = net::FilePathToFileURL(path_prefix.AppendASCII("bot2.html"));
   }
@@ skipping 156 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.
-// This test is flaky. See http://crbug.com/54894
-TEST_F(TabRestoreUITest, FLAKY_RestoreToDifferentWindow) {
+TEST_F(TabRestoreUITest, MAYBE_RestoreToDifferentWindow) {
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
 
   // 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));
@@ skipping 167 matching lines @@
   // Restore the closed tab.
   RestoreTab(1, closed_tab_index);
   CheckActiveWindow(browser_proxy.get());
   ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
   EXPECT_EQ(starting_tab_count + 3, tab_count);
   EXPECT_EQ(url1_, GetActiveTabURL(1));
 }
 
 // Open a window with two tabs, close both (closing the window), then restore
 // both. Make sure both restored tabs are in the same window.
-// http://crbug.com/39925
-TEST_F(TabRestoreUITest, FLAKY_RestoreIntoSameWindow) {
+TEST_F(TabRestoreUITest, MAYBE_RestoreIntoSameWindow) {
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
   CheckActiveWindow(browser_proxy.get());
 
   int starting_tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&starting_tab_count));
   int tab_count = AddSomeTabs(browser_proxy.get(), 2);
 
   // Navigate the rightmost one to url2_ for easier identification.
   scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetTab(tab_count - 1));
@@ skipping 261 matching lines @@
   ASSERT_TRUE(tab->WaitForTabToBeRestored(TestTimeouts::action_timeout_ms()));
   GURL url;
   ASSERT_TRUE(tab->GetCurrentURL(&url));
   ASSERT_EQ(http_url, url);
 
   // Go back, and see if content is as expected.
   ASSERT_TRUE(tab->GoBack());
   EXPECT_TRUE(tab->FindInPage(std::wstring(L"webkit"), FWD, IGNORE_CASE, false,
                               NULL));
 }