Rewrite HTML5 workers ui_tests to browser_tests. Compared to ui_tests, browser_tests are faster, le…

content/browser/worker_host/test/worker_browsertest.cc

Index: content/browser/worker_host/test/worker_browsertest.cc
===================================================================
--- content/browser/worker_host/test/worker_browsertest.cc	(revision 0)
+++ content/browser/worker_host/test/worker_browsertest.cc	(working copy)
@@ -2,409 +2,214 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
 #include "base/file_path.h"
+#include "base/path_service.h"
+#include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
-#include "base/threading/platform_thread.h"
-#include "chrome/app/chrome_command_ids.h"
-#include "chrome/test/automation/automation_proxy.h"
-#include "chrome/test/automation/browser_proxy.h"
-#include "chrome/test/automation/tab_proxy.h"
-#include "chrome/test/base/layout_test_http_server.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "chrome/test/ui/ui_layout_test.h"
+#include "content/browser/worker_host/worker_process_host.h"
 #include "content/browser/worker_host/worker_service_impl.h"
-#include "content/public/common/url_constants.h"
-#include "net/test/test_server.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/common/content_paths.h"
+#include "content/test/layout_browsertest.h"
+#include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
 using content::WorkerServiceImpl;
 
-namespace {
-
-const char kTestCompleteCookie[] = "status";
-const char kTestCompleteSuccess[] = "OK";
-const FilePath::CharType* kTestDir =
-    FILE_PATH_LITERAL("workers");
-const FilePath::CharType* kManySharedWorkersFile =
-    FILE_PATH_LITERAL("many_shared_workers.html");
-const FilePath::CharType* kQuerySharedWorkerShutdownFile =
-    FILE_PATH_LITERAL("queued_shared_worker_shutdown.html");
-const FilePath::CharType* kShutdownSharedWorkerFile =
-    FILE_PATH_LITERAL("shutdown_shared_worker.html");
-const FilePath::CharType* kSingleSharedWorkersFile =
-    FILE_PATH_LITERAL("single_shared_worker.html");
-const FilePath::CharType* kWorkerClose =
-    FILE_PATH_LITERAL("worker_close.html");
-
-}  // anonymous namespace
-
-class WorkerTest : public UILayoutTest {
- protected:
-  virtual ~WorkerTest() { }
-
-  void RunTest(const FilePath& test_case, const std::string& query) {
-    scoped_refptr<TabProxy> tab(GetActiveTab());
-    ASSERT_TRUE(tab.get());
-
-    FilePath test_file_path = ui_test_utils::GetTestFilePath(
-        FilePath(kTestDir), test_case);
-    GURL url = ui_test_utils::GetFileUrlWithQuery(test_file_path, query);
-    ASSERT_TRUE(tab->NavigateToURL(url));
-
-    std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
-        kTestCompleteCookie, TestTimeouts::action_max_timeout_ms());
-    ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
+class WorkerLayoutTest : public InProcessBrowserLayoutTest {
+ public:
+  WorkerLayoutTest() : InProcessBrowserLayoutTest(
+      FilePath(), FilePath().AppendASCII("fast").AppendASCII("workers")) {
   }
-
-  void RunIncognitoTest(const FilePath& test_case) {
-    scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
-    ASSERT_TRUE(browser.get());
-
-    // Open an Incognito window.
-    ASSERT_TRUE(browser->RunCommand(IDC_NEW_INCOGNITO_WINDOW));
-    scoped_refptr<BrowserProxy> incognito(automation()->GetBrowserWindow(1));
-    ASSERT_TRUE(incognito.get());
-    int window_count;
-    ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
-    ASSERT_EQ(2, window_count);
-
-    scoped_refptr<TabProxy> tab(incognito->GetTab(0));
-    ASSERT_TRUE(tab.get());
-
-    GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
-    ASSERT_TRUE(tab->NavigateToURL(url));
-
-    std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
-        kTestCompleteCookie, TestTimeouts::action_max_timeout_ms());
-
-    // Close the incognito window
-    ASSERT_TRUE(incognito->RunCommand(IDC_CLOSE_WINDOW));
-    ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
-    ASSERT_EQ(1, window_count);
-
-    ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
+    AddResourceForLayoutTest(
+        FilePath().AppendASCII("fast").AppendASCII("js"),
+        FilePath().AppendASCII("resources"));
   }
-
-  bool WaitForProcessCountToBeAtLeast(int tabs, int workers) {
-    // The 1 is for the browser process.
-    int number_of_processes = 1 + workers + tabs;
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-    // On Unix, we also have a zygote process and a sandbox host process.
-    number_of_processes += 2;
-#endif
-
-    int cur_process_count;
-    for (int i = 0; i < 100; ++i) {
-      cur_process_count = 0;
-      if (!GetBrowserProcessCount(&cur_process_count))
-        return false;
-      if (cur_process_count >= number_of_processes)
-        return true;
-
-      // Sometimes the worker processes can take a while to shut down on the
-      // bots, so use a longer timeout period to avoid spurious failures.
-      base::PlatformThread::Sleep(TestTimeouts::action_max_timeout() / 100);
-    }
-
-    EXPECT_GE(cur_process_count, number_of_processes);
-    return false;
-  }
-
-  void RunWorkerFastLayoutTest(const std::string& test_case_file_name) {
-    FilePath fast_test_dir;
-    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, kNoHttpPort);
-
-    // 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);
-
-    printf("Test: %s\n", test_case_file_name.c_str());
-    RunLayoutTest(test_case_file_name, kNoHttpPort);
-
-    // Navigate to a blank page so that any workers are cleaned up.
-    // This helps leaks trackers do a better job of reporting.
-    scoped_refptr<TabProxy> tab(GetActiveTab());
-    GURL about_url(chrome::kAboutBlankURL);
-    EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(about_url));
-  }
-
-  void RunWorkerStorageLayoutTest(const std::string& test_case_file_name) {
-    FilePath worker_test_dir;
-    worker_test_dir = worker_test_dir.AppendASCII("fast");
-    worker_test_dir = worker_test_dir.AppendASCII("workers");
-
-    FilePath storage_test_dir;
-    storage_test_dir = storage_test_dir.AppendASCII("storage");
-    InitializeForLayoutTest(worker_test_dir, storage_test_dir, kNoHttpPort);
-
-    // Storage worker tests also rely on common files in 'resources'.
-    FilePath resource_dir;
-    resource_dir = resource_dir.AppendASCII("resources");
-    AddResourceForLayoutTest(worker_test_dir.Append(storage_test_dir),
-                             resource_dir);
-
-    printf("Test: %s\n", test_case_file_name.c_str());
-    RunLayoutTest(test_case_file_name, kNoHttpPort);
-
-    // Navigate to a blank page so that any workers are cleaned up.
-    // This helps leaks trackers do a better job of reporting.
-    scoped_refptr<TabProxy> tab(GetActiveTab());
-    GURL about_url(chrome::kAboutBlankURL);
-    EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(about_url));
-  }
-
-  bool NavigateAndWaitForAuth(TabProxy* tab, const GURL& url) {
-    // Pass a large number of navigations to tell the tab to block until an auth
-    // dialog pops up.
-    EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_AUTH_NEEDED,
-              tab->NavigateToURLBlockUntilNavigationsComplete(url, 100));
-    return tab->NeedsAuth();
-  }
 };
 
