Consistently use int64 for integers holding number of milliseconds.
This applies only to things which use TimeDelta::InMilliseconds, because
it returns int64. Before this patch callers static_casted that to int,
and after this patch they use the returned value as int64.
Review URL: http://codereview.chromium.org/126279
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18626 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 743ace4213ae3ea93355dff8b57ef33287b32220
diff --git a/base/message_loop.cc b/base/message_loop.cc
index e010c73..89e2a2c 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -232,7 +232,7 @@
}
void MessageLoop::PostDelayedTask(
- const tracked_objects::Location& from_here, Task* task, int delay_ms) {
+ const tracked_objects::Location& from_here, Task* task, int64 delay_ms) {
PostTask_Helper(from_here, task, delay_ms, true);
}
@@ -242,13 +242,13 @@
}
void MessageLoop::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here, Task* task, int delay_ms) {
+ const tracked_objects::Location& from_here, Task* task, int64 delay_ms) {
PostTask_Helper(from_here, task, delay_ms, false);
}
// Possibly called on a background thread!
void MessageLoop::PostTask_Helper(
- const tracked_objects::Location& from_here, Task* task, int delay_ms,
+ const tracked_objects::Location& from_here, Task* task, int64 delay_ms,
bool nestable) {
task->SetBirthPlace(from_here);
diff --git a/base/message_loop.h b/base/message_loop.h
index 01f8c92..e3f07bf 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -103,13 +103,13 @@
const tracked_objects::Location& from_here, Task* task);
void PostDelayedTask(
- const tracked_objects::Location& from_here, Task* task, int delay_ms);
+ const tracked_objects::Location& from_here, Task* task, int64 delay_ms);
void PostNonNestableTask(
const tracked_objects::Location& from_here, Task* task);
void PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here, Task* task, int delay_ms);
+ const tracked_objects::Location& from_here, Task* task, int64 delay_ms);
// A variant on PostTask that deletes the given object. This is useful
// if the object needs to live until the next run of the MessageLoop (for
@@ -331,7 +331,7 @@
// Post a task to our incomming queue.
void PostTask_Helper(const tracked_objects::Location& from_here, Task* task,
- int delay_ms, bool nestable);
+ int64 delay_ms, bool nestable);
// base::MessagePump::Delegate methods:
virtual bool DoWork();
diff --git a/base/process_util.h b/base/process_util.h
index 41d0470..706cf5f 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -207,17 +207,17 @@
// Returns after all processes have exited or wait_milliseconds have expired.
// Returns true if all the processes exited, false otherwise.
bool WaitForProcessesToExit(const std::wstring& executable_name,
- int wait_milliseconds,
+ int64 wait_milliseconds,
const ProcessFilter* filter);
// Wait for a single process to exit. Return true if it exited cleanly within
// the given time limit.
bool WaitForSingleProcess(ProcessHandle handle,
- int wait_milliseconds);
+ int64 wait_milliseconds);
// Returns true when |wait_milliseconds| have elapsed and the process
// is still running.
-bool CrashAwareSleep(ProcessHandle handle, int wait_milliseconds);
+bool CrashAwareSleep(ProcessHandle handle, int64 wait_milliseconds);
// Waits a certain amount of time (can be 0) for all the processes with a given
// executable name to exit, then kills off any of them that are still around.
@@ -226,7 +226,7 @@
// any processes needed to be killed, true if they all exited cleanly within
// the wait_milliseconds delay.
bool CleanupProcesses(const std::wstring& executable_name,
- int wait_milliseconds,
+ int64 wait_milliseconds,
int exit_code,
const ProcessFilter* filter);
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index 840339f..212638f 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -284,7 +284,7 @@
namespace {
-int WaitpidWithTimeout(ProcessHandle handle, int wait_milliseconds,
+int WaitpidWithTimeout(ProcessHandle handle, int64 wait_milliseconds,
bool* success) {
// This POSIX version of this function only guarantees that we wait no less
// than |wait_milliseconds| for the proces to exit. The child process may
@@ -339,7 +339,7 @@
} // namespace
-bool WaitForSingleProcess(ProcessHandle handle, int wait_milliseconds) {
+bool WaitForSingleProcess(ProcessHandle handle, int64 wait_milliseconds) {
bool waitpid_success;
int status;
if (wait_milliseconds == base::kNoTimeout)
@@ -354,7 +354,7 @@
}
}
-bool CrashAwareSleep(ProcessHandle handle, int wait_milliseconds) {
+bool CrashAwareSleep(ProcessHandle handle, int64 wait_milliseconds) {
bool waitpid_success;
int status = WaitpidWithTimeout(handle, wait_milliseconds, &waitpid_success);
if (status != -1) {
@@ -503,7 +503,7 @@
}
bool WaitForProcessesToExit(const std::wstring& executable_name,
- int wait_milliseconds,
+ int64 wait_milliseconds,
const ProcessFilter* filter) {
bool result = false;
@@ -525,12 +525,12 @@
}
bool CleanupProcesses(const std::wstring& executable_name,
- int wait_milliseconds,
+ int64 wait_milliseconds,
int exit_code,
const ProcessFilter* filter) {
bool exited_cleanly =
WaitForProcessesToExit(executable_name, wait_milliseconds,
- filter);
+ filter);
if (!exited_cleanly)
KillProcesses(executable_name, exit_code, filter);
return exited_cleanly;