| Index: chrome/test/data/http/tests/ws.html
|
| diff --git a/chrome/test/data/http/tests/wss.html b/chrome/test/data/http/tests/ws.html
|
| similarity index 70%
|
| rename from chrome/test/data/http/tests/wss.html
|
| rename to chrome/test/data/http/tests/ws.html
|
| index cef7fa796edfb3f264e245f38bddaf9a6429666b..9eb84ed9f218e7318205e03b8c2f78c87187bf2d 100644
|
| --- a/chrome/test/data/http/tests/wss.html
|
| +++ b/chrome/test/data/http/tests/ws.html
|
| @@ -1,14 +1,15 @@
|
| <!DOCTYPE html>
|
| <html>
|
| <head>
|
| -<title>test wss connection</title>
|
| +<title>test ws connection</title>
|
| <script type="text/javascript">
|
|
|
| var href = window.location.href;
|
| var portBegin = href.lastIndexOf(':') + 1;
|
| var portEnd = href.lastIndexOf('/');
|
| var port = href.slice(portBegin, portEnd);
|
| -var url = 'wss://localhost:' + port + '/websocket/tests/echo';
|
| +var scheme = href.indexOf('https') >= 0 ? 'wss' : 'ws';
|
| +var url = scheme + '://localhost:' + port + '/websocket/tests/echo';
|
|
|
| // Do connection test.
|
| var ws = new WebSocket(url);
|
| @@ -26,14 +27,6 @@ ws.onclose = function()
|
| document.title = 'FAIL';
|
| }
|
|
|
| -function timeOutCallback()
|
| -{
|
| - // Set document title to 'FAIL'.
|
| - document.title = 'FAIL';
|
| -}
|
| -
|
| -setTimeout(timeOutCallback, 3000);
|
| -
|
| </script>
|
| </head>
|
| </html>
|
|
|