| Index: chrome/worker/worker_uitest.cc
|
| diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
|
| index 5d2004ed054c7392d471cc1149d23dc08bfab045..8453a1aa386b6ba2ce92cba1c3f74784952c1c46 100644
|
| --- a/chrome/worker/worker_uitest.cc
|
| +++ b/chrome/worker/worker_uitest.cc
|
| @@ -632,15 +632,8 @@ TEST_F(WorkerTest, FLAKY_MultipleTabsQueuedSharedWorker) {
|
| ASSERT_TRUE(WaitForProcessCountToBe(3, max_workers_per_tab));
|
| }
|
|
|
| -// Only flaky on Mac http://crbug.com/48148
|
| -#if defined(OS_MACOSX)
|
| -#define MAYBE_QueuedSharedWorkerStartedFromOtherTab \
|
| - FLAKY_QueuedSharedWorkerStartedFromOtherTab
|
| -#else
|
| -#define MAYBE_QueuedSharedWorkerStartedFromOtherTab \
|
| - QueuedSharedWorkerStartedFromOtherTab
|
| -#endif
|
| -TEST_F(WorkerTest, MAYBE_QueuedSharedWorkerStartedFromOtherTab) {
|
| +// Flaky: http://crbug.com/48148
|
| +TEST_F(WorkerTest, FLAKY_QueuedSharedWorkerStartedFromOtherTab) {
|
| // Tests to make sure that queued shared workers are started up when
|
| // an instance is launched from another tab.
|
| int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
|
|
|