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 /remoting/host/setup | |
| 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 'remoting/host/setup')
| -rw-r--r-- | remoting/host/setup/daemon_controller_delegate_linux.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/remoting/host/setup/daemon_controller_delegate_linux.cc b/remoting/host/setup/daemon_controller_delegate_linux.cc index b015eda..3d7fa65 100644 --- a/remoting/host/setup/daemon_controller_delegate_linux.cc +++ b/remoting/host/setup/daemon_controller_delegate_linux.cc @@ -18,9 +18,8 @@ #include "base/logging.h" #include "base/md5.h" #include "base/path_service.h" -#include "base/process/kill.h" #include "base/process/launch.h" -#include "base/process/process_handle.h" +#include "base/process/process.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -113,7 +112,7 @@ bool RunHostScriptWithTimeout( } if (!process.WaitForExitWithTimeout(timeout, exit_code)) { - base::KillProcess(process.Handle(), 0, false); + process.Terminate(0, false); LOG(ERROR) << "Timeout exceeded for command: " << command_line.GetCommandLineString(); return false; |