| Index: net/test/spawned_test_server/local_test_server.cc
|
| diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc
|
| index 309c69c5a135548120ea0f7499dede05db5dc7a4..6ecb7d9cc7769363c900f26a3fefa957c5f50060 100644
|
| --- a/net/test/spawned_test_server/local_test_server.cc
|
| +++ b/net/test/spawned_test_server/local_test_server.cc
|
| @@ -125,16 +125,15 @@ bool LocalTestServer::Stop() {
|
| return true;
|
|
|
| // First check if the process has already terminated.
|
| - bool ret = base::WaitForSingleProcess(process_.Handle(), base::TimeDelta());
|
| - if (!ret) {
|
| + int exit_code;
|
| + bool ret = process_.WaitForExitWithTimeout(base::TimeDelta(), &exit_code);
|
| + if (!ret)
|
| ret = base::KillProcess(process_.Handle(), 1, true);
|
| - }
|
|
|
| - if (ret) {
|
| + if (ret)
|
| process_.Close();
|
| - } else {
|
| + else
|
| VLOG(1) << "Kill failed?";
|
| - }
|
|
|
| return ret;
|
| }
|
|
|