diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 22:05:13 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 22:05:13 +0000 |
| commit | 28191891f2389382e4e53d004e04a74bcb1b152e (patch) | |
| tree | ba47a955a1347bf43585c6e5c8ae23116eb8b49e /chrome/browser/unload_uitest.cc | |
| parent | 1f05db25d586c82e8420a8a28c1d0b6a7bcf44e6 (diff) | |
| download | chromium_src-28191891f2389382e4e53d004e04a74bcb1b152e.zip chromium_src-28191891f2389382e4e53d004e04a74bcb1b152e.tar.gz chromium_src-28191891f2389382e4e53d004e04a74bcb1b152e.tar.bz2 | |
Inform the command updater of the tab restore state.
BUG=14428
TEST=TabRestoreUITest.*
Review URL: http://codereview.chromium.org/2228004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/unload_uitest.cc')
| -rw-r--r-- | chrome/browser/unload_uitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc index e0185c8..d83ff25 100644 --- a/chrome/browser/unload_uitest.cc +++ b/chrome/browser/unload_uitest.cc @@ -187,7 +187,7 @@ class UnloadTest : public UITest { // we don't get confused and think we're closing the tab. // // This test is flaky on the valgrind UI bots. http://crbug.com/39057 -TEST_F(UnloadTest, FLAKY_CrossSiteInfiniteUnloadAsync) { +TEST_F(UnloadTest, DISABLED_CrossSiteInfiniteUnloadAsync) { // Tests makes no sense in single-process mode since the renderer is hung. if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) return; @@ -219,8 +219,8 @@ TEST_F(UnloadTest, CrossSiteInfiniteUnloadSync) { // Then an async crosssite request followed by an input event to ensure that // the short unload timeout (not the long input event timeout) is used. // See crbug.com/11007. -TEST_F(UnloadTest, DISABLED_CrossSiteInfiniteUnloadAsyncInputEvent) { - // Tests makes no sense in single-process mode since the renderer is hung. +TEST_F(UnloadTest, FLAKY_CrossSiteInfiniteUnloadAsyncInputEvent) { + // Tests makes no sense in single-process mode since the renderer is hung.c if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) return; |