diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
4 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm index ff1a029..94a14fb 100644 --- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm +++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm @@ -31,7 +31,7 @@ CocoaProfileTest::~CocoaProfileTest() { // browser, since it may trigger accesses to the profile upon destruction. browser_.reset(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); // Some services created on the TestingProfile require deletion on the UI // thread. If the scoper in TestingBrowserProcess, owned by ChromeTestSuite, // were to delete the ProfileManager, the UI thread would at that point no @@ -40,14 +40,14 @@ CocoaProfileTest::~CocoaProfileTest() { NULL); // Make sure any pending tasks run before we destroy other threads. - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); // Drop any new tasks for the IO and FILE threads. io_thread_.reset(); file_user_blocking_thread_.reset(); file_thread_.reset(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); } void CocoaProfileTest::SetUp() { diff --git a/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm index c0f3fa0..d6cc7e2 100644 --- a/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm @@ -208,7 +208,7 @@ void ShowImportProgressDialog(uint16 items, while (true) { if ([NSApp runModalSession:session] != NSRunContinuesResponse) break; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } [NSApp endModalSession:session]; } diff --git a/chrome/browser/ui/cocoa/menu_controller_unittest.mm b/chrome/browser/ui/cocoa/menu_controller_unittest.mm index 446a6569..035f92b 100644 --- a/chrome/browser/ui/cocoa/menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/menu_controller_unittest.mm @@ -327,7 +327,7 @@ TEST_F(MenuControllerTest, OpenClose) { EXPECT_FALSE(delegate.did_close_); // Pump the task that notifies the delegate. - message_loop.RunAllPending(); + message_loop.RunUntilIdle(); // Expect that the delegate got notified properly. EXPECT_TRUE(delegate.did_close_); diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm index bc34f54..accce9b 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm @@ -70,7 +70,7 @@ class BalloonControllerTest : public ChromeRenderViewHostTestHarness { virtual void TearDown() { collection_.reset(); browser_.reset(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ChromeRenderViewHostTestHarness::TearDown(); } |