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

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

Issue 208069: Enable and rebaseline worker-close.html after the upstream fix (http://trac.w... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 3 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 | « no previous file | webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-close-expected.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 22 matching lines...) Expand all
33 33
34 TEST_F(WorkerTest, MultipleWorkers) { 34 TEST_F(WorkerTest, MultipleWorkers) {
35 RunTest(L"multi_worker.html"); 35 RunTest(L"multi_worker.html");
36 } 36 }
37 37
38 TEST_F(WorkerTest, WorkerFastLayoutTests) { 38 TEST_F(WorkerTest, WorkerFastLayoutTests) {
39 static const char* kLayoutTestFiles[] = { 39 static const char* kLayoutTestFiles[] = {
40 "stress-js-execution.html", 40 "stress-js-execution.html",
41 "use-machine-stack.html", 41 "use-machine-stack.html",
42 "worker-call.html", 42 "worker-call.html",
43 //"worker-close.html", 43 "worker-close.html",
44 "worker-constructor.html", 44 "worker-constructor.html",
45 "worker-context-gc.html", 45 "worker-context-gc.html",
46 "worker-event-listener.html", 46 "worker-event-listener.html",
47 "worker-gc.html", 47 "worker-gc.html",
48 "worker-location.html", 48 "worker-location.html",
49 "worker-messageport.html", 49 "worker-messageport.html",
50 "worker-messageport-gc.html", 50 "worker-messageport-gc.html",
51 "worker-navigator.html", 51 "worker-navigator.html",
52 "worker-replace-global-constructor.html", 52 "worker-replace-global-constructor.html",
53 "worker-replace-self.html", 53 "worker-replace-self.html",
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), 176 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
177 UITest::GetBrowserProcessCount()); 177 UITest::GetBrowserProcessCount());
178 178
179 // Now close the first tab and check that the queued workers were started. 179 // Now close the first tab and check that the queued workers were started.
180 tab->Close(true); 180 tab->Close(true);
181 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); 181 tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
182 182
183 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), 183 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
184 UITest::GetBrowserProcessCount()); 184 UITest::GetBrowserProcessCount());
185 } 185 }
OLDNEW
« no previous file with comments | « no previous file | webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-close-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698