Index: chrome/browser/tab_restore_uitest.cc |
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc |
index 9e3dac0db8a43aac2d6db49d6dd5dfa74aa276d0..975a6277ec2df918530b1e186eeea8cbe08a2d54 100644 |
--- a/chrome/browser/tab_restore_uitest.cc |
+++ b/chrome/browser/tab_restore_uitest.cc |
@@ -24,13 +24,17 @@ |
#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 { |
@@ -207,8 +211,7 @@ 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. |
-// 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()); |
@@ -396,8 +399,7 @@ TEST_F(TabRestoreUITest, MAYBE_RestoreWindowAndTab) { |
// 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()); |