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

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

Issue 256035: Roll deps to r48993.... (Closed) Base URL: svn://chrome-svn/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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | webkit/tools/layout_tests/test_expectations.txt » ('j') | 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
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",
166 "message-port-inactive-document.html", 166 // http://crbug.com/23597 (caused by http://trac.webkit.org/changeset/48978)
167 // "message-port-inactive-document.html",
167 "message-port-multi.html", 168 "message-port-multi.html",
168 "message-port-no-wrapper.html", 169 "message-port-no-wrapper.html",
169 // Only works with run-webkit-tests --leaks. 170 // Only works with run-webkit-tests --leaks.
170 //"message-channel-listener-circular-ownership.html", 171 //"message-channel-listener-circular-ownership.html",
171 }; 172 };
172 173
173 FilePath fast_test_dir; 174 FilePath fast_test_dir;
174 fast_test_dir = fast_test_dir.AppendASCII("LayoutTests"); 175 fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
175 fast_test_dir = fast_test_dir.AppendASCII("fast"); 176 fast_test_dir = fast_test_dir.AppendASCII("fast");
176 177
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 UITest::GetBrowserProcessCount()); 229 UITest::GetBrowserProcessCount());
229 230
230 // Now close the first tab and check that the queued workers were started. 231 // Now close the first tab and check that the queued workers were started.
231 tab->Close(true); 232 tab->Close(true);
232 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); 233 tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
233 234
234 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), 235 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
235 UITest::GetBrowserProcessCount()); 236 UITest::GetBrowserProcessCount());
236 } 237 }
237 #endif 238 #endif
OLDNEW
« no previous file with comments | « DEPS ('k') | webkit/tools/layout_tests/test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698