diff options
author | tedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 23:22:48 +0000 |
---|---|---|
committer | tedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 23:22:48 +0000 |
commit | 5387fdd2ef0444e5a6c369936df5ec4b84e97e65 (patch) | |
tree | 56dc9e9f3ea52cbd2e90999fe8436efa886ed826 /base | |
parent | 80b083462321404124ea12407b39708aae81c795 (diff) | |
download | chromium_src-5387fdd2ef0444e5a6c369936df5ec4b84e97e65.zip chromium_src-5387fdd2ef0444e5a6c369936df5ec4b84e97e65.tar.gz chromium_src-5387fdd2ef0444e5a6c369936df5ec4b84e97e65.tar.bz2 |
Fix CleanupProcesses() interface to use TimeDelta.
BUG=108171
Review URL: https://chromiumcodereview.appspot.com/10821062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/process_util.h | 2 | ||||
-rw-r--r-- | base/process_util_posix.cc | 8 | ||||
-rw-r--r-- | base/process_util_win.cc | 7 |
3 files changed, 5 insertions, 12 deletions
diff --git a/base/process_util.h b/base/process_util.h index 6745d4b..04c1d88d 100644 --- a/base/process_util.h +++ b/base/process_util.h @@ -532,7 +532,7 @@ BASE_EXPORT bool WaitForSingleProcess(ProcessHandle handle, // any processes needed to be killed, true if they all exited cleanly within // the wait_milliseconds delay. BASE_EXPORT bool CleanupProcesses(const FilePath::StringType& executable_name, - int64 wait_milliseconds, + base::TimeDelta wait, int exit_code, const ProcessFilter* filter); diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index e148f11..a6e816a 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -1227,14 +1227,10 @@ bool WaitForProcessesToExit(const FilePath::StringType& executable_name, } bool CleanupProcesses(const FilePath::StringType& executable_name, - int64 wait_milliseconds, + base::TimeDelta wait, int exit_code, const ProcessFilter* filter) { - bool exited_cleanly = - WaitForProcessesToExit( - executable_name, - base::TimeDelta::FromMilliseconds(wait_milliseconds), - filter); + bool exited_cleanly = WaitForProcessesToExit(executable_name, wait, filter); if (!exited_cleanly) KillProcesses(executable_name, exit_code, filter); return exited_cleanly; diff --git a/base/process_util_win.cc b/base/process_util_win.cc index 313b187..c5ba392 100644 --- a/base/process_util_win.cc +++ b/base/process_util_win.cc @@ -619,13 +619,10 @@ bool WaitForSingleProcess(ProcessHandle handle, base::TimeDelta wait) { } bool CleanupProcesses(const FilePath::StringType& executable_name, - int64 wait_milliseconds, + base::TimeDelta wait, int exit_code, const ProcessFilter* filter) { - bool exited_cleanly = WaitForProcessesToExit( - executable_name, - base::TimeDelta::FromMilliseconds(wait_milliseconds), - filter); + bool exited_cleanly = WaitForProcessesToExit(executable_name, wait, filter); if (!exited_cleanly) KillProcesses(executable_name, exit_code, filter); return exited_cleanly; |