Chromium Code Reviews| Index: base/process/kill_win.cc |
| diff --git a/base/process/kill_win.cc b/base/process/kill_win.cc |
| index f280c6fa1d8e05351f0d988e990055390a203f29..7daf5f868fb7d6f847789a078d5c7d5a27a049f9 100644 |
| --- a/base/process/kill_win.cc |
| +++ b/base/process/kill_win.cc |
| @@ -189,7 +189,7 @@ bool WaitForExitCode(ProcessHandle handle, int* exit_code) { |
| bool WaitForExitCodeWithTimeout(ProcessHandle handle, |
| int* exit_code, |
| - base::TimeDelta timeout) { |
| + TimeDelta timeout) { |
| if (::WaitForSingleObject( |
| handle, static_cast<DWORD>(timeout.InMilliseconds())) != WAIT_OBJECT_0) |
| return false; |
| @@ -202,7 +202,7 @@ bool WaitForExitCodeWithTimeout(ProcessHandle handle, |
| } |
| bool WaitForProcessesToExit(const FilePath::StringType& executable_name, |
| - base::TimeDelta wait, |
| + TimeDelta wait, |
| const ProcessFilter* filter) { |
| bool result = true; |
| DWORD start_time = GetTickCount(); |
| @@ -224,13 +224,8 @@ bool WaitForProcessesToExit(const FilePath::StringType& executable_name, |
| return result; |
| } |
| -bool WaitForSingleProcess(ProcessHandle handle, base::TimeDelta wait) { |
| - int exit_code; |
| - return WaitForExitCodeWithTimeout(handle, &exit_code, wait) && exit_code == 0; |
|
Lei Zhang
2015/02/18 02:49:45
On Windows, we used to check the exit code, but wi
rvargas (doing something else)
2015/02/18 23:17:58
I don't think it matters. I added EXPECT_EQ(0, exi
|
| -} |
| - |
| bool CleanupProcesses(const FilePath::StringType& executable_name, |
| - base::TimeDelta wait, |
| + TimeDelta wait, |
| int exit_code, |
| const ProcessFilter* filter) { |
| if (WaitForProcessesToExit(executable_name, wait, filter)) |
| @@ -249,9 +244,9 @@ void EnsureProcessTerminated(Process process) { |
| MessageLoop::current()->PostDelayedTask( |
| FROM_HERE, |
| - base::Bind(&TimerExpiredTask::TimedOut, |
| - base::Owned(new TimerExpiredTask(process.Pass()))), |
| - base::TimeDelta::FromMilliseconds(kWaitInterval)); |
| + Bind(&TimerExpiredTask::TimedOut, |
| + Owned(new TimerExpiredTask(process.Pass()))), |
| + TimeDelta::FromMilliseconds(kWaitInterval)); |
| } |
| } // namespace base |