| Index: chrome/test/ppapi/ppapi_test.cc
|
| diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
|
| index bebf3b2ebc2fd960bd7658a596b4a85f6651fdf4..f6d9af3fce28fd60550daffaa8281f3eb2e5ed45 100644
|
| --- a/chrome/test/ppapi/ppapi_test.cc
|
| +++ b/chrome/test/ppapi/ppapi_test.cc
|
| @@ -194,12 +194,11 @@ void PPAPITestBase::RunTestWithSSLServer(const std::string& test_case) {
|
| }
|
|
|
| void PPAPITestBase::RunTestWithWebSocketServer(const std::string& test_case) {
|
| - FilePath websocket_root_dir;
|
| - ASSERT_TRUE(
|
| - PathService::Get(content::DIR_LAYOUT_TESTS, &websocket_root_dir));
|
| - content::TestWebSocketServer server;
|
| - int port = server.UseRandomPort();
|
| - ASSERT_TRUE(server.Start(websocket_root_dir));
|
| + net::TestServer server(net::TestServer::TYPE_WS,
|
| + net::TestServer::kLocalhost,
|
| + FilePath(FILE_PATH_LITERAL("net/data/websocket")));
|
| + ASSERT_TRUE(server.Start());
|
| + uint16_t port = server.host_port_pair().port();
|
| FilePath http_document_root;
|
| ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
|
| RunHTTPTestServer(http_document_root, test_case,
|
|
|