WebKit merge 56312:56350

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 250 matching lines @@
 }
 
 TEST_F(WorkerTest, WorkerReplaceGlobalConstructor) {
   RunWorkerFastLayoutTest("worker-replace-global-constructor.html");
 }
 
 TEST_F(WorkerTest, WorkerReplaceSelf) {
   RunWorkerFastLayoutTest("worker-replace-self.html");
 }
 
-TEST_F(WorkerTest, WorkerScriptError) {
+// http://crbug.com/38918
+TEST_F(WorkerTest, DISABLED_WorkerScriptError) {
   RunWorkerFastLayoutTest("worker-script-error.html");
 }
 
 // http://crbug.com/36630.
 TEST_F(WorkerTest, DISABLED_WorkerTerminate) {
   RunWorkerFastLayoutTest("worker-terminate.html");
 }
 
 TEST_F(WorkerTest, WorkerTimeout) {
   RunWorkerFastLayoutTest("worker-timeout.html");
@@ skipping 306 matching lines @@
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   GURL url2 = GetTestUrl(L"workers", L"single_shared_worker.html");
   url2 = GURL(url2.spec() + StringPrintf("?id=%d", max_workers_per_tab));
   ASSERT_TRUE(window->AppendTab(url2));
 
   std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
       kTestCompleteCookie, kTestIntervalMs, kTestWaitTimeoutMs);
   ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
   ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab+1));
 }