summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 18:59:46 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 18:59:46 +0000
commit05581b6929b99db598399115d4090e1316b59310 (patch)
tree7b05bd35e1812de74d42a8b6022602f8473da7f4 /chrome/browser/sessions
parenta91018e2bbea4ea50385a97955a5bfd15284eaa7 (diff)
downloadchromium_src-05581b6929b99db598399115d4090e1316b59310.zip
chromium_src-05581b6929b99db598399115d4090e1316b59310.tar.gz
chromium_src-05581b6929b99db598399115d4090e1316b59310.tar.bz2
Switch hanging session restore tests from FAILS to RESTORE
TBR=mark BUG=45108 TEST=Greener Mac UI test bots. Review URL: http://codereview.chromium.org/2238003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
-rw-r--r--chrome/browser/sessions/session_restore_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc
index 255a6b3..c5e5632 100644
--- a/chrome/browser/sessions/session_restore_uitest.cc
+++ b/chrome/browser/sessions/session_restore_uitest.cc
@@ -329,7 +329,7 @@ TEST_F(SessionRestoreUITest, NormalAndPopup) {
#if defined(OS_MACOSX)
// Fails an SQL assertion on Mac: http://crbug.com/45108
-#define DontRestoreWhileIncognito FAILS_DontRestoreWhileIncognito
+#define DontRestoreWhileIncognito DISABLED_DontRestoreWhileIncognito
#endif
// Creates a browser, goes incognito, closes browser, launches and make sure
// we don't restore.
@@ -406,7 +406,7 @@ TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) {
#if defined(OS_MACOSX)
// Fails an SQL assertion on Mac: http://crbug.com/45108
#define FLAKY_RestoreAfterClosingTabbedBrowserWithAppAndLaunching \
- FAILS_RestoreAfterClosingTabbedBrowserWithAppAndLaunching
+ DISABLED_RestoreAfterClosingTabbedBrowserWithAppAndLaunching
#endif
// Launches an app window, closes tabbed browser, launches and makes sure
// we restore the tabbed browser url.