diff options
| author | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 08:24:47 +0000 |
|---|---|---|
| committer | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 08:24:47 +0000 |
| commit | 8fa9b2588d4872e621914b3973a1c84c301548bc (patch) | |
| tree | a30ca69c60e617c35838d8169482eb136b9be3d2 /content/worker/test/worker_uitest.cc | |
| parent | 2af352b6abdc9481becd0a744dbb2e682e9912d9 (diff) | |
| download | chromium_src-8fa9b2588d4872e621914b3973a1c84c301548bc.zip chromium_src-8fa9b2588d4872e621914b3973a1c84c301548bc.tar.gz chromium_src-8fa9b2588d4872e621914b3973a1c84c301548bc.tar.bz2 | |
Enable hybi WebSocket protocol by default.
This CL enables the new WebSocket protocol by overriding the value of WebCore::Settings::useHixie76WebSocketProtocol() to false.
It is known that WebSocket instances initialized in worker context use the old hixie76 protocol even after this change is applied (see https://bugs.webkit.org/show_bug.cgi?id=64852). I'm going to take care of it after this CL is committed.
BUG=64470
TEST=none
Review URL: http://codereview.chromium.org/7462009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker/test/worker_uitest.cc')
| -rw-r--r-- | content/worker/test/worker_uitest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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); |