Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / net / test / spawned_test_server / local_test_server.cc

diff --git a/src/net/test/spawned_test_server/local_test_server.cc b/src/net/test/spawned_test_server/local_test_server.cc
index ee86d74..6516136 100644 (file)
--- a/src/net/test/spawned_test_server/local_test_server.cc
+++ b/src/net/test/spawned_test_server/local_test_server.cc
@@ -10,7 +10,6 @@
 #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"
@@ -127,10 +126,6 @@ bool LocalTestServer::Stop() {
 
 #if defined(OS_WIN)
   // This kills all the processes in the job object.
-  TerminateJobObject(job_handle_.Get(), 1);
-  // This is done asynchronously so wait a bit for the processes to be killed.
-  WaitForSingleObject(job_handle_.Get(),
-                      TestTimeouts::action_timeout().InMilliseconds());
   job_handle_.Close();
 #endif