Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Side by Side Diff: chrome/worker/worker_uitest.cc

Issue 249055: Enabling WorkerTest.MessagePorts as the upstream regression was fixed:... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 worker_test_dir = worker_test_dir.AppendASCII("xmlhttprequest"); 145 worker_test_dir = worker_test_dir.AppendASCII("xmlhttprequest");
146 worker_test_dir = worker_test_dir.AppendASCII("workers"); 146 worker_test_dir = worker_test_dir.AppendASCII("workers");
147 InitializeForLayoutTest(http_test_dir, worker_test_dir, true); 147 InitializeForLayoutTest(http_test_dir, worker_test_dir, true);
148 148
149 StartHttpServer(new_http_root_dir_); 149 StartHttpServer(new_http_root_dir_);
150 for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i) 150 for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
151 RunLayoutTest(kLayoutTestFiles[i], true); 151 RunLayoutTest(kLayoutTestFiles[i], true);
152 StopHttpServer(); 152 StopHttpServer();
153 } 153 }
154 154
155 TEST_F(WorkerTest, DISABLED_MessagePorts) { 155 TEST_F(WorkerTest, MessagePorts) {
156 static const char* kLayoutTestFiles[] = { 156 static const char* kLayoutTestFiles[] = {
157 "message-channel-gc.html", 157 "message-channel-gc.html",
158 "message-channel-gc-2.html", 158 "message-channel-gc-2.html",
159 "message-channel-gc-3.html", 159 "message-channel-gc-3.html",
160 "message-channel-gc-4.html", 160 "message-channel-gc-4.html",
161 "message-port.html", 161 "message-port.html",
162 "message-port-clone.html", 162 "message-port-clone.html",
163 "message-port-constructor-for-deleted-document.html", 163 "message-port-constructor-for-deleted-document.html",
164 "message-port-deleted-document.html", 164 "message-port-deleted-document.html",
165 "message-port-deleted-frame.html", 165 "message-port-deleted-frame.html",
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 UITest::GetBrowserProcessCount()); 228 UITest::GetBrowserProcessCount());
229 229
230 // Now close the first tab and check that the queued workers were started. 230 // Now close the first tab and check that the queued workers were started.
231 tab->Close(true); 231 tab->Close(true);
232 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); 232 tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
233 233
234 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), 234 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
235 UITest::GetBrowserProcessCount()); 235 UITest::GetBrowserProcessCount());
236 } 236 }
237 #endif 237 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698