| Index: chrome/test/chromedriver/net/test_http_server.cc
|
| diff --git a/chrome/test/chromedriver/net/test_http_server.cc b/chrome/test/chromedriver/net/test_http_server.cc
|
| index b2780871d9dc4e456a9926f66c2a6d0fd5be4e66..7946bae381cb9d43587e8c6d33739972b122b78b 100644
|
| --- a/chrome/test/chromedriver/net/test_http_server.cc
|
| +++ b/chrome/test/chromedriver/net/test_http_server.cc
|
| @@ -43,12 +43,15 @@ bool TestHttpServer::Start() {
|
| }
|
|
|
| void TestHttpServer::Stop() {
|
| + if (!thread_.IsRunning())
|
| + return;
|
| base::WaitableEvent event(false, false);
|
| thread_.message_loop_proxy()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&TestHttpServer::StopOnServerThread,
|
| base::Unretained(this), &event));
|
| event.Wait();
|
| + thread_.Stop();
|
| }
|
|
|
| bool TestHttpServer::WaitForConnectionsToClose() {
|
|
|