Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: content/worker/test/worker_uitest.cc

Issue 7462009: Enable hybi WebSocket protocol by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/data/extensions/api_test/websocket/test.html ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/worker/test/worker_uitest.cc
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc
index ef23e2021d10c057dbf2e2fb580e8fcbec753bb3..16ebc644659d70748b0184b96d774b83637f5bb0 100644
--- a/content/worker/test/worker_uitest.cc
+++ b/content/worker/test/worker_uitest.cc
@@ -449,7 +449,9 @@ TEST_F(WorkerTest, DISABLED_WorkerHttpLayoutTests) {
ASSERT_TRUE(http_server.Stop());
}
-TEST_F(WorkerTest, WorkerWebSocketLayoutTests) {
+// TODO(yutak): Reenable this test after the following issue is resolved.
+// https://bugs.webkit.org/show_bug.cgi?id=64852
+TEST_F(WorkerTest, DISABLED_WorkerWebSocketLayoutTests) {
static const char* kLayoutTestFiles[] = {
"close-in-onmessage-crash.html",
"close-in-shared-worker.html",
@@ -466,7 +468,7 @@ TEST_F(WorkerTest, WorkerWebSocketLayoutTests) {
FilePath worker_test_dir;
worker_test_dir = worker_test_dir.AppendASCII("websocket");
worker_test_dir = worker_test_dir.AppendASCII("tests");
- worker_test_dir = worker_test_dir.AppendASCII("hixie76");
+ worker_test_dir = worker_test_dir.AppendASCII("hybi");
worker_test_dir = worker_test_dir.AppendASCII("workers");
InitializeForLayoutTest(websocket_test_dir, worker_test_dir, kHttpPort);
« no previous file with comments | « chrome/test/data/extensions/api_test/websocket/test.html ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698