Chromium Code Reviews| Index: chrome/test/base/chrome_process_util.cc |
| diff --git a/chrome/test/base/chrome_process_util.cc b/chrome/test/base/chrome_process_util.cc |
| index fe6d0c6d48cb0237a0f5669a296178ea95f751d6..282cab0edcce6c8426a34ed9669647bce7722bd6 100644 |
| --- a/chrome/test/base/chrome_process_util.cc |
| +++ b/chrome/test/base/chrome_process_util.cc |
| @@ -10,6 +10,7 @@ |
| #include "base/command_line.h" |
| #include "base/process/kill.h" |
| +#include "base/process/process.h" |
| #include "base/process/process_iterator.h" |
| #include "base/time/time.h" |
| #include "chrome/common/chrome_constants.h" |
| @@ -49,15 +50,12 @@ std::vector<base::FilePath::StringType> GetRunningHelperExecutableNames() { |
| void TerminateAllChromeProcesses(const ChromeProcessList& process_pids) { |
| ChromeProcessList::const_iterator it; |
| for (it = process_pids.begin(); it != process_pids.end(); ++it) { |
| - base::ProcessHandle handle; |
| - if (!base::OpenProcessHandle(*it, &handle)) { |
| + base::Process process = base::Process::Open(*it); |
| + if (process.IsValid()) { |
| // Ignore processes for which we can't open the handle. We don't |
| // guarantee that all processes will terminate, only try to do so. |
| - continue; |
| + base::KillProcess(process.Handle(), content::RESULT_CODE_KILLED, true); |
|
sky
2015/02/04 17:14:52
Seems like it would be nice to do process.Kill(...
rvargas (doing something else)
2015/02/04 18:19:51
Yes, that's part of the plan (remove the utility f
|
| } |
| - |
| - base::KillProcess(handle, content::RESULT_CODE_KILLED, true); |
| - base::CloseProcessHandle(handle); |
| } |
| } |