summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-23 19:22:33 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-23 19:22:33 +0000
commit4615f198872e6acfb8fdc40e26525f9e2ff98bbe (patch)
tree049bfd73165991b38299cc3dac36cd2962f373c4
parent72deacd254d62a306a79ee39f4022b567c679917 (diff)
downloadchromium_src-4615f198872e6acfb8fdc40e26525f9e2ff98bbe.zip
chromium_src-4615f198872e6acfb8fdc40e26525f9e2ff98bbe.tar.gz
chromium_src-4615f198872e6acfb8fdc40e26525f9e2ff98bbe.tar.bz2
fix oops
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2510 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/message_loop_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc
index d899b96..62f2ae9 100644
--- a/base/message_loop_unittest.cc
+++ b/base/message_loop_unittest.cc
@@ -312,8 +312,8 @@ void RunTest_PostDelayedTask_SharedTimer(MessageLoop::Type message_loop_type) {
EXPECT_EQ(0, num_tasks);
// Ensure that we ran in far less time than the slower timer.
- TimeDelta run_time = Time::Now() - start_time;
- EXPECT_GT(5000, run_time.InMilliseconds());
+ TimeDelta total_time = Time::Now() - start_time;
+ EXPECT_GT(5000, total_time.InMilliseconds());
// In case both timers somehow run at nearly the same time, sleep a little
// and then run all pending to force them both to have run. This is just
@@ -376,8 +376,8 @@ void RunTest_PostDelayedTask_SharedTimer_SubPump() {
EXPECT_EQ(1, num_tasks);
// Ensure that we ran in far less time than the slower timer.
- TimeDelta run_time = Time::Now() - start_time;
- EXPECT_GT(5000, run_time.InMilliseconds());
+ TimeDelta total_time = Time::Now() - start_time;
+ EXPECT_GT(5000, total_time.InMilliseconds());
// In case both timers somehow run at nearly the same time, sleep a little
// and then run all pending to force them both to have run. This is just