| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 // which is not currently implemented. | 83 // which is not currently implemented. |
| 84 // "worker-lifecycle.html", | 84 // "worker-lifecycle.html", |
| 85 "worker-location.html", | 85 "worker-location.html", |
| 86 "worker-messageport.html", | 86 "worker-messageport.html", |
| 87 // Disabled after r27089 (WebKit merge), http://crbug.com/22947 | 87 // Disabled after r27089 (WebKit merge), http://crbug.com/22947 |
| 88 // "worker-messageport-gc.html", | 88 // "worker-messageport-gc.html", |
| 89 "worker-multi-port.html", | 89 "worker-multi-port.html", |
| 90 "worker-navigator.html", | 90 "worker-navigator.html", |
| 91 "worker-replace-global-constructor.html", | 91 "worker-replace-global-constructor.html", |
| 92 "worker-replace-self.html", | 92 "worker-replace-self.html", |
| 93 // Disabled afer r27553 (WebKit merge), http://crbug.com/23391 | 93 "worker-script-error.html", |
| 94 // "worker-script-error.html", | |
| 95 "worker-terminate.html", | 94 "worker-terminate.html", |
| 96 "worker-timeout.html" | 95 "worker-timeout.html" |
| 97 }; | 96 }; |
| 98 | 97 |
| 99 FilePath fast_test_dir; | 98 FilePath fast_test_dir; |
| 100 fast_test_dir = fast_test_dir.AppendASCII("LayoutTests"); | 99 fast_test_dir = fast_test_dir.AppendASCII("LayoutTests"); |
| 101 fast_test_dir = fast_test_dir.AppendASCII("fast"); | 100 fast_test_dir = fast_test_dir.AppendASCII("fast"); |
| 102 | 101 |
| 103 FilePath worker_test_dir; | 102 FilePath worker_test_dir; |
| 104 worker_test_dir = worker_test_dir.AppendASCII("workers"); | 103 worker_test_dir = worker_test_dir.AppendASCII("workers"); |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 window->AppendTab(url); | 240 window->AppendTab(url); |
| 242 | 241 |
| 243 // Check that we didn't create more than the max number of workers. | 242 // Check that we didn't create more than the max number of workers. |
| 244 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers)); | 243 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers)); |
| 245 | 244 |
| 246 // Now close a page and check that the queued workers were started. | 245 // Now close a page and check that the queued workers were started. |
| 247 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); | 246 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); |
| 248 | 247 |
| 249 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers)); | 248 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers)); |
| 250 } | 249 } |
| OLD | NEW |