summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 12:18:16 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 12:18:16 +0000
commit3d414bb66b3fc7fc794bb2eee43e340fee803ea5 (patch)
treeaf1f6c95e773acbe333772ff41c7369d02f86f21 /chrome/worker
parent39065d01084bfce88293bec21f73e5e155285435 (diff)
downloadchromium_src-3d414bb66b3fc7fc794bb2eee43e340fee803ea5.zip
chromium_src-3d414bb66b3fc7fc794bb2eee43e340fee803ea5.tar.gz
chromium_src-3d414bb66b3fc7fc794bb2eee43e340fee803ea5.tar.bz2
Mark WorkerTest.LimitPerPage flaky also on Mac.
BUG=48664 R=jar Review URL: http://codereview.chromium.org/2958004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 09e6c399..20e6bae 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -523,11 +523,9 @@ TEST_F(WorkerTest, FLAKY_MessagePorts) {
RunLayoutTest(kLayoutTestFiles[i], kNoHttpPort);
}
-#if defined(OS_WIN) || defined(OS_LINUX)
// This has been flaky on Windows since r39931. http://crbug.com/36800
-#define LimitPerPage FLAKY_LimitPerPage
-#endif
-TEST_F(WorkerTest, LimitPerPage) {
+// And on Mac since r51935. http://crbug.com/48664
+TEST_F(WorkerTest, FLAKY_LimitPerPage) {
int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
FilePath(kManyWorkersFile));