Index: base/process_util_posix.cc |
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc |
index 98c438f7dccc062876693d8d4c94d6c4d21363a6..018296c5628b341310b395f548cb961df35e8df0 100644 |
--- a/base/process_util_posix.cc |
+++ b/base/process_util_posix.cc |
@@ -886,9 +886,9 @@ bool WaitForExitCode(ProcessHandle handle, int* exit_code) { |
} |
bool WaitForExitCodeWithTimeout(ProcessHandle handle, int* exit_code, |
- int64 timeout_milliseconds) { |
+ base::TimeDelta timeout) { |
bool waitpid_success = false; |
- int status = WaitpidWithTimeout(handle, timeout_milliseconds, |
+ int status = WaitpidWithTimeout(handle, timeout.InMilliseconds(), |
&waitpid_success); |
if (status == -1) |
return false; |
@@ -905,12 +905,6 @@ bool WaitForExitCodeWithTimeout(ProcessHandle handle, int* exit_code, |
return false; |
} |
-bool WaitForExitCodeWithTimeout(ProcessHandle handle, int* exit_code, |
- base::TimeDelta timeout) { |
- return WaitForExitCodeWithTimeout( |
- handle, exit_code, timeout.InMilliseconds()); |
-} |
- |
#if defined(OS_MACOSX) |
// Using kqueue on Mac so that we can wait on non-child processes. |
// We can't use kqueues on child processes because we need to reap |
@@ -1003,11 +997,6 @@ static bool WaitForSingleNonChildProcess(ProcessHandle handle, |
} |
#endif // OS_MACOSX |
-bool WaitForSingleProcess(ProcessHandle handle, int64 wait_milliseconds) { |
- return WaitForSingleProcess( |
- handle, base::TimeDelta::FromMilliseconds(wait_milliseconds)); |
-} |
- |
bool WaitForSingleProcess(ProcessHandle handle, base::TimeDelta wait) { |
ProcessHandle parent_pid = GetParentProcessId(handle); |
ProcessHandle our_pid = Process::Current().handle(); |
@@ -1217,15 +1206,14 @@ bool GetAppOutputWithExitCode(const CommandLine& cl, |
} |
bool WaitForProcessesToExit(const FilePath::StringType& executable_name, |
- int64 wait_milliseconds, |
+ base::TimeDelta wait, |
const ProcessFilter* filter) { |
bool result = false; |
// TODO(port): This is inefficient, but works if there are multiple procs. |
// TODO(port): use waitpid to avoid leaving zombies around |
- base::Time end_time = base::Time::Now() + |
- base::TimeDelta::FromMilliseconds(wait_milliseconds); |
+ base::Time end_time = base::Time::Now() + wait; |
do { |
NamedProcessIterator iter(executable_name, filter); |
if (!iter.NextProcessEntry()) { |
@@ -1238,12 +1226,6 @@ bool WaitForProcessesToExit(const FilePath::StringType& executable_name, |
return result; |
} |
-bool WaitForProcessesToExit(const FilePath::StringType& executable_name, |
- base::TimeDelta wait, |
- const ProcessFilter* filter) { |
- return WaitForProcessesToExit(executable_name, wait.InMilliseconds(), filter); |
-} |
- |
bool CleanupProcesses(const FilePath::StringType& executable_name, |
int64 wait_milliseconds, |
int exit_code, |