diff options
author | rvargas <rvargas@chromium.org> | 2015-03-17 18:36:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-18 01:37:05 +0000 |
commit | 486b2f5612c0f9711d6fced550d7ed904fea4319 (patch) | |
tree | 2c47ea91fe136b689fac00badd324d18e94e58e7 /components/storage_monitor | |
parent | 0017478eedcbdb70040454ef30f1993ee7752f05 (diff) | |
download | chromium_src-486b2f5612c0f9711d6fced550d7ed904fea4319.zip chromium_src-486b2f5612c0f9711d6fced550d7ed904fea4319.tar.gz chromium_src-486b2f5612c0f9711d6fced550d7ed904fea4319.tar.bz2 |
Remove uses of KillProcess()
BUG=417532
Review URL: https://codereview.chromium.org/999033003
Cr-Commit-Position: refs/heads/master@{#321045}
Diffstat (limited to 'components/storage_monitor')
-rw-r--r-- | components/storage_monitor/storage_monitor_linux.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/storage_monitor/storage_monitor_linux.cc b/components/storage_monitor/storage_monitor_linux.cc index 162a4a2..b1068e4 100644 --- a/components/storage_monitor/storage_monitor_linux.cc +++ b/components/storage_monitor/storage_monitor_linux.cc @@ -16,6 +16,7 @@ #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" @@ -221,7 +222,7 @@ StorageMonitor::EjectStatus EjectPathOnFileThread( 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; } |