diff options
| author | jparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 21:45:14 +0000 |
|---|---|---|
| committer | jparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 21:45:14 +0000 |
| commit | ed923efad77354e009d327cfc055907c5e995728 (patch) | |
| tree | afa58b8ca93b09912792b601f2f818f031d4b7b0 /chrome/worker | |
| parent | 19e41d71f9b27610131d7427d78fa65c294f016d (diff) | |
| download | chromium_src-ed923efad77354e009d327cfc055907c5e995728.zip chromium_src-ed923efad77354e009d327cfc055907c5e995728.tar.gz chromium_src-ed923efad77354e009d327cfc055907c5e995728.tar.bz2 | |
Roll WebKit 59900:59936.
TBR=victorw
TEST=canaries and try servers
BUG=44792
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 8ada3f2..c3496e0 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -418,6 +418,12 @@ TEST_F(WorkerTest, FLAKY_WorkerHttpLayoutTests) { StopHttpServer(); } +// http://crbug.com/40995 +// https://bugs.webkit.org/show_bug.cgi?id=37518 +#if defined(OS_WIN) +#define WorkerWebSocketLayoutTests FAILS_WorkerWebSocketLayoutTests +#endif + TEST_F(WorkerTest, WorkerWebSocketLayoutTests) { static const char* kLayoutTestFiles[] = { "worker-simple.html", |