| 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/string_util.h" | 5 #include "base/string_util.h" |
| 6 #include "chrome/browser/worker_host/worker_service.h" | 6 #include "chrome/browser/worker_host/worker_service.h" |
| 7 #include "chrome/test/automation/browser_proxy.h" | 7 #include "chrome/test/automation/browser_proxy.h" |
| 8 #include "chrome/test/automation/tab_proxy.h" | 8 #include "chrome/test/automation/tab_proxy.h" |
| 9 #include "chrome/test/ui/ui_layout_test.h" | 9 #include "chrome/test/ui/ui_layout_test.h" |
| 10 | 10 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 } | 43 } |
| 44 | 44 |
| 45 // WorkerFastLayoutTests works on the linux try servers. | 45 // WorkerFastLayoutTests works on the linux try servers. |
| 46 #if defined(OS_LINUX) | 46 #if defined(OS_LINUX) |
| 47 #define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests | 47 #define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 TEST_F(WorkerTest, WorkerFastLayoutTests) { | 50 TEST_F(WorkerTest, WorkerFastLayoutTests) { |
| 51 static const char* kLayoutTestFiles[] = { | 51 static const char* kLayoutTestFiles[] = { |
| 52 "stress-js-execution.html", | 52 "stress-js-execution.html", |
| 53 #if defined(OS_WIN) | |
| 54 // Workers don't properly initialize the V8 stack guard. | |
| 55 // (http://code.google.com/p/chromium/issues/detail?id=21653). | |
| 56 "use-machine-stack.html", | 53 "use-machine-stack.html", |
| 57 #endif | |
| 58 "worker-call.html", | 54 "worker-call.html", |
| 59 // Disabled because cloning ports are too slow in Chromium to meet the | 55 // Disabled because cloning ports are too slow in Chromium to meet the |
| 60 // thresholds in this test. | 56 // thresholds in this test. |
| 61 // http://code.google.com/p/chromium/issues/detail?id=22780 | 57 // http://code.google.com/p/chromium/issues/detail?id=22780 |
| 62 // "worker-cloneport.html", | 58 // "worker-cloneport.html", |
| 63 | 59 |
| 64 "worker-close.html", | 60 "worker-close.html", |
| 65 "worker-constructor.html", | 61 "worker-constructor.html", |
| 66 "worker-context-gc.html", | 62 "worker-context-gc.html", |
| 67 "worker-context-multi-port.html", | 63 "worker-context-multi-port.html", |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 // Check that we didn't create more than the max number of workers. | 236 // Check that we didn't create more than the max number of workers. |
| 241 EXPECT_EQ(total_workers + number_of_processes, | 237 EXPECT_EQ(total_workers + number_of_processes, |
| 242 UITest::GetBrowserProcessCount()); | 238 UITest::GetBrowserProcessCount()); |
| 243 | 239 |
| 244 // Now close a page and check that the queued workers were started. | 240 // Now close a page and check that the queued workers were started. |
| 245 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); | 241 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); |
| 246 | 242 |
| 247 EXPECT_EQ(total_workers + number_of_processes, | 243 EXPECT_EQ(total_workers + number_of_processes, |
| 248 UITest::GetBrowserProcessCount()); | 244 UITest::GetBrowserProcessCount()); |
| 249 } | 245 } |
| OLD | NEW |