Remove uses of KillProcess()

net/test/spawned_test_server/local_test_server.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/test/spawned_test_server/local_test_server.h"
 
 #include "base/command_line.h"
 #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"
 #include "net/base/net_errors.h"
 #include "net/test/python_utils.h"
 #include "url/gurl.h"
 
 namespace net {
 
 namespace {
@@ skipping 99 matching lines @@
 bool LocalTestServer::Stop() {
   CleanUpWhenStoppingServer();
 
   if (!process_.IsValid())
     return true;
 
   // First check if the process has already terminated.
   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 I think they want |false|
here.

[rvargas (doing something else), 2015/03/17 22:40:53]

The timeout above is 0, so it's not waiting.

 
   if (ret)
     process_.Close();
   else
     VLOG(1) << "Kill failed?";
 
   return ret;
 }
 
 bool LocalTestServer::Init(const base::FilePath& document_root) {
@@ skipping 100 matching lines @@
       break;
     default:
       NOTREACHED();
       return false;
   }
 
   return true;
 }
 
 }  // namespace net