Redefine base::Process:Terminate so that it can replace base::KillProcess

components/browser_watcher/exit_code_watcher_win_unittest.cc

 // Copyright (c) 2014 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 "components/browser_watcher/exit_code_watcher_win.h"
 
 #include "base/command_line.h"
 #include "base/process/process.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 20 matching lines @@
   return 1;
 }
 
 class ScopedSleeperProcess {
  public:
    ScopedSleeperProcess() : is_killed_(false) {
   }
 
   ~ScopedSleeperProcess() {
     if (process_.IsValid()) {
-      process_.Terminate(-1);
+      process_.Terminate(-1, false);
       int exit_code = 0;
       EXPECT_TRUE(process_.WaitForExit(&exit_code));
     }
   }
 
   void Launch() {
     ASSERT_FALSE(process_.IsValid());
 
     base::CommandLine cmd_line(base::GetMultiProcessTestChildBaseCommandLine());
     base::LaunchOptions options;
     options.start_hidden = true;
     process_ = base::SpawnMultiProcessTestChild("Sleeper", cmd_line, options);
     ASSERT_TRUE(process_.IsValid());
   }
 
   void Kill(int exit_code, bool wait) {
     ASSERT_TRUE(process_.IsValid());
     ASSERT_FALSE(is_killed_);
-    process_.Terminate(exit_code);
+    process_.Terminate(exit_code, false);
     int seen_exit_code = 0;
     EXPECT_TRUE(process_.WaitForExit(&seen_exit_code));
     EXPECT_EQ(exit_code, seen_exit_code);
     is_killed_ = true;
   }
 
   const base::Process& process() const { return process_; }
 
  private:
   base::Process process_;
@@ skipping 90 matching lines @@
   // Kill the sleeper, and make sure it's exited before we continue.
   ASSERT_NO_FATAL_FAILURE(sleeper.Kill(kExitCode, true));
 
   watcher.WaitForExit();
   EXPECT_EQ(kExitCode, watcher.exit_code());
 
   VerifyWroteExitCode(sleeper.process().Pid(), kExitCode);
 }
 
 }  // namespace browser_watcher