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

Unified Diff: components/storage_monitor/storage_monitor_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
Index: components/storage_monitor/storage_monitor_linux.cc
diff --git a/components/storage_monitor/storage_monitor_linux.cc b/components/storage_monitor/storage_monitor_linux.cc
index 84c7dc4d47da5e81baf6e4304a7c9ddaabdcc76e..56c3a4f81df0383f292a5fcc40b862d18401cd39 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;
}

Powered by Google App Engine
This is Rietveld 408576698