diff options
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 9 | ||||
| -rw-r--r-- | chrome/test/automated_ui_tests/automated_ui_test_test.cc | 13 |
2 files changed, 19 insertions, 3 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 5535124..0cb8f829 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -20,6 +20,13 @@ #include "net/base/net_util.h" #include "net/url_request/url_request_unittest.h" +// http://code.google.com/p/chromium/issues/detail?id=14774 +#if defined(OS_WIN) && !defined(NDEBUG) +#define MAYBE_BasicRestoreFromClosedWindow DISABLED_BasicRestoreFromClosedWindow +#else +#define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow +#endif + class TabRestoreUITest : public UITest { public: TabRestoreUITest() : UITest() { @@ -235,7 +242,7 @@ TEST_F(TabRestoreUITest, DISABLED_RestoreToDifferentWindow) { // Close a tab, open a new window, close the first window, then restore the // tab. It should be in a new window. -TEST_F(TabRestoreUITest, BasicRestoreFromClosedWindow) { +TEST_F(TabRestoreUITest, MAYBE_BasicRestoreFromClosedWindow) { scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); CheckActiveWindow(browser_proxy.get()); diff --git a/chrome/test/automated_ui_tests/automated_ui_test_test.cc b/chrome/test/automated_ui_tests/automated_ui_test_test.cc index 00e641d..f69f542 100644 --- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc +++ b/chrome/test/automated_ui_tests/automated_ui_test_test.cc @@ -22,6 +22,15 @@ OpenCloseBrowserWindowWithAccelerator #endif +// http://code.google.com/p/chromium/issues/detail?id=14774 +#if defined(OS_WIN) && !defined(NDEBUG) +#define MAYBE_CloseTab DISABLED_CloseTab +#define MAYBE_CloseBrowserWindow DISABLED_CloseBrowserWindow +#else +#define MAYBE_CloseTab CloseTab +#define MAYBE_CloseBrowserWindow CloseBrowserWindow +#endif + TEST_F(AutomatedUITestBase, NewTab) { int tab_count; active_browser()->GetTabCount(&tab_count); @@ -64,7 +73,7 @@ TEST_F(AutomatedUITestBase, DISABLED_RestoreTab) { ASSERT_EQ(2, tab_count); } -TEST_F(AutomatedUITestBase, CloseTab) { +TEST_F(AutomatedUITestBase, MAYBE_CloseTab) { int num_browser_windows; int tab_count; NewTab(); @@ -154,7 +163,7 @@ TEST_F(AutomatedUITestBase, OpenBrowserWindow) { ASSERT_EQ(1, num_browser_windows); } -TEST_F(AutomatedUITestBase, CloseBrowserWindow) { +TEST_F(AutomatedUITestBase, MAYBE_CloseBrowserWindow) { int tab_count; NewTab(); active_browser()->GetTabCount(&tab_count); |