summaryrefslogtreecommitdiffstats
path: root/base/message_loop_unittest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 01:02:55 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 01:02:55 +0000
commit1f18bfe815cb85d18e42fdc80692828be710ad31 (patch)
tree6d9348d668a034238f327f28871256c5a5c88a33 /base/message_loop_unittest.cc
parent68f29a9c7310cf90808f8b6791a2c4c0217e8ab6 (diff)
downloadchromium_src-1f18bfe815cb85d18e42fdc80692828be710ad31.zip
chromium_src-1f18bfe815cb85d18e42fdc80692828be710ad31.tar.gz
chromium_src-1f18bfe815cb85d18e42fdc80692828be710ad31.tar.bz2
base: Update calls froms RunAllPending() to RunUntilIdle().
BUG=131220 TEST=base_unittests R=willchan@chromium.org Review URL: https://chromiumcodereview.appspot.com/11339020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop_unittest.cc')
-rw-r--r--base/message_loop_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc
index 01fb1b3..fcfd9c8 100644
--- a/base/message_loop_unittest.cc
+++ b/base/message_loop_unittest.cc
@@ -328,7 +328,7 @@ void RunTest_PostDelayedTask_SharedTimer(
// and then run all pending to force them both to have run. This is just
// encouraging flakiness if there is any.
PlatformThread::Sleep(TimeDelta::FromMilliseconds(100));
- loop.RunAllPending();
+ loop.RunUntilIdle();
EXPECT_TRUE(run_time1.is_null());
EXPECT_FALSE(run_time2.is_null());
@@ -384,7 +384,7 @@ void RunTest_PostDelayedTask_SharedTimer_SubPump() {
// and then run all pending to force them both to have run. This is just
// encouraging flakiness if there is any.
PlatformThread::Sleep(TimeDelta::FromMilliseconds(100));
- loop.RunAllPending();
+ loop.RunUntilIdle();
EXPECT_TRUE(run_time.is_null());
}
@@ -994,7 +994,7 @@ void FuncThatPumps(TaskList* order, int cookie) {
order->RecordStart(PUMPS, cookie);
{
MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
}
order->RecordEnd(PUMPS, cookie);
}