Revert 148582 - Try renabling the the disabled worker tests, now that they run in content_browserte…

content/browser/worker_host/test/worker_browsertest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
@@ skipping 24 matching lines @@
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
     AddResourceForLayoutTest(
         FilePath().AppendASCII("fast").AppendASCII("js"),
         FilePath().AppendASCII("resources"));
   }
 };
 
 // Crashy, http://crbug.com/35965.
 // Flaky, http://crbug.com/36555.
-IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerClonePort) {
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, DISABLED_WorkerClonePort) {
   RunLayoutTest("worker-cloneport.html");
 }
 
 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
 IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerContextMultiPort) {
   RunLayoutTest("worker-context-multi-port.html");
 }
 
 IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerMessagePort) {
   RunLayoutTest("worker-messageport.html");
@@ skipping 398 matching lines @@
   // workers shut down.
   int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
   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.
 // Sometimes triggers
 //     Check failed: message_ports_[message_port_id].queued_messages.empty().
-IN_PROC_BROWSER_TEST_F(WorkerTest, MultipleTabsQueuedSharedWorker) {
+IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_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;
   std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1);
   GURL url = GetTestURL("many_shared_workers.html", query);
   content::NavigateToURL(shell(), url);
   ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
 
   // Create same set of workers in new tab (leaves one worker queued from this
   // tab).
   url = GetTestURL("many_shared_workers.html", query);
   content::NavigateToURL(CreateBrowser(), url);
   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.
   url = GetTestURL("shutdown_shared_worker.html", "?id=0");
   content::NavigateToURL(CreateBrowser(), url);
   ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
 }
 
 // Flaky: http://crbug.com/48148
-IN_PROC_BROWSER_TEST_F(WorkerTest, QueuedSharedWorkerStartedFromOtherTab) {
+IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_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;
   std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1);
   GURL url = GetTestURL("many_shared_workers.html", query);
   content::NavigateToURL(shell(), url);
   ASSERT_TRUE(WaitForWorkerProcessCount(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.
   query = StringPrintf("?id=%d", max_workers_per_tab);
   url = GetTestURL("single_shared_worker.html", query);
   content::NavigateToURL(CreateBrowser(), url);
 
   ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab + 1));
 }