summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
authoradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 21:17:21 +0000
committeradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 21:17:21 +0000
commit98f182734e0564f19cb9dd82905c9707a48bd9c3 (patch)
treea484456576789a7ff612a3ea9fe3f5bdb301545e /content/worker
parent21e50e9355d4ad5731cc68d7a944f48767bad07f (diff)
downloadchromium_src-98f182734e0564f19cb9dd82905c9707a48bd9c3.zip
chromium_src-98f182734e0564f19cb9dd82905c9707a48bd9c3.tar.gz
chromium_src-98f182734e0564f19cb9dd82905c9707a48bd9c3.tar.bz2
Remove FLAKY prefix from WorkerFileSystemTest.ResolveURLHttpTests on Mac and Linux.
The underlying problem was fixed in fs-test-util.js in http://trac.webkit.org/changeset/82204. A different problem remains on Windows, which I've yet to track down. R=michaeln@chromium.org BUG=77442 TEST=try jobs Review URL: http://codereview.chromium.org/6708119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/worker_uitest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/content/worker/worker_uitest.cc b/content/worker/worker_uitest.cc
index f3b2c7c..073d41e 100644
--- a/content/worker/worker_uitest.cc
+++ b/content/worker/worker_uitest.cc
@@ -774,8 +774,11 @@ TEST_F(WorkerFileSystemTest, FileEntryToURISync) {
RunWorkerFileSystemLayoutTest("file-entry-to-uri-sync.html");
}
+#if defined(OS_WIN)
// http://crbug.com/77442
-TEST_F(WorkerFileSystemTest, FLAKY_ResolveURLHttpTests) {
+#define ResolveURLHttpTests FLAKY_ResolveURLHttpTests
+#endif
+TEST_F(WorkerFileSystemTest, ResolveURLHttpTests) {
static const char* kLayoutTests[] = {
"resolve-url.html",
"resolve-url-sync.html"