Remove uses of KillProcess()

components/storage_monitor/storage_monitor_linux.cc

 // Copyright 2014 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.
 
 // StorageMonitorLinux implementation.
 
 #include "components/storage_monitor/storage_monitor_linux.h"
 
 #include <mntent.h>
 #include <stdio.h>
 
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
+#include "base/process/process.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/storage_monitor/media_storage_util.h"
 #include "components/storage_monitor/media_transfer_protocol_device_observer_linux.h"
 #include "components/storage_monitor/removable_device_constants.h"
 #include "components/storage_monitor/storage_info.h"
 #include "components/storage_monitor/udev_util_linux.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
@@ skipping 185 matching lines @@
   command.push_back(path.value());
 
   base::LaunchOptions options;
   base::Process process = base::LaunchProcess(command, options);
   if (!process.IsValid())
     return StorageMonitor::EJECT_FAILURE;
 
   int exit_code = -1;
   if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000),
                                       &exit_code)) {
-    base::KillProcess(process.Handle(), -1, false);
+    process.Terminate(-1, false);
     base::EnsureProcessTerminated(process.Pass());
     return StorageMonitor::EJECT_FAILURE;
   }
 
   // TODO(gbillock): Make sure this is found in documentation
   // somewhere. Experimentally it seems to hold that exit code
   // 1 means device is in use.
   if (exit_code == 1)
     return StorageMonitor::EJECT_IN_USE;
   if (exit_code != 0)
@@ skipping 265 matching lines @@
   mount_priority_map_[mount_device][mount_point] = removable;
   receiver()->ProcessAttach(*storage_info);
 }
 
 StorageMonitor* StorageMonitor::CreateInternal() {
   const base::FilePath kDefaultMtabPath("/etc/mtab");
   return new StorageMonitorLinux(kDefaultMtabPath);
 }
 
 }  // namespace storage_monitor