Resubmitting fix for 22174

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 "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"
 
 static const char kTestCompleteCookie[] = "status";
@@ skipping 20 matching lines @@
   RunTest(L"single_worker.html");
 }
 
 TEST_F(WorkerTest, MultipleWorkers) {
   RunTest(L"multi_worker.html");
 }
 
 TEST_F(WorkerTest, WorkerFastLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "stress-js-execution.html",
+#if defined(OS_WIN)
+    // Workers don't properly initialize the V8 stack guard.
+    // (http://code.google.com/p/chromium/issues/detail?id=21653).
     "use-machine-stack.html",
+#endif
     "worker-call.html",
-    //"worker-close.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",
+
+    // Disabled because worker exceptions outside of script eval() are not
+    // reported (http://code.google.com/p/chromium/issues/detail?id=20953)
+    // "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",
     "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"
   };
 
   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);
 
+  // Worker 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);
 }
 
 TEST_F(WorkerTest, WorkerHttpLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     // flakey? BUG 16934 "text-encoding.html",
+#if defined(OS_WIN)
+    // Fails on the mac (and linux?):
+    // http://code.google.com/p/chromium/issues/detail?id=22599
     "worker-importScripts.html",
+#endif
     "worker-redirect.html",
   };
 
   FilePath http_test_dir;
   http_test_dir = http_test_dir.AppendASCII("LayoutTests");
   http_test_dir = http_test_dir.AppendASCII("http");
   http_test_dir = http_test_dir.AppendASCII("tests");
 
   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();
 }
 
 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
     //"methods-async.html",
     //"methods.html",
     "xmlhttprequest-file-not-found.html"
   };
 
   FilePath http_test_dir;
   http_test_dir = http_test_dir.AppendASCII("LayoutTests");
   http_test_dir = http_test_dir.AppendASCII("http");
   http_test_dir = http_test_dir.AppendASCII("tests");
 
@@ skipping 13 matching lines @@
     "message-channel-gc.html",
     "message-channel-gc-2.html",
     "message-channel-gc-3.html",
     "message-channel-gc-4.html",
     "message-port.html",
     "message-port-clone.html",
     "message-port-constructor-for-deleted-document.html",
     "message-port-deleted-document.html",
     "message-port-deleted-frame.html",
     "message-port-inactive-document.html",
+    "message-port-multi.html",
     "message-port-no-wrapper.html",
     // Only works with run-webkit-tests --leaks.
     //"message-channel-listener-circular-ownership.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("events");
   InitializeForLayoutTest(fast_test_dir, worker_test_dir, false);
 
+  // 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)
 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));
 
   EXPECT_EQ(max_workers_per_tab + 1 + (UITest::in_process_renderer() ? 0 : 1),
             UITest::GetBrowserProcessCount());
 }
+#endif
 
+// Disable LimitTotal on Linux and Mac.
+// http://code.google.com/p/chromium/issues/detail?id=22608
+#if defined(OS_WIN)
 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.
   EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
             UITest::GetBrowserProcessCount());
 
   // Now close the first tab and check that the queued workers were started.
   tab->Close(true);
   tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
 
   EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
             UITest::GetBrowserProcessCount());
 }
+#endif