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

Unified Diff: chrome/browser/tab_restore_uitest.cc

Issue 6372015: Removes FLAKY from a couple of tests as they have not failed in the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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 | no next file » | 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 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());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698