diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 19:35:58 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 19:35:58 +0000 |
| commit | 733b9d09e21c8b45b629dccb60a3ed0ae199d3f2 (patch) | |
| tree | a826c56c2999456aba96f7b970aaf0551d07daa6 /chrome/browser/sessions | |
| parent | de2d8003300bd03cf83c95ca5f5a9582dc99fdf4 (diff) | |
| download | chromium_src-733b9d09e21c8b45b629dccb60a3ed0ae199d3f2.zip chromium_src-733b9d09e21c8b45b629dccb60a3ed0ae199d3f2.tar.gz chromium_src-733b9d09e21c8b45b629dccb60a3ed0ae199d3f2.tar.bz2 | |
Marking RestoreOnNewWindowWithNoTabbedBrowsers as FAILS_ on non-Windows.
It was enabled in r48104, but fails on linux views dbg.
BUG=39476
TEST=SessionRestoreTest.RestoreOnNewWindowWithNoTabbedBrowsers
Review URL: http://codereview.chromium.org/2165006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore_browsertest.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 517cc75..3120e33 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -12,10 +12,19 @@ typedef InProcessBrowserTest SessionRestoreTest; +#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) +// http://crbug.com/39476 +#define MAYBE_RestoreOnNewWindowWithNoTabbedBrowsers \ + FAILS_RestoreOnNewWindowWithNoTabbedBrowsers +#else +#define MAYBE_RestoreOnNewWindowWithNoTabbedBrowsers \ + RestoreOnNewWindowWithNoTabbedBrowsers +#endif + // Makes sure when session restore is triggered in the same process we don't end // up with an extra tab. IN_PROC_BROWSER_TEST_F(SessionRestoreTest, - RestoreOnNewWindowWithNoTabbedBrowsers) { + MAYBE_RestoreOnNewWindowWithNoTabbedBrowsers) { if (browser_defaults::kRestorePopups) return; |