summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-19 09:37:57 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-19 09:37:57 +0000
commit3d55c83a62287929db64c7c99947b0f086f5f235 (patch)
tree93d6d553473df03a6cb1a078a6c0c0d7ca96e198 /chrome/worker
parentd5306644f068a1ec7b64f122709b85e892ea0270 (diff)
downloadchromium_src-3d55c83a62287929db64c7c99947b0f086f5f235.zip
chromium_src-3d55c83a62287929db64c7c99947b0f086f5f235.tar.gz
chromium_src-3d55c83a62287929db64c7c99947b0f086f5f235.tar.bz2
Enable WorkerWebSocketLayoutTests.
Worker bug has been fixed in https://bugs.webkit.org/show_bug.cgi?id=33581 Also add shared-worker-simple.html. BUG=none TEST=ui_tests passes Review URL: http://codereview.chromium.org/545115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index d7df908..204c106 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -279,15 +279,10 @@ TEST_F(WorkerTest, WorkerHttpLayoutTests) {
StopHttpServer();
}
-#if !defined(NDEBUG)
-// Debug binary failed at assertion in WorkerThread.
-// See https://bugs.webkit.org/show_bug.cgi?id=33581
-#define WorkerWebSocketLayoutTests DISABLED_WorkerWebSocketLayoutTests
-#endif
-
TEST_F(WorkerTest, WorkerWebSocketLayoutTests) {
static const char* kLayoutTestFiles[] = {
"worker-simple.html",
+ "shared-worker-simple.html",
};
FilePath websocket_test_dir;