diff options
| -rw-r--r-- | chrome/test/data/extensions/api_test/websocket/test.html | 2 | ||||
| -rw-r--r-- | content/worker/test/worker_uitest.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.cc | 5 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 1 |
4 files changed, 10 insertions, 4 deletions
diff --git a/chrome/test/data/extensions/api_test/websocket/test.html b/chrome/test/data/extensions/api_test/websocket/test.html index 9a061a6..2093b4b 100644 --- a/chrome/test/data/extensions/api_test/websocket/test.html +++ b/chrome/test/data/extensions/api_test/websocket/test.html @@ -2,7 +2,7 @@ chrome.test.runTests([ function echoTest() { var ws = new WebSocket( - "ws://localhost:8880/websocket/tests/hixie76/workers/resources/echo"); + "ws://localhost:8880/websocket/tests/hybi/workers/resources/echo"); var MESSAGE_A = "message a"; var MESSAGE_B = "message b"; diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc index ef23e20..16ebc64 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); diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index dec3db6..615b68c 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -85,7 +85,8 @@ WebPreferences::WebPreferences() allow_displaying_insecure_content(true), allow_running_insecure_content(false), should_print_backgrounds(false), - enable_scroll_animator(false) { + enable_scroll_animator(false), + hixie76_websocket_protocol_enabled(false) { } WebPreferences::~WebPreferences() { @@ -236,6 +237,8 @@ void WebPreferences::Apply(WebView* web_view) const { settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); settings->setShouldPrintBackgrounds(should_print_backgrounds); settings->setEnableScrollAnimator(enable_scroll_animator); + settings->setHixie76WebSocketProtocolEnabled( + hixie76_websocket_protocol_enabled); WebNetworkStateNotifier::setOnLine(is_online); } diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index 77414b8..7f0fe3e 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -92,6 +92,7 @@ struct WebPreferences { bool allow_running_insecure_content; bool should_print_backgrounds; bool enable_scroll_animator; + bool hixie76_websocket_protocol_enabled; // We try to keep the default values the same as the default values in // chrome, except for the cases where it would require lots of extra work for // the embedder to use the same default value. |