Fix LocalTestServer shutdown on Windows

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"
@@ skipping 107 matching lines @@
   return SetupWhenServerStarted();
 }
 
 bool LocalTestServer::Stop() {
   CleanUpWhenStoppingServer();
 
   if (!process_handle_)
     return true;
 
 #if defined(OS_WIN)
-  // This kills all the processes in the job object.
+  // Kill all the processes in the job object.
+  // Passing 0 exit code so that WaitForSingleProcess below doesn't fail.
+  if (job_handle_ && !base::KillJob(job_handle_.Get(), 0, true)) {
+    VLOG(1) << "Job kill failed";
+  }
   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