summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authordimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-14 05:24:40 +0000
committerdimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-14 05:24:40 +0000
commit65f5ef4785c30ad960c8bc194d6d61f3e553e935 (patch)
tree696788a457b0cfab3edba45529e54b27adb56e01 /chrome/worker
parent128cef2643ccd6816efd2dcca798e9f0b38705a9 (diff)
downloadchromium_src-65f5ef4785c30ad960c8bc194d6d61f3e553e935.zip
chromium_src-65f5ef4785c30ad960c8bc194d6d61f3e553e935.tar.gz
chromium_src-65f5ef4785c30ad960c8bc194d6d61f3e553e935.tar.bz2
Enable worker-timeout.html layout test. It's fixed upstream.
TEST=worker-timeout.html BUG=25548 Review URL: http://codereview.chromium.org/396001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 1c3144a..f1a0a59 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -88,9 +88,7 @@ TEST_F(WorkerTest, WorkerFastLayoutTests) {
"worker-replace-self.html",
"worker-script-error.html",
"worker-terminate.html",
- // clearInterval() sometimes lets the timer continue to fire
- // http://code.google.com/p/chromium/issues/detail?id=25548
- // "worker-timeout.html"
+ "worker-timeout.html"
};
FilePath fast_test_dir;