Redefine base::Process:Terminate so that it can replace base::KillProcess

base/process/process.h

 // Copyright (c) 2011 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.
 
 #ifndef BASE_PROCESS_PROCESS_PROCESS_H_
 #define BASE_PROCESS_PROCESS_PROCESS_H_
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/move.h"
@@ skipping 74 matching lines @@
   // Get the PID for this process.
   ProcessId Pid() const;
 
   // Returns true if this process is the current process.
   bool is_current() const;
 
   // Close the process handle. This will not terminate the process.
   void Close();
 
   // Terminates the process with extreme prejudice. The given |result_code| will
-  // be the exit code of the process.
+  // be the exit code of the process. if |wait| is true, this method will wait

[rvargas (doing something else), 2015/03/06 19:57:08]

will upper case if.

+  // for up to one minute for the process to actually terminate.
+  // Returns true if the process terminates within the allowed time.
   // NOTE: On POSIX |result_code| is ignored.
-  void Terminate(int result_code);
+  bool Terminate(int result_code, bool wait);
 
   // Waits for the process to exit. Returns true on success.
   // On POSIX, if the process has been signaled then |exit_code| is set to -1.
   // On Linux this must be a child process, however on Mac and Windows it can be
   // any process.
   bool WaitForExit(int* exit_code);
 
   // Same as WaitForExit() but only waits for up to |timeout|.
   bool WaitForExitWithTimeout(TimeDelta timeout, int* exit_code);
 
@@ skipping 16 matching lines @@
   bool is_current_process_;
   win::ScopedHandle process_;
 #else
   ProcessHandle process_;
 #endif
 };
 
 }  // namespace base
 
 #endif  // BASE_PROCESS_PROCESS_PROCESS_H_