diff options
author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 20:44:15 +0000 |
---|---|---|
committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 20:44:15 +0000 |
commit | 9a2f1db004542314746b2f21839964d8a9b4a122 (patch) | |
tree | cb9cbce839860f6535de42adc0c890114f48be77 /chrome/worker | |
parent | a9e8b391a900c2a28b07a61848c3383bc4c56979 (diff) | |
download | chromium_src-9a2f1db004542314746b2f21839964d8a9b4a122.zip chromium_src-9a2f1db004542314746b2f21839964d8a9b4a122.tar.gz chromium_src-9a2f1db004542314746b2f21839964d8a9b4a122.tar.bz2 |
Prospectively re-enabling QueuedSharedWorkerShutdown.
BUG=42641
TEST=the test itself
Review URL: http://codereview.chromium.org/3526006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r-- | chrome/worker/worker_uitest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index a1c4605..e92dea5c 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -581,14 +581,7 @@ TEST_F(WorkerTest, WorkerClose) { ASSERT_TRUE(WaitForProcessCountToBe(1, 0)); } -// Times out on Mac OS 10.5, http://crbug.com/42641 -#if defined (OS_MACOSX) -#define MAYBE_QueuedSharedWorkerShutdown FLAKY_QueuedSharedWorkerShutdown -#else -#define MAYBE_QueuedSharedWorkerShutdown QueuedSharedWorkerShutdown -#endif - -TEST_F(WorkerTest, MAYBE_QueuedSharedWorkerShutdown) { +TEST_F(WorkerTest, QueuedSharedWorkerShutdown) { // Tests to make sure that queued shared workers are started up when // shared workers shut down. int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; |