| Index: chrome/test/ppapi/ppapi_test.cc
|
| diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
|
| index 2c1def44d16ace12c42195273474a742b450b5c3..d6102e31d18e1f61c2f112c4bee811fceed08271 100644
|
| --- a/chrome/test/ppapi/ppapi_test.cc
|
| +++ b/chrome/test/ppapi/ppapi_test.cc
|
| @@ -176,7 +176,8 @@ void PPAPITestBase::RunTestViaHTTP(const std::string& test_case) {
|
| ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
|
| net::TestServer http_server(net::TestServer::TYPE_HTTP,
|
| net::TestServer::kLocalhost,
|
| - document_root);
|
| + net::TestServer::GetSourceRelativePath(
|
| + document_root));
|
| ASSERT_TRUE(http_server.Start());
|
| RunTestURL(GetTestURL(http_server, test_case, ""));
|
| }
|
| @@ -186,10 +187,12 @@ void PPAPITestBase::RunTestWithSSLServer(const std::string& test_case) {
|
| ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
|
| net::TestServer http_server(net::TestServer::TYPE_HTTP,
|
| net::TestServer::kLocalhost,
|
| - http_document_root);
|
| + net::TestServer::GetSourceRelativePath(
|
| + http_document_root));
|
| net::TestServer ssl_server(net::TestServer::TYPE_HTTPS,
|
| net::BaseTestServer::SSLOptions(),
|
| - http_document_root);
|
| + net::TestServer::GetSourceRelativePath(
|
| + http_document_root));
|
| // Start the servers in parallel.
|
| ASSERT_TRUE(http_server.StartInBackground());
|
| ASSERT_TRUE(ssl_server.StartInBackground());
|
| @@ -208,10 +211,12 @@ void PPAPITestBase::RunTestWithWebSocketServer(const std::string& test_case) {
|
| ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
|
| net::TestServer http_server(net::TestServer::TYPE_HTTP,
|
| net::TestServer::kLocalhost,
|
| - http_document_root);
|
| + net::TestServer::GetSourceRelativePath(
|
| + http_document_root));
|
| net::TestServer ws_server(net::TestServer::TYPE_WS,
|
| net::TestServer::kLocalhost,
|
| - net::GetWebSocketTestDataDirectory());
|
| + net::TestServer::GetSourceRelativePath(
|
| + net::GetWebSocketTestDataDirectory()));
|
| // Start the servers in parallel.
|
| ASSERT_TRUE(http_server.StartInBackground());
|
| ASSERT_TRUE(ws_server.StartInBackground());
|
|
|