Remove uses of KillProcess()

chrome/test/chromedriver/chrome/chrome_desktop_impl.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 "chrome/test/chromedriver/chrome/chrome_desktop_impl.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process/kill.h"
 #include "base/sys_info.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "chrome/test/chromedriver/chrome/automation_extension.h"
 #include "chrome/test/chromedriver/chrome/devtools_client.h"
 #include "chrome/test/chromedriver/chrome/devtools_http_client.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/web_view_impl.h"
 #include "chrome/test/chromedriver/net/port_server.h"
 
 #if defined(OS_POSIX)
 #include <errno.h>
 #include <signal.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #endif
 
 namespace {
 
-bool KillProcess(base::ProcessHandle process_id, bool kill_gracefully) {
+bool KillProcess(const base::Process& process, bool kill_gracefully) {
 #if defined(OS_POSIX)
   if (!kill_gracefully) {
-    kill(process_id, SIGKILL);
+    kill(process.Pid(), SIGKILL);
     base::TimeTicks deadline =
         base::TimeTicks::Now() + base::TimeDelta::FromSeconds(30);
     while (base::TimeTicks::Now() < deadline) {
-      pid_t pid = HANDLE_EINTR(waitpid(process_id, NULL, WNOHANG));
-      if (pid == process_id)
+      pid_t pid = HANDLE_EINTR(waitpid(process.Pid(), NULL, WNOHANG));
+      if (pid == process.Pid())
         return true;
       if (pid == -1) {
         if (errno == ECHILD) {
           // The wait may fail with ECHILD if another process also waited for
           // the same pid, causing the process state to get cleaned up.
           return true;
         }
-        LOG(WARNING) << "Error waiting for process " << process_id;
+        LOG(WARNING) << "Error waiting for process " << process.Pid();
       }
       base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(50));
     }
     return false;
   }
 #endif
 
-  if (!base::KillProcess(process_id, 0, true)) {
+  if (!process.Terminate(0, true)) {
     int exit_code;
-    return base::GetTerminationStatus(process_id, &exit_code) !=
+    return base::GetTerminationStatus(process.Handle(), &exit_code) !=
         base::TERMINATION_STATUS_STILL_RUNNING;
   }
   return true;
 }
 
 }  // namespace
 
 ChromeDesktopImpl::ChromeDesktopImpl(
     scoped_ptr<DevToolsHttpClient> http_client,
     scoped_ptr<DevToolsClient> websocket_client,
@@ skipping 99 matching lines @@
 bool ChromeDesktopImpl::IsMobileEmulationEnabled() const {
   return devtools_http_client_->device_metrics() != NULL;
 }
 
 Status ChromeDesktopImpl::QuitImpl() {
   // If the Chrome session uses a custom user data directory, try sending a
   // SIGTERM signal before SIGKILL, so that Chrome has a chance to write
   // everything back out to the user data directory and exit cleanly.If
   // we're using a temporary user data directory, we're going to delete
   // the temporary directory anyway, so just send SIGKILL immediately.
-  if (!KillProcess(process_.Handle(), !user_data_dir_.IsValid()))
+  if (!KillProcess(process_, !user_data_dir_.IsValid()))
     return Status(kUnknownError, "cannot kill Chrome");
   return Status(kOk);
 }
 
 const base::CommandLine& ChromeDesktopImpl::command() const {
   return command_;
 }