-
-TEST_F(WorkerTest, SingleWorker) {
-  RunTest(FilePath(FILE_PATH_LITERAL("single_worker.html")), "");
-}
-
-TEST_F(WorkerTest, MultipleWorkers) {
-  RunTest(FilePath(FILE_PATH_LITERAL("multi_worker.html")), "");
-}
-
-TEST_F(WorkerTest, SingleSharedWorker) {
-  RunTest(FilePath(FILE_PATH_LITERAL("single_worker.html")), "shared=true");
-}
-
-// Flaky on Win XP only.  http://crbug.com/96435
-#if defined(OS_WIN)
-#define MultipleSharedWorkers DISABLED_MultipleSharedWorkers
-#endif
-TEST_F(WorkerTest, MultipleSharedWorkers) {
-  RunTest(FilePath(FILE_PATH_LITERAL("multi_worker.html")), "shared=true");
-}
-
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-// http://crbug.com/80446
-#define DISABLED_TerminateQueuedWorkers DISABLED_TerminateQueuedWorkers
-#endif
-TEST_F(WorkerTest, DISABLED_TerminateQueuedWorkers) {
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(1, 0));
-  RunTest(FilePath(FILE_PATH_LITERAL("terminate_queued_workers.html")), "");
-  // Make sure all workers exit.
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(1, 0));
-}
-
-#if defined(OS_LINUX)
-// http://crbug.com/30021
-#define IncognitoSharedWorkers DISABLED_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(FilePath(FILE_PATH_LITERAL("incognito_worker.html")), "");
-  // Incognito worker should not share with non-incognito
-  RunIncognitoTest(FilePath(FILE_PATH_LITERAL("incognito_worker.html")));
-}
-
-const FilePath::CharType kDocRoot[] =
-    FILE_PATH_LITERAL("chrome/test/data/workers");
-
-#if defined(OS_WIN)
-// http://crbug.com/33344 - NavigateAndWaitForAuth times out on the Windows
-// build bots.
-#define WorkerHttpAuth DISABLED_WorkerHttpAuth
-#endif
-// Make sure that auth dialog is displayed from worker context.
-TEST_F(WorkerTest, WorkerHttpAuth) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTP,
-                              net::TestServer::kLocalhost,
-                              FilePath(kDocRoot));
-  ASSERT_TRUE(test_server.Start());
-
-  scoped_refptr<TabProxy> tab(GetActiveTab());
-  ASSERT_TRUE(tab.get());
-
-  GURL url = test_server.GetURL("files/worker_auth.html");
-  EXPECT_TRUE(NavigateAndWaitForAuth(tab, url));
-}
-
-#if defined(OS_WIN)
-// http://crbug.com/33344 - NavigateAndWaitForAuth times out on the Windows
-// build bots.
-#define SharedWorkerHttpAuth DISABLED_SharedWorkerHttpAuth
-#endif
-// Make sure that auth dialog is displayed from shared worker context.
-TEST_F(WorkerTest, DISABLED_SharedWorkerHttpAuth) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTP,
-                              net::TestServer::kLocalhost,
-                              FilePath(kDocRoot));
-  ASSERT_TRUE(test_server.Start());
-
-  scoped_refptr<TabProxy> tab(GetActiveTab());
-  ASSERT_TRUE(tab.get());
-
-  GURL url = test_server.GetURL("files/shared_worker_auth.html");
-  EXPECT_TRUE(NavigateAndWaitForAuth(tab, url));
-  // TODO(atwilson): Add support to automation framework to test for auth
-  // dialogs displayed by non-navigating tabs.
-}
-
 // Crashy, http://crbug.com/35965.
 // Flaky, http://crbug.com/36555.
