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

Unified Diff: net/test/spawned_test_server/local_test_server.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: net/test/spawned_test_server/local_test_server.cc
diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc
index 6ecb7d9cc7769363c900f26a3fefa957c5f50060..77630b175ae6d2be4fe2335b10d18889280ded1c 100644
--- a/net/test/spawned_test_server/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.cc
@@ -8,7 +8,6 @@
#include "base/json/json_reader.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/process/kill.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "net/base/host_port_pair.h"
@@ -128,7 +127,7 @@ bool LocalTestServer::Stop() {
int exit_code;
bool ret = process_.WaitForExitWithTimeout(base::TimeDelta(), &exit_code);
if (!ret)
- ret = base::KillProcess(process_.Handle(), 1, true);
+ ret = process_.Terminate(1, true);
cpu_(ooo_6.6-7.5) 2015/03/17 20:36:31 seems buggy, there is a explicit timeout above so
rvargas (doing something else) 2015/03/17 22:40:53 The timeout above is 0, so it's not waiting.
if (ret)
process_.Close();

Powered by Google App Engine
This is Rietveld 408576698