| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/file_path.h" | 5 #include "base/file_path.h" |
| 6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
| 7 #include "chrome/app/chrome_dll_resource.h" | 7 #include "chrome/app/chrome_dll_resource.h" |
| 8 #include "chrome/browser/worker_host/worker_service.h" | 8 #include "chrome/browser/worker_host/worker_service.h" |
| 9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
| 10 #include "chrome/test/automation/browser_proxy.h" | 10 #include "chrome/test/automation/browser_proxy.h" |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 } | 222 } |
| 223 | 223 |
| 224 TEST_F(WorkerTest, WorkerConstructor) { | 224 TEST_F(WorkerTest, WorkerConstructor) { |
| 225 RunWorkerFastLayoutTest("worker-constructor.html"); | 225 RunWorkerFastLayoutTest("worker-constructor.html"); |
| 226 } | 226 } |
| 227 | 227 |
| 228 TEST_F(WorkerTest, WorkerContextGc) { | 228 TEST_F(WorkerTest, WorkerContextGc) { |
| 229 RunWorkerFastLayoutTest("worker-context-gc.html"); | 229 RunWorkerFastLayoutTest("worker-context-gc.html"); |
| 230 } | 230 } |
| 231 | 231 |
| 232 // BUG 42783 | |
| 233 // Still fails intermittently on rel builds of Linux. | |
| 234 #if defined(OS_LINUX) | |
| 235 #define WorkerContextMultiPort DISABLED_WorkerContextMultiPort | |
| 236 #endif | |
| 237 | |
| 238 TEST_F(WorkerTest, WorkerContextMultiPort) { | 232 TEST_F(WorkerTest, WorkerContextMultiPort) { |
| 239 RunWorkerFastLayoutTest("worker-context-multi-port.html"); | 233 RunWorkerFastLayoutTest("worker-context-multi-port.html"); |
| 240 } | 234 } |
| 241 | 235 |
| 242 TEST_F(WorkerTest, WorkerEventListener) { | 236 TEST_F(WorkerTest, WorkerEventListener) { |
| 243 RunWorkerFastLayoutTest("worker-event-listener.html"); | 237 RunWorkerFastLayoutTest("worker-event-listener.html"); |
| 244 } | 238 } |
| 245 | 239 |
| 246 TEST_F(WorkerTest, WorkerGC) { | 240 TEST_F(WorkerTest, WorkerGC) { |
| 247 RunWorkerFastLayoutTest("worker-gc.html"); | 241 RunWorkerFastLayoutTest("worker-gc.html"); |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 GURL url2 = ui_test_utils::GetTestUrl(FilePath(kTestDir), | 623 GURL url2 = ui_test_utils::GetTestUrl(FilePath(kTestDir), |
| 630 FilePath(kSingleSharedWorkersFile)); | 624 FilePath(kSingleSharedWorkersFile)); |
| 631 url2 = GURL(url2.spec() + StringPrintf("?id=%d", max_workers_per_tab)); | 625 url2 = GURL(url2.spec() + StringPrintf("?id=%d", max_workers_per_tab)); |
| 632 ASSERT_TRUE(window->AppendTab(url2)); | 626 ASSERT_TRUE(window->AppendTab(url2)); |
| 633 | 627 |
| 634 std::string value = WaitUntilCookieNonEmpty(tab.get(), url, | 628 std::string value = WaitUntilCookieNonEmpty(tab.get(), url, |
| 635 kTestCompleteCookie, action_max_timeout_ms()); | 629 kTestCompleteCookie, action_max_timeout_ms()); |
| 636 ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); | 630 ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); |
| 637 ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab+1)); | 631 ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab+1)); |
| 638 } | 632 } |
| OLD | NEW |