-TEST_F(WorkerTest, DISABLED_WorkerClonePort) {
-  RunWorkerFastLayoutTest("worker-cloneport.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SLOW_WorkerClonePort) {
+  RunLayoutTest("worker-cloneport.html");
 }
 
 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
-TEST_F(WorkerTest, DISABLED_WorkerContextMultiPort) {
-  RunWorkerFastLayoutTest("worker-context-multi-port.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerContextMultiPort) {
+  RunLayoutTest("worker-context-multi-port.html");
 }
 
-TEST_F(WorkerTest, WorkerMessagePort) {
-  RunWorkerFastLayoutTest("worker-messageport.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerMessagePort) {
+  RunLayoutTest("worker-messageport.html");
 }
 
-TEST_F(WorkerTest, WorkerMessagePortGC) {
-  RunWorkerFastLayoutTest("worker-messageport-gc.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerMessagePortGC) {
+  RunLayoutTest("worker-messageport-gc.html");
 }
 
 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
-TEST_F(WorkerTest, DISABLED_WorkerMultiPort) {
-  RunWorkerFastLayoutTest("worker-multi-port.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerMultiPort) {
+  RunLayoutTest("worker-multi-port.html");
 }
 
 //
 // SharedWorkerFastLayoutTests
 //
-TEST_F(WorkerTest, SharedWorkerFastConstructor) {
-  RunWorkerFastLayoutTest("shared-worker-constructor.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastConstructor) {
+  RunLayoutTest("shared-worker-constructor.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastContextGC) {
-  RunWorkerFastLayoutTest("shared-worker-context-gc.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastContextGC) {
+  RunLayoutTest("shared-worker-context-gc.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastEventListener) {
-  RunWorkerFastLayoutTest("shared-worker-event-listener.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastEventListener) {
+  RunLayoutTest("shared-worker-event-listener.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastException) {
-  RunWorkerFastLayoutTest("shared-worker-exception.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastException) {
+  RunLayoutTest("shared-worker-exception.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastGC) {
-  RunWorkerFastLayoutTest("shared-worker-gc.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastGC) {
+  RunLayoutTest("shared-worker-gc.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastInIframe) {
-  RunWorkerFastLayoutTest("shared-worker-in-iframe.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastInIframe) {
+  RunLayoutTest("shared-worker-in-iframe.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastLoadError) {
-  RunWorkerFastLayoutTest("shared-worker-load-error.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastLoadError) {
+  RunLayoutTest("shared-worker-load-error.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastLocation) {
-  RunWorkerFastLayoutTest("shared-worker-location.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastLocation) {
+  RunLayoutTest("shared-worker-location.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastName) {
-  RunWorkerFastLayoutTest("shared-worker-name.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastName) {
+  RunLayoutTest("shared-worker-name.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastNavigator) {
-  RunWorkerFastLayoutTest("shared-worker-navigator.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastNavigator) {
+  RunLayoutTest("shared-worker-navigator.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastReplaceGlobalConstructor) {
-  RunWorkerFastLayoutTest("shared-worker-replace-global-constructor.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest,
+                       SharedWorkerFastReplaceGlobalConstructor) {
+  RunLayoutTest("shared-worker-replace-global-constructor.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastReplaceSelf) {
-  RunWorkerFastLayoutTest("shared-worker-replace-self.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastReplaceSelf) {
+  RunLayoutTest("shared-worker-replace-self.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastScriptError) {
-  RunWorkerFastLayoutTest("shared-worker-script-error.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastScriptError) {
+  RunLayoutTest("shared-worker-script-error.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastShared) {
-  RunWorkerFastLayoutTest("shared-worker-shared.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastShared) {
+  RunLayoutTest("shared-worker-shared.html");
 }
 
-TEST_F(WorkerTest, SharedWorkerFastSimple) {
-  RunWorkerFastLayoutTest("shared-worker-simple.html");
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastSimple) {
+  RunLayoutTest("shared-worker-simple.html");
 }
 
-// http://crbug.com/16934
-TEST_F(WorkerTest, DISABLED_WorkerHttpLayoutTests) {
+class MessagePortTest : public InProcessBrowserLayoutTest {
+ public:
+  MessagePortTest() : InProcessBrowserLayoutTest(
+      FilePath(), FilePath().AppendASCII("fast").AppendASCII("events")) {
+  }
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
+    AddResourceForLayoutTest(
+        FilePath().AppendASCII("fast").AppendASCII("js"),
+        FilePath().AppendASCII("resources"));
+  }
+};
+
+// Flaky, http://crbug.com/34996.
+IN_PROC_BROWSER_TEST_F(MessagePortTest, Tests) {
   static const char* kLayoutTestFiles[] = {
-    "shared-worker-importScripts.html",
-    "shared-worker-redirect.html",
-    // 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",
+    "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 http_test_dir;
-  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, kHttpPort);
-
-  LayoutTestHttpServer http_server(new_http_root_dir_, kHttpPort);
-  ASSERT_TRUE(http_server.Start());
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
-    RunLayoutTest(kLayoutTestFiles[i], kHttpPort);
-  ASSERT_TRUE(http_server.Stop());
+    RunLayoutTest(kLayoutTestFiles[i]);
 }
 
-TEST_F(WorkerTest, WorkerWebSocketLayoutTests) {
+
+class WorkerHttpLayoutTest : public InProcessBrowserLayoutTest {
+ public:
+  // The resources for these tests hardcode 8000, so must use that here. If
+  // multiple tests which use it run in parallel, then the test will fail but
+  // it'll run again at the end in serial and pass.
+  WorkerHttpLayoutTest() : InProcessBrowserLayoutTest(
+      FilePath().AppendASCII("http").AppendASCII("tests"),
+      FilePath().AppendASCII("workers"),
+      8000) {
+  }
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
+    AddResourceForLayoutTest(
+        FilePath().AppendASCII("http").AppendASCII("tests"),
+        FilePath().AppendASCII("resources"));
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(WorkerHttpLayoutTest, Tests) {
   static const char* kLayoutTestFiles[] = {
-    "close-in-onmessage-crash.html",
-    "close-in-shared-worker.html",
-    "close-in-worker.html",
-    "shared-worker-simple.html",
-    "worker-handshake-challenge-randomness.html",
-    "worker-simple.html"
+      "shared-worker-importScripts.html",
+      "shared-worker-redirect.html",
+      "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 websocket_test_dir;
-  websocket_test_dir = websocket_test_dir.AppendASCII("http");
-  websocket_test_dir = websocket_test_dir.AppendASCII("tests");
-
-  FilePath worker_test_dir;
-  worker_test_dir = worker_test_dir.AppendASCII("websocket");
-  worker_test_dir = worker_test_dir.AppendASCII("tests");
-  worker_test_dir = worker_test_dir.AppendASCII("hybi");
-  worker_test_dir = worker_test_dir.AppendASCII("workers");
-  InitializeForLayoutTest(websocket_test_dir, worker_test_dir, kHttpPort);
-
-  FilePath websocket_root_dir(temp_test_dir_);
-  websocket_root_dir = websocket_root_dir.AppendASCII("LayoutTests");
-  ui_test_utils::TestWebSocketServer websocket_server;
-  ASSERT_TRUE(websocket_server.Start(websocket_root_dir));
-
-  LayoutTestHttpServer http_server(new_http_root_dir_, kHttpPort);
-  ASSERT_TRUE(http_server.Start());
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
-    RunLayoutTest(kLayoutTestFiles[i], kHttpPort);
-  ASSERT_TRUE(http_server.Stop());
+    RunHttpLayoutTest(kLayoutTestFiles[i]);
 }
 
-TEST_F(WorkerTest, DISABLED_WorkerXhrHttpLayoutTests) {
+class WorkerXHRHttpLayoutTest : public InProcessBrowserLayoutTest {
+ public:
+  WorkerXHRHttpLayoutTest() : InProcessBrowserLayoutTest(
+      FilePath().AppendASCII("http").AppendASCII("tests"),
+      FilePath().AppendASCII("xmlhttprequest").AppendASCII("workers"),
+      -1) {
+  }
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
+    AddResourceForLayoutTest(
+        FilePath().AppendASCII("http").AppendASCII("tests"),
+        FilePath().AppendASCII("workers").AppendASCII("resources"));
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(WorkerXHRHttpLayoutTest, Tests) {
   static const char* kLayoutTestFiles[] = {
     "abort-exception-assert.html",
 #if defined(OS_WIN)
@@ -427,198 +232,251 @@
     "xmlhttprequest-file-not-found.html"
   };
 
-  FilePath http_test_dir;
-  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("xmlhttprequest");
-  worker_test_dir = worker_test_dir.AppendASCII("workers");
-  InitializeForLayoutTest(http_test_dir, worker_test_dir, kHttpPort);
-
-  LayoutTestHttpServer http_server(new_http_root_dir_, kHttpPort);
-  ASSERT_TRUE(http_server.Start());
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
-    RunLayoutTest(kLayoutTestFiles[i], kHttpPort);
-  ASSERT_TRUE(http_server.Stop());
+    RunHttpLayoutTest(kLayoutTestFiles[i]);
 }
 
-// Flaky, http://crbug.com/34996.
-TEST_F(WorkerTest, DISABLED_MessagePorts) {
+class WorkerWebSocketHttpLayoutTest : public InProcessBrowserLayoutTest {
+ public:
+  WorkerWebSocketHttpLayoutTest() : InProcessBrowserLayoutTest(
+      FilePath(),
+      FilePath().AppendASCII("http").AppendASCII("tests").
+          AppendASCII("websocket").AppendASCII("tests").AppendASCII("hybi").
+          AppendASCII("workers"),
+      -1) {
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(WorkerWebSocketHttpLayoutTest, Tests) {
   static const char* kLayoutTestFiles[] = {
-    "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",
+    "close-in-onmessage-crash.html",
+    "close-in-shared-worker.html",
+    "close-in-worker.html",
+    "shared-worker-simple.html",
+    "worker-handshake-challenge-randomness.html",
+    "worker-simple.html"
   };
 
-  FilePath fast_test_dir;
-  fast_test_dir = fast_test_dir.AppendASCII("fast");
+  FilePath websocket_test_dir;
+  ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &websocket_test_dir));
 
-  FilePath worker_test_dir;
-  worker_test_dir = worker_test_dir.AppendASCII("events");
-  InitializeForLayoutTest(fast_test_dir, worker_test_dir, kNoHttpPort);
+  ui_test_utils::TestWebSocketServer websocket_server;
+  ASSERT_TRUE(websocket_server.Start(websocket_test_dir));
 
-  // 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], kNoHttpPort);
+    RunHttpLayoutTest(kLayoutTestFiles[i]);
 }
 
-TEST_F(WorkerTest, LimitPerPage) {
+class WorkerTest : public InProcessBrowserTest {
+ public:
+  WorkerTest() {}
+
+  GURL GetTestURL(const std::string& test_case, const std::string& query) {
+    FilePath test_file_path = ui_test_utils::GetTestFilePath(
+        FilePath(FILE_PATH_LITERAL("workers")),
+        FilePath().AppendASCII(test_case));
+    return ui_test_utils::GetFileUrlWithQuery(test_file_path, query);
+  }
+
+  void RunTest(Browser* browser,
+               const std::string& test_case,
+               const std::string& query) {
+    GURL url = GetTestURL(test_case, query);
+    const string16 expected_title = ASCIIToUTF16("OK");
+    ui_test_utils::TitleWatcher title_watcher(
+        browser->GetSelectedWebContents(), expected_title);
+    ui_test_utils::NavigateToURL(browser, url);
+    string16 final_title = title_watcher.WaitAndGetTitle();
+    EXPECT_EQ(expected_title, final_title);
+  }
+
+  void RunTest(const std::string& test_case, const std::string& query) {
+    RunTest(browser(), test_case, query);
+  }
+
+  static void CountWorkerProcesses(int *cur_process_count) {
+    *cur_process_count = 0;
+    for (WorkerProcessHostIterator iter; !iter.Done(); ++iter)
+      (*cur_process_count)++;
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure());
+  }
+
+  bool WaitForWorkerProcessCount(int count) {
+    int cur_process_count;
+    for (int i = 0; i < 100; ++i) {
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          base::Bind(&CountWorkerProcesses, &cur_process_count));
+      ui_test_utils::RunMessageLoop();
+      if (cur_process_count == count)
+        return true;
+
+      // Sometimes the worker processes can take a while to shut down on the
+      // bots, so use a longer timeout period to avoid spurious failures.
+      base::PlatformThread::Sleep(TestTimeouts::action_max_timeout() / 100);
+    }
+
+    EXPECT_EQ(cur_process_count, count);
+    return false;
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(WorkerTest, SingleWorker) {
+  RunTest("single_worker.html", "");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerTest, MultipleWorkers) {
+  RunTest("multi_worker.html", "");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerTest, SingleSharedWorker) {
+  RunTest("single_worker.html", "shared=true");
+}
+
+// http://crbug.com/96435
+IN_PROC_BROWSER_TEST_F(WorkerTest, MultipleSharedWorkers) {
+  RunTest("multi_worker.html", "shared=true");
+}
+
+// http://crbug.com/80446
+IN_PROC_BROWSER_TEST_F(WorkerTest, TerminateQueuedWorkers) {
+  ASSERT_TRUE(WaitForWorkerProcessCount(0));
+  RunTest("terminate_queued_workers.html", "");
+  // Make sure all workers exit.
+  ASSERT_TRUE(WaitForWorkerProcessCount(0));
+}
+
+// Incognito windows should not share workers with non-incognito windows
+// http://crbug.com/30021
+IN_PROC_BROWSER_TEST_F(WorkerTest, IncognitoSharedWorkers) {
+  // Load a non-incognito tab and have it create a shared worker
+  RunTest("incognito_worker.html", "");
+
+  // Incognito worker should not share with non-incognito
+  RunTest(CreateIncognitoBrowser(), "incognito_worker.html", "");
+}
+
+// Make sure that auth dialog is displayed from worker context.
+// http://crbug.com/33344
+IN_PROC_BROWSER_TEST_F(WorkerTest, WorkerHttpAuth) {
+  ASSERT_TRUE(test_server()->Start());
+  GURL url = test_server()->GetURL("files/workers/worker_auth.html");
+
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_AUTH);
+}
+
+// Make sure that auth dialog is displayed from shared worker context.
+// http://crbug.com/33344
+IN_PROC_BROWSER_TEST_F(WorkerTest, SharedWorkerHttpAuth) {
+  ASSERT_TRUE(test_server()->Start());
+  GURL url = test_server()->GetURL("files/workers/shared_worker_auth.html");
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_AUTH);
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) {
   int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
-  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
-                                       FilePath(kManySharedWorkersFile));
-  url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab + 1));
+  std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1);
 
-  NavigateToURL(url);
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(1, max_workers_per_tab));
+  GURL url = GetTestURL("many_shared_workers.html", query);
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
 }
 
 // http://crbug.com/36800
-#if defined(OS_WIN)
-#define MAYBE_LimitTotal DISABLED_LimitTotal
-#else
-#define MAYBE_LimitTotal LimitTotal
-#endif  // defined(OS_WIN)
-TEST_F(WorkerTest, MAYBE_LimitTotal) {
+IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) {
   int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
   int total_workers = WorkerServiceImpl::kMaxWorkersWhenSeparate;
 
+  std::string query = StringPrintf("?count=%d", max_workers_per_tab);
+  GURL url = GetTestURL("many_shared_workers.html", query);
+  ui_test_utils::NavigateToURL(
+      browser(), GURL(url.spec() + StringPrintf("&client_id=0")));
+
   // Adding 1 so that we cause some workers to be queued.
   int tab_count = (total_workers / max_workers_per_tab) + 1;
-  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
-                                       FilePath(kManySharedWorkersFile));
-  url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab));
-
-  scoped_refptr<TabProxy> tab(GetActiveTab());
-  ASSERT_TRUE(tab.get());
-  ASSERT_TRUE(tab->NavigateToURL(
-      GURL(url.spec() + StringPrintf("&client_id=%d", 0))));
-  scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
-  ASSERT_TRUE(window.get());
   for (int i = 1; i < tab_count; ++i) {
-    ASSERT_TRUE(window->AppendTab(GURL(
-        url.spec() + StringPrintf("&client_id=%d", i))));
+    ui_test_utils::NavigateToURLWithDisposition(
+        browser(), GURL(url.spec() + StringPrintf("&client_id=%d", i)),
+        NEW_FOREGROUND_TAB,
+        ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   }
 
   // Check that we didn't create more than the max number of workers.
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(tab_count, total_workers));
+  ASSERT_TRUE(WaitForWorkerProcessCount(total_workers));
 
   // Now close a page and check that the queued workers were started.
-  const FilePath::CharType* kGoogleDir = FILE_PATH_LITERAL("google");
-  const FilePath::CharType* kGoogleFile = FILE_PATH_LITERAL("google.html");
-  ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
-      tab->NavigateToURL(ui_test_utils::GetTestUrl(FilePath(kGoogleDir),
-                                                   FilePath(kGoogleFile))));
+  const FilePath kGoogleDir(FILE_PATH_LITERAL("google"));
+  const FilePath kGoogleFile(FILE_PATH_LITERAL("google.html"));
+  url = GURL(ui_test_utils::GetTestUrl(kGoogleDir, kGoogleFile));
+  ui_test_utils::NavigateToURL(browser(), url);
 
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(tab_count, total_workers));
+  ASSERT_TRUE(WaitForWorkerProcessCount(total_workers));
 }
 
 // Flaky, http://crbug.com/59786.
-TEST_F(WorkerTest, DISABLED_WorkerClose) {
-  scoped_refptr<TabProxy> tab(GetActiveTab());
-  ASSERT_TRUE(tab.get());
-  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
-                                       FilePath(kWorkerClose));
-  ASSERT_TRUE(tab->NavigateToURL(url));
-  std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
-      kTestCompleteCookie, TestTimeouts::action_max_timeout_ms());
-  ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(1, 0));
+IN_PROC_BROWSER_TEST_F(WorkerTest, WorkerClose) {
+  RunTest("worker_close.html", "");
+  ASSERT_TRUE(WaitForWorkerProcessCount(0));
 }
 
 // Flaky, http://crbug.com/70861.
-TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerShutdown) {
-  // Tests to make sure that queued shared workers are started up when
-  // shared workers shut down.
+IN_PROC_BROWSER_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 = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
-  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
-      FilePath(kQuerySharedWorkerShutdownFile));
-  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));
-  std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
-      kTestCompleteCookie, TestTimeouts::action_max_timeout_ms());
-  ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(1, max_workers_per_tab));
+  std::string query = StringPrintf("?count=%d", max_workers_per_tab);
+  RunTest("queued_shared_worker_shutdown.html", query);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
 }
 
 // Flaky, http://crbug.com/69881.
-TEST_F(WorkerTest, DISABLED_MultipleTabsQueuedSharedWorker) {
+IN_PROC_BROWSER_TEST_F(WorkerTest, MultipleTabsQueuedSharedWorker) {
   // Tests to make sure that only one instance of queued shared workers are
   // started up even when those instances are on multiple tabs.
   int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
-  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
-                                       FilePath(kManySharedWorkersFile));
-  url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab+1));
+  std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1);
+  GURL url = GetTestURL("many_shared_workers.html", query);
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
 
-  scoped_refptr<TabProxy> tab(GetActiveTab());
-  ASSERT_TRUE(tab.get());
-  ASSERT_TRUE(tab->NavigateToURL(url));
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(1, max_workers_per_tab));
-
   // Create same set of workers in new tab (leaves one worker queued from this
   // tab).
-  scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
-  ASSERT_TRUE(window.get());
-  ASSERT_TRUE(window->AppendTab(url));
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(2, max_workers_per_tab));
+  url = GetTestURL("many_shared_workers.html", query);
+  ui_test_utils::NavigateToURLWithDisposition(
+        browser(), url, NEW_FOREGROUND_TAB,
+        ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
 
   // Now shutdown one of the shared workers - this will fire both queued
-  // workers, but only one instance should be started
-  GURL url2 = ui_test_utils::GetTestUrl(FilePath(kTestDir),
-                                        FilePath(kShutdownSharedWorkerFile));
-  url2 = GURL(url2.spec() + "?id=0");
-  ASSERT_TRUE(window->AppendTab(url2));
-
-  std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
-      kTestCompleteCookie, TestTimeouts::action_max_timeout_ms());
-  ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(3, max_workers_per_tab));
+  // workers, but only one instance should be started.
+  url = GetTestURL("shutdown_shared_worker.html", "?id=0");
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), url, NEW_FOREGROUND_TAB,
+        ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
 }
 
 // Flaky: http://crbug.com/48148
-TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerStartedFromOtherTab) {
+IN_PROC_BROWSER_TEST_F(WorkerTest, 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 = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
-  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
-                                       FilePath(kManySharedWorkersFile));
-  url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab+1));
+  std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1);
+  GURL url = GetTestURL("many_shared_workers.html", query);
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
 
-  scoped_refptr<TabProxy> tab(GetActiveTab());
-  ASSERT_TRUE(tab.get());
-  ASSERT_TRUE(tab->NavigateToURL(url));
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(1, max_workers_per_tab));
   // First window has hit its limit. Now launch second window which creates
   // the same worker that was queued in the first window, to ensure it gets
   // connected to the first window too.
-  scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
-  ASSERT_TRUE(window.get());
-  GURL url2 = ui_test_utils::GetTestUrl(FilePath(kTestDir),
-                                        FilePath(kSingleSharedWorkersFile));
-  url2 = GURL(url2.spec() + StringPrintf("?id=%d", max_workers_per_tab));
-  ASSERT_TRUE(window->AppendTab(url2));
+  query = StringPrintf("?id=%d", max_workers_per_tab);
+  url = GetTestURL("single_shared_worker.html", query);
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), url, NEW_FOREGROUND_TAB,
+        ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
-  std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
-      kTestCompleteCookie, TestTimeouts::action_max_timeout_ms());
-  ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
-  ASSERT_TRUE(WaitForProcessCountToBeAtLeast(2, max_workers_per_tab+1));
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab + 1));
 }