Enabled a number of worker tests on various platforms.

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/app/chrome_dll_resource.h"
 #include "chrome/browser/worker_host/worker_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
@@ skipping 59 matching lines @@
 
       PlatformThread::Sleep(sleep_timeout_ms() / 10);
     }
 
     EXPECT_EQ(number_of_processes, cur_process_count);
     return false;
   }
 };
 
 
-#if defined(OS_LINUX)
-// Fails running under valgrind, http://crbug.com/28445
-#define SingleWorker DISABLED_SingleWorker
-#endif
-
 TEST_F(WorkerTest, SingleWorker) {
   RunTest(L"single_worker.html");
 }
 
 TEST_F(WorkerTest, MultipleWorkers) {
   RunTest(L"multi_worker.html");
 }
 
+TEST_F(WorkerTest, SingleSharedWorker) {
+  RunTest(L"single_worker.html?shared=true");
+}
+
+TEST_F(WorkerTest, MultipleSharedWorkers) {
+  RunTest(L"multi_worker.html?shared=true");
+}
+
 #if defined(OS_LINUX)
 #define IncognitoSharedWorkers FLAKY_IncognitoSharedWorkers
 #endif
 
 // Incognito windows should not share workers with non-incognito windows
 TEST_F(WorkerTest, IncognitoSharedWorkers) {
   // Load a non-incognito tab and have it create a shared worker
   RunTest(L"incognito_worker.html");
   // Incognito worker should not share with non-incognito
   RunIncognitoTest(L"incognito_worker.html");
 }
 
 #if defined(OS_LINUX) || defined (OS_MACOSX)
-#define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests
+#define WorkerFastLayoutTests FLAKY_WorkerFastLayoutTests
 #endif
 
 TEST_F(WorkerTest, WorkerFastLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "stress-js-execution.html",
     "use-machine-stack.html",
     "worker-call.html",
     "worker-cloneport.html",
     "worker-close.html",
     "worker-constructor.html",
@@ skipping 38 matching lines @@
   // helps leaks trackers do a better job of reporting.
   scoped_refptr<TabProxy> tab(GetActiveTab());
   GURL about_url(std::string("file://localhost/"));
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(about_url));
 }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 // http://crbug.com/27636 - incorrect URL_MISMATCH exceptions sometimes get
 // generated on the windows try bots.
 // http://crbug.com/28445 - flakiness on mac
-#define SharedWorkerFastLayoutTests DISABLED_SharedWorkerFastLayoutTests
+#define SharedWorkerFastLayoutTests FLAKY_SharedWorkerFastLayoutTests
 #endif
 
 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
 // These tests are flaky on linux/views builds.
 // See http://crbug.com/28808.
 #define MessagePorts FLAKY_MessagePorts
 #define SharedWorkerFastLayoutTests FLAKY_SharedWorkerFastLayoutTests
 #endif
 
 TEST_F(WorkerTest, SharedWorkerFastLayoutTests) {
@@ skipping 63 matching lines @@
   FilePath worker_test_dir;
   worker_test_dir = worker_test_dir.AppendASCII("workers");
   InitializeForLayoutTest(http_test_dir, worker_test_dir, true);
 
   StartHttpServer(new_http_root_dir_);
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
     RunLayoutTest(kLayoutTestFiles[i], true);
   StopHttpServer();
 }
 
-#if defined(OS_LINUX)
-// Fails running under valgrind http://crbug.com/28445
-#define WorkerXhrHttpLayoutTests DISABLED_WorkerXhrHttpLayoutTests
-#endif
-
 TEST_F(WorkerTest, WorkerXhrHttpLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "abort-exception-assert.html",
 #if defined(OS_WIN)
     // Fails on the mac (and linux?):
     // http://code.google.com/p/chromium/issues/detail?id=22599
     "close.html",
 #endif
     // These tests (and the shared-worker versions below) are disabled due to
     // limitations in lighttpd (doesn't handle all of the HTTP methods).
@@ skipping 55 matching lines @@
   // MessagePort tests also rely on common files in js/resources.
   FilePath js_dir = fast_test_dir.AppendASCII("js");
   FilePath resource_dir;
   resource_dir = resource_dir.AppendASCII("resources");
   AddResourceForLayoutTest(js_dir, resource_dir);
 
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
     RunLayoutTest(kLayoutTestFiles[i], false);
 }
 
-// Disable LimitPerPage on Linux. Seems to work on Mac though:
-// http://code.google.com/p/chromium/issues/detail?id=22608
-#if !defined(OS_LINUX)
-// This test fails after WebKit merge 49414:49432. (BUG=24652)
 TEST_F(WorkerTest, LimitPerPage) {
   int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
   GURL url = GetTestUrl(L"workers", L"many_workers.html");
   url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab + 1));
 
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURL(url));
 
   ASSERT_TRUE(WaitForProcessCountToBe(1, max_workers_per_tab));
 }
-#endif
 
-#if defined(OS_LINUX)
-// Fails (crashes) on Linux Tests: http://crbug.com/28445
-#define LimitTotal DISABLED_LimitTotal
-#elif defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX)
 // Doesn't crash, but on Mac it sometimes fails for a few runs in a row,
 // http://crbug.com/28445
 #define LimitTotal FLAKY_LimitTotal
 #endif
 
 TEST_F(WorkerTest, LimitTotal) {
   int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
   int total_workers = WorkerService::kMaxWorkersWhenSeparate;
 
   int tab_count = (total_workers / max_workers_per_tab) + 1;
   GURL url = GetTestUrl(L"workers", L"many_workers.html");
   url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab));
 
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURL(url));
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   for (int i = 1; i < tab_count; ++i)
     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));
 }