| Index: net/test/local_test_server.h
|
| diff --git a/net/test/local_test_server.h b/net/test/local_test_server.h
|
| index 2b187396ac477b3f0c7e4091b7a460573d20a7f6..14b291d865c02b37d3baaf3cebc93fab87351c27 100644
|
| --- a/net/test/local_test_server.h
|
| +++ b/net/test/local_test_server.h
|
| @@ -37,8 +37,29 @@ class LocalTestServer : public BaseTestServer {
|
|
|
| virtual ~LocalTestServer();
|
|
|
| + // Start the test server and block until it's ready. Returns true on success.
|
| bool Start() WARN_UNUSED_RESULT;
|
|
|
| + // Start the test server without blocking. Use this if you need multiple test
|
| + // servers (such as WebSockets and HTTP, or HTTP and HTTPS). You must call
|
| + // BlockUntilStarted on all servers your test requires before executing the
|
| + // test. For example:
|
| + //
|
| + // // Start the servers in parallel.
|
| + // ASSERT_TRUE(http_server.StartInBackground());
|
| + // ASSERT_TRUE(websocket_server.StartInBackground());
|
| + // // Wait for both servers to be ready.
|
| + // ASSERT_TRUE(http_server.BlockUntilStarted());
|
| + // ASSERT_TRUE(websocket_server.BlockUntilStarted());
|
| + // RunMyTest();
|
| + //
|
| + // Returns true on success.
|
| + bool StartInBackground() WARN_UNUSED_RESULT;
|
| +
|
| + // Block until ths test server is ready. Returns true on success. See
|
| + // StartInBackground() documentation for more information.
|
| + bool BlockUntilStarted() WARN_UNUSED_RESULT;
|
| +
|
| // Stop the server started by Start().
|
| bool Stop();
|
|
|
|
|