diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 08:40:41 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 08:40:41 +0000 |
| commit | 033fb2d0489f513c871e3b6b22a86fb46277e770 (patch) | |
| tree | 9585a420e20a5643ba00231dd028674748ef83ba /ppapi | |
| parent | 1339a2a21493c04b3ef96b15d1c8172fd9fffeea (diff) | |
| download | chromium_src-033fb2d0489f513c871e3b6b22a86fb46277e770.zip chromium_src-033fb2d0489f513c871e3b6b22a86fb46277e770.tar.gz chromium_src-033fb2d0489f513c871e3b6b22a86fb46277e770.tar.bz2 | |
WebSocket test server migration on PPAPI tests
WebSocket test server migration from content::TestWebSocketServer to
net::TestServer.
This is a part of migration change for PPAPI tests.
BUG=137639
TEST=browser_tests --gtest_filter='*.WebSocket_*'
Review URL: https://chromiumcodereview.appspot.com/11048050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/tests/test_websocket.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc index 2707b4f..b18c3be 100644 --- a/ppapi/tests/test_websocket.cc +++ b/ppapi/tests/test_websocket.cc @@ -34,15 +34,13 @@ // These servers are provided by pywebsocket server side handlers in // LayoutTests/http/tests/websocket/tests/hybi/*_wsh. // pywebsocket server itself is launched in ppapi_ui_test.cc. -const char kEchoServerURL[] = "websocket/tests/hybi/echo-with-no-extension"; +const char kEchoServerURL[] = "echo-with-no-extension"; -const char kCloseServerURL[] = "websocket/tests/hybi/close"; +const char kCloseServerURL[] = "close"; -const char kCloseWithCodeAndReasonServerURL[] = - "websocket/tests/hybi/close-code-and-reason"; +const char kCloseWithCodeAndReasonServerURL[] = "close-code-and-reason"; -const char kProtocolTestServerURL[] = - "websocket/tests/hybi/protocol-test?protocol="; +const char kProtocolTestServerURL[] = "protocol-test?protocol="; const char* const kInvalidURLs[] = { "http://www.google.com/invalid_scheme", |