summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions
diff options
context:
space:
mode:
authorarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 17:15:18 +0000
committerarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 17:15:18 +0000
commitea555fd5d42cf2d6fcff7df5707cb1e7cde91214 (patch)
tree4e993aa17af6f9b5e812bd6d6c518f187aa83e82 /chrome/browser/sessions
parente337853a8b58e45ec707a1ab787d58b2c806640e (diff)
downloadchromium_src-ea555fd5d42cf2d6fcff7df5707cb1e7cde91214.zip
chromium_src-ea555fd5d42cf2d6fcff7df5707cb1e7cde91214.tar.gz
chromium_src-ea555fd5d42cf2d6fcff7df5707cb1e7cde91214.tar.bz2
Mark SessionRestoreTest.RestoreOnNewWindowWithNoTabbedBrowsers as flaky on non windows.
BUG=39476 TEST=None TBR=dmaclach git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
-rw-r--r--chrome/browser/sessions/session_restore_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index b9440cb0..93db388 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -12,10 +12,10 @@
typedef InProcessBrowserTest SessionRestoreTest;
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
+#if !defined(OS_WIN)
// http://crbug.com/39476
#define RestoreOnNewWindowWithNoTabbedBrowsers \
- DISABLED_RestoreOnNewWindowWithNoTabbedBrowsers
+ FLAKY_RestoreOnNewWindowWithNoTabbedBrowsers
#endif
// Makes sure when session restore is triggered in the same process we don't end