summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-10 19:07:29 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-10 19:07:29 +0000
commitf319aceaf8795d10825d748162bf744c0f15db8c (patch)
tree62b518c6939cafdc0c9708b298f488ea0ab4e4f8 /content/test
parent7b73935e6e8f873ca3e54d4e2a81fe7a3f4b5ba3 (diff)
downloadchromium_src-f319aceaf8795d10825d748162bf744c0f15db8c.zip
chromium_src-f319aceaf8795d10825d748162bf744c0f15db8c.tar.gz
chromium_src-f319aceaf8795d10825d748162bf744c0f15db8c.tar.bz2
content: Update calls froms RunAllPending() to RunUntilIdle().
BUG=131220 TEST=content_unittests TBR=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/11365186 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/content_browser_test.cc2
-rw-r--r--content/test/webrtc_audio_device_test.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc
index 0e6841f..a9eb055 100644
--- a/content/test/content_browser_test.cc
+++ b/content/test/content_browser_test.cc
@@ -109,7 +109,7 @@ void ContentBrowserTest::RunTestOnMainThreadLoop() {
#endif
// Pump startup related events.
- MessageLoopForUI::current()->RunAllPending();
+ MessageLoopForUI::current()->RunUntilIdle();
#if defined(OS_MACOSX)
pool.Recycle();
diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
index 6eb6cec..ba01e1a 100644
--- a/content/test/webrtc_audio_device_test.cc
+++ b/content/test/webrtc_audio_device_test.cc
@@ -154,7 +154,7 @@ void WebRTCAudioDeviceTest::TearDown() {
SetAudioUtilCallback(NULL);
// Run any pending cleanup tasks that may have been posted to the main thread.
- ChildProcess::current()->main_thread()->message_loop()->RunAllPending();
+ ChildProcess::current()->main_thread()->message_loop()->RunUntilIdle();
// Kick of the cleanup process by closing the channel. This queues up
// OnStreamClosed calls to be executed on the audio thread.