Re-enabling worker fast tests (doing a more surgical disabling of just a sing...

chrome/worker/worker_uitest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/string_util.h"
 #include "chrome/browser/worker_host/worker_service.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_layout_test.h"
 
@@ skipping 40 matching lines @@
 };
 
 TEST_F(WorkerTest, SingleWorker) {
   RunTest(L"single_worker.html");
 }
 
 TEST_F(WorkerTest, MultipleWorkers) {
   RunTest(L"multi_worker.html");
 }
 
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests) {
+#if defined(OS_LINUX)
+#define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests
+#endif
+
+TEST_F(WorkerTest, WorkerFastLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "stress-js-execution.html",
     "use-machine-stack.html",
     "worker-call.html",
-    // Disabled because cloning ports are too slow in Chromium to meet the
-    // thresholds in this test.
-    // http://code.google.com/p/chromium/issues/detail?id=22780
-    // "worker-cloneport.html",
-
+    "worker-cloneport.html",
     "worker-close.html",
     "worker-constructor.html",
     "worker-context-gc.html",
     "worker-context-multi-port.html",
     "worker-event-listener.html",
     "worker-gc.html",
     // worker-lifecycle.html relies on layoutTestController.workerThreadCount
     // which is not currently implemented.
     // "worker-lifecycle.html",
     "worker-location.html",
     "worker-messageport.html",
     // Disabled after r27089 (WebKit merge), http://crbug.com/22947
     // "worker-messageport-gc.html",
     "worker-multi-port.html",
     "worker-navigator.html",
     "worker-replace-global-constructor.html",
     "worker-replace-self.html",
     "worker-script-error.html",
     "worker-terminate.html",
-    "worker-timeout.html"
+    // clearInterval() sometimes lets the timer continue to fire
+    // http://code.google.com/p/chromium/issues/detail?id=25548
+    // "worker-timeout.html"
   };
 
   FilePath fast_test_dir;
   fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
   fast_test_dir = fast_test_dir.AppendASCII("fast");
 
   FilePath worker_test_dir;
   worker_test_dir = worker_test_dir.AppendASCII("workers");
   InitializeForLayoutTest(fast_test_dir, worker_test_dir, false);
 
@@ skipping 134 matching lines @@
     window->AppendTab(url);
 
   // Check that we didn't create more than the max number of workers.
   ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers));
 
   // Now close a page and check that the queued workers were started.
   tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
 
   ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers));
 }