Fix LocalTestServer shutdown on Windows

base/process/kill_win.cc

 // Copyright (c) 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 "base/process/kill.h"
 
 #include <io.h>
 #include <windows.h>
 
 #include "base/bind.h"
@@ skipping 85 matching lines @@
   if (result && wait) {
     // The process may not end immediately due to pending I/O
     if (WAIT_OBJECT_0 != WaitForSingleObject(process, 60 * 1000))
       DLOG_GETLASTERROR(ERROR) << "Error waiting for process exit";
   } else if (!result) {
     DLOG_GETLASTERROR(ERROR) << "Unable to terminate process";
   }
   return result;
 }
 
+bool KillJob(HANDLE job, int exit_code, bool wait) {
+  bool result = (TerminateJobObject(job, exit_code) != FALSE);
+  if (result && wait) {
+    // The processes may not end immediately due to pending I/O

[Paweł Hajdan Jr., 2014/04/23 10:49:22]

nit: Please end all comments with a dot.

+    if (WAIT_OBJECT_0 != WaitForSingleObject(job, 60 * 1000))
+      DLOG_GETLASTERROR(ERROR) << "Error waiting for job exit";

[Paweł Hajdan Jr., 2014/04/23 10:49:22]

With this wait=true is effectively a no-op in case of timeouts.

How about this (and I see it mirrors KillProcess above, so maybe let's also
change KillProcess): actually return false in this case, and also allow callers
to pass a different timeout?

Feel free to maybe add another named function for KillProcess and deprecate
KillProcess (and finish the transition in follow-up CLs if possible).

+  } else if (!result) {
+    DLOG_GETLASTERROR(ERROR) << "Unable to terminate job";
+  }
+  return result;
+}
+
 // Attempts to kill the process identified by the given process
 // entry structure, giving it the specified exit code.
 // Returns true if this is successful, false otherwise.
 bool KillProcessById(ProcessId process_id, int exit_code, bool wait) {
   HANDLE process = OpenProcess(PROCESS_TERMINATE | SYNCHRONIZE,
                                FALSE,  // Don't inherit handle
                                process_id);
   if (!process) {
     DLOG_GETLASTERROR(ERROR) << "Unable to open process " << process_id;
     return false;
@@ skipping 130 matching lines @@
   }
 
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&TimerExpiredTask::TimedOut,
                  base::Owned(new TimerExpiredTask(process))),
       base::TimeDelta::FromMilliseconds(kWaitInterval));
 }
 
 }  // namespace base