Remove uses of KillProcess()

cloud_print/service/win/chrome_launcher.cc

 // Copyright (c) 2012 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 "cloud_print/service/win/chrome_launcher.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
-#include "base/process/kill.h"
+#include "base/process/process.h"
 #include "base/process/process.h"
 #include "base/values.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
 #include "cloud_print/common/win/cloud_print_utils.h"
 #include "cloud_print/service/service_constants.h"
 #include "cloud_print/service/win/service_utils.h"
 #include "components/cloud_devices/common/cloud_devices_urls.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
 
 namespace {
 
 const int kShutdownTimeoutMs = 30 * 1000;
 const int kUsageUpdateTimeoutMs = 6 * 3600 * 1000;  // 6 hours.
 
 static const base::char16 kAutoRunKeyPath[] =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\Run";
 
 // Terminates any process.
-void ShutdownChrome(HANDLE process, DWORD thread_id) {
+void ShutdownChrome(base::Process process, DWORD thread_id) {
   if (::PostThreadMessage(thread_id, WM_QUIT, 0, 0) &&
-      WAIT_OBJECT_0 == ::WaitForSingleObject(process, kShutdownTimeoutMs)) {
+      WAIT_OBJECT_0 == ::WaitForSingleObject(process.Handle(),
+                                             kShutdownTimeoutMs)) {
     return;
   }
   LOG(ERROR) << "Failed to shutdown process.";
-  base::KillProcess(process, 0, true);
+  process.Terminate(0, true);
 }
 
 BOOL CALLBACK CloseIfPidEqual(HWND wnd, LPARAM lparam) {
   DWORD pid = 0;
   ::GetWindowThreadProcessId(wnd, &pid);
   if (pid == static_cast<DWORD>(lparam))
     ::PostMessage(wnd, WM_CLOSE, 0, 0);
   return TRUE;
 }
 
 void CloseAllProcessWindows(HANDLE process) {
   ::EnumWindows(&CloseIfPidEqual, GetProcessId(process));
 }
 
 // Close Chrome browser window.
-void CloseChrome(HANDLE process, DWORD thread_id) {
-  CloseAllProcessWindows(process);
-  if (WAIT_OBJECT_0 == ::WaitForSingleObject(process, kShutdownTimeoutMs)) {
+void CloseChrome(base::Process process, DWORD thread_id) {
+  CloseAllProcessWindows(process.Handle());
+  if (WAIT_OBJECT_0 ==
+      ::WaitForSingleObject(process.Handle(), kShutdownTimeoutMs)) {
     return;
   }
-  ShutdownChrome(process, thread_id);
+  ShutdownChrome(process.Pass(), thread_id);
 }
 
 bool LaunchProcess(const base::CommandLine& cmdline,
                    base::win::ScopedHandle* process_handle,
                    DWORD* thread_id) {
   STARTUPINFO startup_info = {};
   startup_info.cb = sizeof(startup_info);
   startup_info.dwFlags = STARTF_USESHOWWINDOW;
   startup_info.wShowWindow = SW_SHOW;
 
@@ skipping 139 matching lines @@
       cmd.AppendSwitch(switches::kDisableGpu);
       cmd.AppendSwitch(switches::kDisableSoftwareRasterizer);
       cmd.AppendSwitch(switches::kDisableSync);
       cmd.AppendSwitch(switches::kNoFirstRun);
       cmd.AppendSwitch(switches::kNoStartupWindow);
 
       base::win::ScopedHandle chrome_handle;
       base::Time started = base::Time::Now();
       DWORD thread_id = 0;
       LaunchProcess(cmd, &chrome_handle, &thread_id);
+      base::Process chrome_process;
+      if (chrome_handle.IsValid())
+        chrome_process = base::Process(chrome_handle.Take());
 
-      HANDLE handles[] = { stop_event_.handle(), chrome_handle.Get() };
+      HANDLE handles[] = { stop_event_.handle(), chrome_process.Handle() };
       DWORD wait_result = WAIT_TIMEOUT;
       while (wait_result == WAIT_TIMEOUT) {
         cloud_print::SetGoogleUpdateUsage(kGoogleUpdateId);
         wait_result = ::WaitForMultipleObjects(arraysize(handles), handles,
                                                FALSE, kUsageUpdateTimeoutMs);
       }
       if (wait_result == WAIT_OBJECT_0) {
-        ShutdownChrome(chrome_handle.Get(), thread_id);
+        ShutdownChrome(chrome_process.Pass(), thread_id);
         break;
       } else if (wait_result == WAIT_OBJECT_0 + 1) {
         LOG(ERROR) << "Chrome process exited.";
       } else {
         LOG(ERROR) << "Error waiting Chrome (" << ::GetLastError() << ").";
       }
       if (base::Time::Now() - started > base::TimeDelta::FromHours(1)) {
         // Reset timeout because process worked long enough.
         time_out = default_time_out;
       }
@@ skipping 48 matching lines @@
 
   cmd.AppendArg(
       cloud_devices::GetCloudPrintEnableWithSigninURL(proxy_id).spec());
 
   base::win::ScopedHandle chrome_handle;
   DWORD thread_id = 0;
   if (!LaunchProcess(cmd, &chrome_handle, &thread_id)) {
     LOG(ERROR) << "Unable to launch Chrome.";
     return std::string();
   }
+  base::Process chrome_process(chrome_handle.Take());
 
   for (;;) {
-    DWORD wait_result = ::WaitForSingleObject(chrome_handle.Get(), 500);
+    DWORD wait_result = ::WaitForSingleObject(chrome_process.Handle(), 500);
     std::string json = ReadAndUpdateServiceState(temp_user_data.path(),
                                                  proxy_id);
     if (wait_result == WAIT_OBJECT_0) {
       // Return what we have because browser is closed.
       return json;
     }
     if (wait_result != WAIT_TIMEOUT) {
       LOG(ERROR) << "Chrome launch failed.";
       return std::string();
     }
     if (!json.empty()) {
       // Close chrome because Service State is ready.
-      CloseChrome(chrome_handle.Get(), thread_id);
+      CloseChrome(chrome_process.Pass(), thread_id);
       return json;
     }
   }
 }