Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/host/setup/daemon_controller_delegate_linux.cc

Issue 999033003: Remove uses of KillProcess() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/test/spawned_test_server/local_test_server.cc ('K') | « net/test/spawned_test_server/local_test_server.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/setup/daemon_controller_delegate_linux.cc
diff --git a/remoting/host/setup/daemon_controller_delegate_linux.cc b/remoting/host/setup/daemon_controller_delegate_linux.cc
index b015eda08d143ec4920e26bd8331eb0bf4decc7f..3d7fa6591f144fac378505e8316da4e67109bc4d 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;
« net/test/spawned_test_server/local_test_server.cc ('K') | « net/test/spawned_test_server/local_test_server.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698