Revert 260201 "Give localserver time to shut down"

trunk/src/net/test/spawned_test_server/local_test_server.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/test/spawned_test_server/local_test_server.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #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"
 #include "net/test/python_utils.h"
 #include "url/gurl.h"
 
 namespace net {
 
 namespace {
 
@@ skipping 96 matching lines @@
 }
 
 bool LocalTestServer::Stop() {
   CleanUpWhenStoppingServer();
 
   if (!process_handle_)
     return true;
 
 #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
 
   // First check if the process has already terminated.
   bool ret = base::WaitForSingleProcess(process_handle_, base::TimeDelta());
   if (!ret) {
     ret = base::KillProcess(process_handle_, 1, true);
   }
 
   if (ret) {
@@ skipping 111 matching lines @@
       break;
     default:
       NOTREACHED();
       return false;
   }
 
   return true;
 }
 
 }  // namespace net