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

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

Issue 396001: Enable worker-timeout.html layout test. It's fixed upstream.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Enable worker-timeout.html layout test. It's fixed upstream.... Created 11 years, 1 month 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 | 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 "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/common/chrome_switches.h" 7 #include "chrome/common/chrome_switches.h"
8 #include "chrome/test/automation/browser_proxy.h" 8 #include "chrome/test/automation/browser_proxy.h"
9 #include "chrome/test/automation/tab_proxy.h" 9 #include "chrome/test/automation/tab_proxy.h"
10 #include "chrome/test/ui/ui_layout_test.h" 10 #include "chrome/test/ui/ui_layout_test.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 "worker-location.html", 81 "worker-location.html",
82 "worker-messageport.html", 82 "worker-messageport.html",
83 // Disabled after r27089 (WebKit merge), http://crbug.com/22947 83 // Disabled after r27089 (WebKit merge), http://crbug.com/22947
84 // "worker-messageport-gc.html", 84 // "worker-messageport-gc.html",
85 "worker-multi-port.html", 85 "worker-multi-port.html",
86 "worker-navigator.html", 86 "worker-navigator.html",
87 "worker-replace-global-constructor.html", 87 "worker-replace-global-constructor.html",
88 "worker-replace-self.html", 88 "worker-replace-self.html",
89 "worker-script-error.html", 89 "worker-script-error.html",
90 "worker-terminate.html", 90 "worker-terminate.html",
91 // clearInterval() sometimes lets the timer continue to fire 91 "worker-timeout.html"
92 // http://code.google.com/p/chromium/issues/detail?id=25548
93 // "worker-timeout.html"
94 }; 92 };
95 93
96 FilePath fast_test_dir; 94 FilePath fast_test_dir;
97 fast_test_dir = fast_test_dir.AppendASCII("LayoutTests"); 95 fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
98 fast_test_dir = fast_test_dir.AppendASCII("fast"); 96 fast_test_dir = fast_test_dir.AppendASCII("fast");
99 97
100 FilePath worker_test_dir; 98 FilePath worker_test_dir;
101 worker_test_dir = worker_test_dir.AppendASCII("workers"); 99 worker_test_dir = worker_test_dir.AppendASCII("workers");
102 InitializeForLayoutTest(fast_test_dir, worker_test_dir, false); 100 InitializeForLayoutTest(fast_test_dir, worker_test_dir, false);
103 101
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 window->AppendTab(url); 292 window->AppendTab(url);
295 293
296 // Check that we didn't create more than the max number of workers. 294 // Check that we didn't create more than the max number of workers.
297 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers)); 295 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers));
298 296
299 // Now close a page and check that the queued workers were started. 297 // Now close a page and check that the queued workers were started.
300 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); 298 tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
301 299
302 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers)); 300 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers));
303 } 301 }
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