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 7ee12b99f69fc5032ea477c5ca8a1915547e835f..f8d63109e43661b930626ed7356a9fabda3f2dc9 100644 |
--- a/net/test/spawned_test_server/local_test_server.cc |
+++ b/net/test/spawned_test_server/local_test_server.cc |
@@ -10,6 +10,7 @@ |
#include "base/path_service.h" |
#include "base/process/kill.h" |
#include "base/strings/string_number_conversions.h" |
+#include "base/test/test_timeouts.h" |
#include "base/values.h" |
#include "net/base/host_port_pair.h" |
#include "net/base/net_errors.h" |
@@ -130,10 +131,10 @@ bool LocalTestServer::Stop() { |
#endif |
// First check if the process has already terminated. |
- bool ret = base::WaitForSingleProcess(process_handle_, base::TimeDelta()); |
- if (!ret) { |
+ bool ret = base::WaitForSingleProcess(process_handle_, |
+ TestTimeouts::action_timeout()); |
+ if (!ret) |
ret = base::KillProcess(process_handle_, 1, true); |
- } |
if (ret) { |
base::CloseProcessHandle(process_handle_); |