diff options
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index a712051f..6dc4466 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -180,7 +180,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. -TEST_F(TabRestoreUITest, RestoreToDifferentWindow) { +// Disabled as per: http://crbug.com/10916 +TEST_F(TabRestoreUITest, DISABLED_RestoreToDifferentWindow) { scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); // This call is virtually guaranteed to pass, assuming that Chromium is the @@ -276,8 +277,7 @@ TEST_F(TabRestoreUITest, BasicRestoreFromClosedWindow) { // 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. // This test currently disabled. See http://crbug.com/10916 -TEST_F(TabRestoreUITest, RestoreWindowAndTab) { -#if 0 +TEST_F(TabRestoreUITest, DISABLED_RestoreWindowAndTab) { scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); CheckActiveWindow(browser_proxy.get()); @@ -326,7 +326,6 @@ TEST_F(TabRestoreUITest, RestoreWindowAndTab) { ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count)); EXPECT_EQ(starting_tab_count + 3, tab_count); EXPECT_EQ(url1_, GetActiveTabURL(1)); -#endif } // Open a window with two tabs, close both (closing the window), then restore |