diff options
Diffstat (limited to 'chrome/browser/net/websocket_browsertest.cc')
-rw-r--r-- | chrome/browser/net/websocket_browsertest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index bd7f8ee..06442c4 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc @@ -10,27 +10,27 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" #include "net/base/test_data_directory.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" namespace { class WebSocketBrowserTest : public InProcessBrowserTest { public: WebSocketBrowserTest() - : ws_server_(net::TestServer::TYPE_WS, - net::TestServer::kLocalhost, + : ws_server_(net::SpawnedTestServer::TYPE_WS, + net::SpawnedTestServer::kLocalhost, net::GetWebSocketTestDataDirectory()), - wss_server_(net::TestServer::TYPE_WSS, + wss_server_(net::SpawnedTestServer::TYPE_WSS, SSLOptions(SSLOptions::CERT_OK), net::GetWebSocketTestDataDirectory()) { } protected: - net::TestServer ws_server_; - net::TestServer wss_server_; + net::SpawnedTestServer ws_server_; + net::SpawnedTestServer wss_server_; private: - typedef net::TestServer::SSLOptions SSLOptions; + typedef net::SpawnedTestServer::SSLOptions SSLOptions; DISALLOW_COPY_AND_ASSIGN(WebSocketBrowserTest); }; |