Index: net/test/local_test_server.cc |
diff --git a/net/test/local_test_server.cc b/net/test/local_test_server.cc |
index 5e1e0e93765030d3ec3651465ec99e3cf0c20b71..7cb1a0ddcb3083d19466b05398e3f7883fc8b8a0 100644 |
--- a/net/test/local_test_server.cc |
+++ b/net/test/local_test_server.cc |
@@ -103,6 +103,10 @@ bool LocalTestServer::GetTestServerPath(FilePath* testserver_path) const { |
} |
bool LocalTestServer::Start() { |
+ return StartInBackground() && BlockUntilStarted(); |
+} |
+ |
+bool LocalTestServer::StartInBackground() { |
// Get path to Python server script. |
FilePath testserver_path; |
if (!GetTestServerPath(&testserver_path)) |
@@ -114,6 +118,10 @@ bool LocalTestServer::Start() { |
if (!LaunchPython(testserver_path)) |
return false; |
+ return true; |
+} |
+ |
+bool LocalTestServer::BlockUntilStarted() { |
if (!WaitToStart()) { |
Stop(); |
return false; |