diff options
author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 20:55:50 +0000 |
---|---|---|
committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 20:55:50 +0000 |
commit | 6bdf7f5666d4214a70c23cdde03db94bc733baba (patch) | |
tree | 6a0ca59a829e5a2b48cc430d3b965aa3240a7eff | |
parent | b59ff1f7c6bbc82d7728848e8f8f7ee3c6940f28 (diff) | |
download | chromium_src-6bdf7f5666d4214a70c23cdde03db94bc733baba.zip chromium_src-6bdf7f5666d4214a70c23cdde03db94bc733baba.tar.gz chromium_src-6bdf7f5666d4214a70c23cdde03db94bc733baba.tar.bz2 |
SessionRestoreUITest.ShareProcessesOnRestore as flaky on windows too.
BUG=52022
Review URL: http://codereview.chromium.org/3883001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63100 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 949bdf4..9e56711 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -435,19 +435,14 @@ TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) { ASSERT_EQ(url1_, GetActiveTabURL()); } -#if defined(OS_LINUX) || defined(OS_MACOSX) -// Flaky, sometimes times out: http://crbug.com/52022 -#define MAYBE_ShareProcessesOnRestore FLAKY_ShareProcessesOnRestore -#else -#define MAYBE_ShareProcessesOnRestore ShareProcessesOnRestore -#endif // Make sure after a restore the number of processes matches that of the number // of processes running before the restore. This creates a new tab so that // we should have two new tabs running. (This test will pass in both // process-per-site and process-per-site-instance, because we treat the new tab // as a special case in process-per-site-instance so that it only ever uses one // process.) -TEST_F(SessionRestoreUITest, MAYBE_ShareProcessesOnRestore) { +// Flaky as per http://crbug.com/52022 +TEST_F(SessionRestoreUITest, FLAKY_ShareProcessesOnRestore) { if (in_process_renderer()) { // No point in running this test in single process mode. return; |