Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3526)

Unified Diff: chrome/browser/tab_restore_uitest.cc

Issue 2895012: Disablging failing ui tests: RestoreWindow and RestoreWindowAndTab (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gfx/size.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_restore_uitest.cc
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index f471b5b0aa18a58f1db691d5352a8ee589e2e1c0..f40178e35d0a79549d56c78f3d0b48a1974ea241 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -28,6 +28,15 @@
#define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow
#endif
+// http://crbug.com/
+#if defined(OS_CHROMEOS) && !defined(NDEBUG)
+#define MAYBE_RestoreWindowAndTab DISABLED_RestoreWindowAndTab
+#define MAYBE_RestoreWindow DISABLED_RestoreWindow
+#else
+#define MAYBE_RestoreWindowAndTab RestoreWindowAndTab
+#define MAYBE_RestoreWindow RestoreWindow
+#endif
+
class TabRestoreUITest : public UITest {
public:
TabRestoreUITest() : UITest() {
@@ -335,7 +344,7 @@ TEST_F(TabRestoreUITest, DontLoadRestoredTab) {
// 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.
-TEST_F(TabRestoreUITest, RestoreWindowAndTab) {
+TEST_F(TabRestoreUITest, MAYBE_RestoreWindowAndTab) {
scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser_proxy.get());
CheckActiveWindow(browser_proxy.get());
@@ -548,7 +557,7 @@ TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) {
EXPECT_EQ(http_url2, GetActiveTabURL());
}
-TEST_F(TabRestoreUITest, RestoreWindow) {
+TEST_F(TabRestoreUITest, MAYBE_RestoreWindow) {
// Create a new window.
int window_count;
ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
« no previous file with comments | « no previous file | gfx/size.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698