| 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 "chrome/browser/worker_host/worker_service.h" | 5 #include "chrome/browser/worker_host/worker_service.h" |
| 6 #include "chrome/test/automation/browser_proxy.h" | 6 #include "chrome/test/automation/browser_proxy.h" |
| 7 #include "chrome/test/automation/tab_proxy.h" | 7 #include "chrome/test/automation/tab_proxy.h" |
| 8 #include "chrome/test/ui/ui_layout_test.h" | 8 #include "chrome/test/ui/ui_layout_test.h" |
| 9 | 9 |
| 10 static const char kTestCompleteCookie[] = "status"; | 10 static const char kTestCompleteCookie[] = "status"; |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 worker_test_dir = worker_test_dir.AppendASCII("xmlhttprequest"); | 143 worker_test_dir = worker_test_dir.AppendASCII("xmlhttprequest"); |
| 144 worker_test_dir = worker_test_dir.AppendASCII("workers"); | 144 worker_test_dir = worker_test_dir.AppendASCII("workers"); |
| 145 InitializeForLayoutTest(http_test_dir, worker_test_dir, true); | 145 InitializeForLayoutTest(http_test_dir, worker_test_dir, true); |
| 146 | 146 |
| 147 StartHttpServer(new_http_root_dir_); | 147 StartHttpServer(new_http_root_dir_); |
| 148 for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i) | 148 for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i) |
| 149 RunLayoutTest(kLayoutTestFiles[i], true); | 149 RunLayoutTest(kLayoutTestFiles[i], true); |
| 150 StopHttpServer(); | 150 StopHttpServer(); |
| 151 } | 151 } |
| 152 | 152 |
| 153 TEST_F(WorkerTest, MessagePorts) { | 153 TEST_F(WorkerTest, DISABLED_MessagePorts) { |
| 154 static const char* kLayoutTestFiles[] = { | 154 static const char* kLayoutTestFiles[] = { |
| 155 "message-channel-gc.html", | 155 "message-channel-gc.html", |
| 156 "message-channel-gc-2.html", | 156 "message-channel-gc-2.html", |
| 157 "message-channel-gc-3.html", | 157 "message-channel-gc-3.html", |
| 158 "message-channel-gc-4.html", | 158 "message-channel-gc-4.html", |
| 159 "message-port.html", | 159 "message-port.html", |
| 160 "message-port-clone.html", | 160 "message-port-clone.html", |
| 161 "message-port-constructor-for-deleted-document.html", | 161 "message-port-constructor-for-deleted-document.html", |
| 162 "message-port-deleted-document.html", | 162 "message-port-deleted-document.html", |
| 163 "message-port-deleted-frame.html", | 163 "message-port-deleted-frame.html", |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 UITest::GetBrowserProcessCount()); | 226 UITest::GetBrowserProcessCount()); |
| 227 | 227 |
| 228 // Now close the first tab and check that the queued workers were started. | 228 // Now close the first tab and check that the queued workers were started. |
| 229 tab->Close(true); | 229 tab->Close(true); |
| 230 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); | 230 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); |
| 231 | 231 |
| 232 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), | 232 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), |
| 233 UITest::GetBrowserProcessCount()); | 233 UITest::GetBrowserProcessCount()); |
| 234 } | 234 } |
| 235 #endif | 235 #endif |
| OLD | NEW |