summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/worker/worker_uitest.cc9
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;