Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(639)

Unified Diff: chrome/test/ppapi/ppapi_test.cc

Issue 11048050: WebSocket test server migration on PPAPI tests (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: pass pylint check Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/data/websocket/close-code-and-reason_wsh.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « no previous file | net/data/websocket/close-code-and-reason_wsh.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698