chromeos: Update calls froms RunAllPending() to RunUntilIdle().

BUG=131220
TEST=chromeos_unittests
TBR=oshima@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11275231

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166930 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 69 insertions, 69 deletions

diff --git a/chromeos/dbus/gsm_sms_client_unittest.cc b/chromeos/dbus/gsm_sms_client_unittest.cc
index 49aba66..960a916 100644
--- a/chromeos/dbus/gsm_sms_client_unittest.cc
+++ b/chromeos/dbus/gsm_sms_client_unittest.cc
@@ -201,7 +201,7 @@ TEST_F(GsmSMSClientTest, SmsReceived) {
                                             base::Unretained(&handler)));
 
   // Run the message loop to run the signal connection result callback.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 
   // Send signal.
   dbus::Signal signal(modemmanager::kModemManagerSMSInterface,
@@ -234,7 +234,7 @@ TEST_F(GsmSMSClientTest, Delete) {
                              base::Unretained(&callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(GsmSMSClientTest, Get) {
@@ -274,7 +274,7 @@ TEST_F(GsmSMSClientTest, Get) {
                base::Bind(&MockGetCallback::Run, base::Unretained(&callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(GsmSMSClientTest, List) {
@@ -318,7 +318,7 @@ TEST_F(GsmSMSClientTest, List) {
                            base::Unretained(&callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos
diff --git a/chromeos/dbus/ibus/ibus_client_unittest.cc b/chromeos/dbus/ibus/ibus_client_unittest.cc
index 050b15a..b8a01e6 100644
--- a/chromeos/dbus/ibus/ibus_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_client_unittest.cc
@@ -190,7 +190,7 @@ TEST_F(IBusClientTest, CreateInputContextTest) {
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, CreateInputContext_NullResponseFail) {
@@ -214,7 +214,7 @@ TEST_F(IBusClientTest, CreateInputContext_NullResponseFail) {
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, CreateInputContext_InvalidResponseFail) {
@@ -239,7 +239,7 @@ TEST_F(IBusClientTest, CreateInputContext_InvalidResponseFail) {
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, CreateInputContext_MethodCallFail) {
@@ -263,7 +263,7 @@ TEST_F(IBusClientTest, CreateInputContext_MethodCallFail) {
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, SetGlobalEngineTest) {
@@ -287,7 +287,7 @@ TEST_F(IBusClientTest, SetGlobalEngineTest) {
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, SetGlobalEngineTest_InvalidResponse) {
@@ -310,7 +310,7 @@ TEST_F(IBusClientTest, SetGlobalEngineTest_InvalidResponse) {
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, SetGlobalEngineTest_MethodCallFail) {
@@ -334,7 +334,7 @@ TEST_F(IBusClientTest, SetGlobalEngineTest_MethodCallFail) {
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, ExitTest) {
@@ -358,7 +358,7 @@ TEST_F(IBusClientTest, ExitTest) {
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, ExitTest_InvalidResponse) {
@@ -381,7 +381,7 @@ TEST_F(IBusClientTest, ExitTest_InvalidResponse) {
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, ExitTest_MethodCallFail) {
@@ -405,7 +405,7 @@ TEST_F(IBusClientTest, ExitTest_MethodCallFail) {
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos
diff --git a/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc b/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc
index 382b55c..205422d 100644
--- a/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc
@@ -154,7 +154,7 @@ TEST_F(IBusEngineFactoryServiceTest, SyncCreateEngineTest) {
       kSampleEngine,
       base::Bind(&SynchronousCreateEngineHandler::Run,
                  base::Unretained(&handler)));
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 
   // Invoke method call.
   dbus::MethodCall method_call(
@@ -177,7 +177,7 @@ TEST_F(IBusEngineFactoryServiceTest, SyncCreateEngineTest) {
       &method_call,
       base::Bind(&MockCreateEngineResponseSender::CheckCreateEngineResponse,
                  base::Unretained(&response_sender)));
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusEngineFactoryServiceTest, AsyncCreateEngineTest) {
@@ -196,7 +196,7 @@ TEST_F(IBusEngineFactoryServiceTest, AsyncCreateEngineTest) {
       kSampleEngine,
       base::Bind(&AsynchronousCreateEngineHandler::Run,
                  base::Unretained(&handler)));
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 
   // Invoke method call.
   dbus::MethodCall method_call(
@@ -219,7 +219,7 @@ TEST_F(IBusEngineFactoryServiceTest, AsyncCreateEngineTest) {
       &method_call,
       base::Bind(&MockCreateEngineResponseSender::CheckCreateEngineResponse,
                  base::Unretained(&response_sender)));
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos
diff --git a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
index 16df662..a88bc83 100644
--- a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
@@ -910,7 +910,7 @@ TEST_F(IBusEngineServiceTest, DelayProcessKeyEventTest) {
                  base::Unretained(&response_sender)));
 
   // Call KeyEventDone callback.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 
   // Call exported function without engine.
   service_->UnsetEngine();
diff --git a/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc b/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
index 8ae0602..cef1ee2 100644
--- a/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
@@ -366,7 +366,7 @@ TEST_F(IBusInputContextClientTest, CommitTextHandler) {
   EXPECT_CALL(handler, Run(IBusTextEq(&ibus_text)));
   client_->SetCommitTextHandler(base::Bind(&MockCommitTextHandler::Run,
                                            base::Unretained(&handler)));
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 
   // Emit signal.
   dbus::Signal signal(ibus::input_context::kServiceInterface,
@@ -389,7 +389,7 @@ TEST_F(IBusInputContextClientTest, ForwardKeyEventHandlerTest) {
   client_->SetForwardKeyEventHandler(
       base::Bind(&MockForwardKeyEventHandler::Run,
                  base::Unretained(&handler)));
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 
   // Emit signal.
   dbus::Signal signal(ibus::input_context::kServiceInterface,
@@ -417,7 +417,7 @@ TEST_F(IBusInputContextClientTest, HidePreeditTextHandlerTest) {
   client_->SetHidePreeditTextHandler(
       base::Bind(&MockHidePreeditTextHandler::Run,
                  base::Unretained(&handler)));
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 
   // Emit signal.
   dbus::Signal signal(ibus::input_context::kServiceInterface,
@@ -441,7 +441,7 @@ TEST_F(IBusInputContextClientTest, ShowPreeditTextHandlerTest) {
   client_->SetShowPreeditTextHandler(
       base::Bind(&MockShowPreeditTextHandler::Run,
                  base::Unretained(&handler)));
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 
   // Emit signal.
   dbus::Signal signal(ibus::input_context::kServiceInterface,
@@ -471,7 +471,7 @@ TEST_F(IBusInputContextClientTest, UpdatePreeditTextHandlerTest) {
   client_->SetUpdatePreeditTextHandler(
       base::Bind(&MockUpdatePreeditTextHandler::Run,
                  base::Unretained(&handler)));
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 
   // Emit signal.
   dbus::Signal signal(ibus::input_context::kServiceInterface,
@@ -503,7 +503,7 @@ TEST_F(IBusInputContextClientTest, FocusInTest) {
   // Call FocusIn.
   client_->FocusIn();
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, FocusOutTest) {
@@ -517,7 +517,7 @@ TEST_F(IBusInputContextClientTest, FocusOutTest) {
   // Call FocusOut.
   client_->FocusOut();
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, ResetTest) {
@@ -531,7 +531,7 @@ TEST_F(IBusInputContextClientTest, ResetTest) {
   // Call Reset.
   client_->Reset();
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, SetCapabilitiesTest) {
@@ -545,7 +545,7 @@ TEST_F(IBusInputContextClientTest, SetCapabilitiesTest) {
   // Call SetCapabilities.
   client_->SetCapabilities(kCapabilities);
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, SetCursorLocationTest) {
@@ -560,7 +560,7 @@ TEST_F(IBusInputContextClientTest, SetCursorLocationTest) {
   // Call SetCursorLocation.
   client_->SetCursorLocation(kCursorX, kCursorY, kCursorWidth, kCursorHeight);
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, OnProcessKeyEvent) {
@@ -587,7 +587,7 @@ TEST_F(IBusInputContextClientTest, OnProcessKeyEvent) {
                            base::Bind(&MockProcessKeyEventErrorHandler::Run,
                                       base::Unretained(&error_callback)));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, OnProcessKeyEventFail) {
@@ -615,7 +615,7 @@ TEST_F(IBusInputContextClientTest, OnProcessKeyEventFail) {
                            base::Bind(&MockProcessKeyEventErrorHandler::Run,
                                       base::Unretained(&error_callback)));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, SetSurroundingTextTest) {
@@ -630,7 +630,7 @@ TEST_F(IBusInputContextClientTest, SetSurroundingTextTest) {
   // Call SetCursorLocation.
   client_->SetSurroundingText(kSurroundingText, kCursorPos, kAnchorPos);
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, PropertyActivateTest) {
@@ -645,6 +645,6 @@ TEST_F(IBusInputContextClientTest, PropertyActivateTest) {
   // Call SetCursorLocation.
   client_->PropertyActivate(kPropertyKey, kPropertyState);
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 }  // namespace chromeos
diff --git a/chromeos/dbus/modem_messaging_client_unittest.cc b/chromeos/dbus/modem_messaging_client_unittest.cc
index 8f5a026..f6cf879 100644
--- a/chromeos/dbus/modem_messaging_client_unittest.cc
+++ b/chromeos/dbus/modem_messaging_client_unittest.cc
@@ -179,7 +179,7 @@ TEST_F(ModemMessagingClientTest, SmsReceived) {
                                             base::Unretained(&handler)));
 
   // Run the message loop to run the signal connection result callback.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 
   // Send signal.
   dbus::Signal signal(modemmanager::kModemManager1MessagingInterface,
@@ -212,7 +212,7 @@ TEST_F(ModemMessagingClientTest, Delete) {
                              base::Unretained(&callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ModemMessagingClientTest, List) {
@@ -242,7 +242,7 @@ TEST_F(ModemMessagingClientTest, List) {
                            base::Unretained(&callback)));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos
diff --git a/chromeos/dbus/shill_device_client_unittest.cc b/chromeos/dbus/shill_device_client_unittest.cc
index 8f504f5..1bd5c52 100644
--- a/chromeos/dbus/shill_device_client_unittest.cc
+++ b/chromeos/dbus/shill_device_client_unittest.cc
@@ -62,7 +62,7 @@ class ShillDeviceClientTest : public ShillClientUnittestBase {
     client_.reset(ShillDeviceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
                                                mock_bus_));
     // Run the message loop to run the signal connection result callback.
-    message_loop_.RunAllPending();
+    message_loop_.RunUntilIdle();
   }
 
   virtual void TearDown() {
@@ -137,7 +137,7 @@ TEST_F(ShillDeviceClientTest, GetProperties) {
   client_->GetProperties(dbus::ObjectPath(kExampleDevicePath),
                          base::Bind(&ExpectDictionaryValueResult, &value));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, CallGetPropertiesAndBlock) {
@@ -180,7 +180,7 @@ TEST_F(ShillDeviceClientTest, ProposeScan) {
   client_->ProposeScan(dbus::ObjectPath(kExampleDevicePath),
                        base::Bind(&ExpectNoResultValue));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, SetProperty) {
@@ -207,7 +207,7 @@ TEST_F(ShillDeviceClientTest, SetProperty) {
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, ClearProperty) {
@@ -224,7 +224,7 @@ TEST_F(ShillDeviceClientTest, ClearProperty) {
                          flimflam::kCellularAllowRoamingProperty,
                          base::Bind(&ExpectNoResultValue));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, AddIPConfig) {
@@ -243,7 +243,7 @@ TEST_F(ShillDeviceClientTest, AddIPConfig) {
                        flimflam::kTypeDHCP,
                        base::Bind(&ExpectObjectPathResult, expected_result));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, CallAddIPConfigAndBlock) {
@@ -286,7 +286,7 @@ TEST_F(ShillDeviceClientTest, RequirePin) {
                       mock_closure.GetCallback(),
                       mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, EnterPin) {
@@ -310,7 +310,7 @@ TEST_F(ShillDeviceClientTest, EnterPin) {
                     mock_closure.GetCallback(),
                     mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, UnblockPin) {
@@ -335,7 +335,7 @@ TEST_F(ShillDeviceClientTest, UnblockPin) {
                       mock_closure.GetCallback(),
                       mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, ChangePin) {
@@ -362,7 +362,7 @@ TEST_F(ShillDeviceClientTest, ChangePin) {
                      mock_closure.GetCallback(),
                      mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, Register) {
@@ -385,7 +385,7 @@ TEST_F(ShillDeviceClientTest, Register) {
                     mock_closure.GetCallback(),
                     mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, SetCarrier) {
@@ -406,7 +406,7 @@ TEST_F(ShillDeviceClientTest, SetCarrier) {
                     mock_closure.GetCallback(),
                     mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos
diff --git a/chromeos/dbus/shill_ipconfig_client_unittest.cc b/chromeos/dbus/shill_ipconfig_client_unittest.cc
index a89a450..e2bd7c3 100644
--- a/chromeos/dbus/shill_ipconfig_client_unittest.cc
+++ b/chromeos/dbus/shill_ipconfig_client_unittest.cc
@@ -36,7 +36,7 @@ class ShillIPConfigClientTest : public ShillClientUnittestBase {
     client_.reset(ShillIPConfigClient::Create(
         REAL_DBUS_CLIENT_IMPLEMENTATION, mock_bus_));
     // Run the message loop to run the signal connection result callback.
-    message_loop_.RunAllPending();
+    message_loop_.RunUntilIdle();
   }
 
   virtual void TearDown() {
@@ -117,7 +117,7 @@ TEST_F(ShillIPConfigClientTest, GetProperties) {
   client_->GetProperties(dbus::ObjectPath(kExampleIPConfigPath),
                          base::Bind(&ExpectDictionaryValueResult, &value));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillIPConfigClientTest, CallGetPropertiesAndBlock) {
@@ -180,7 +180,7 @@ TEST_F(ShillIPConfigClientTest, SetProperty) {
                        value,
                        base::Bind(&ExpectNoResultValue));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillIPConfigClientTest, ClearProperty) {
@@ -197,7 +197,7 @@ TEST_F(ShillIPConfigClientTest, ClearProperty) {
                        flimflam::kAddressProperty,
                        base::Bind(&ExpectNoResultValue));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillIPConfigClientTest, Remove) {
@@ -213,7 +213,7 @@ TEST_F(ShillIPConfigClientTest, Remove) {
                   base::Bind(&ExpectNoResultValue));
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillIPConfigClientTest, CallRemoveAndBlock) {
diff --git a/chromeos/dbus/shill_manager_client_unittest.cc b/chromeos/dbus/shill_manager_client_unittest.cc
index b80d8d9..73e4567 100644
--- a/chromeos/dbus/shill_manager_client_unittest.cc
+++ b/chromeos/dbus/shill_manager_client_unittest.cc
@@ -113,7 +113,7 @@ class ShillManagerClientTest : public ShillClientUnittestBase {
     client_.reset(ShillManagerClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
                                                 mock_bus_));
     // Run the message loop to run the signal connection result callback.
-    message_loop_.RunAllPending();
+    message_loop_.RunUntilIdle();
   }
 
   virtual void TearDown() {
@@ -180,7 +180,7 @@ TEST_F(ShillManagerClientTest, GetProperties) {
   client_->GetProperties(base::Bind(&ExpectDictionaryValueResult,
                                     &value));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, CallGetPropertiesAndBlock) {
@@ -231,7 +231,7 @@ TEST_F(ShillManagerClientTest, SetProperty) {
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, RequestScan) {
@@ -251,7 +251,7 @@ TEST_F(ShillManagerClientTest, RequestScan) {
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, EnableTechnology) {
@@ -271,7 +271,7 @@ TEST_F(ShillManagerClientTest, EnableTechnology) {
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, DisableTechnology) {
@@ -291,7 +291,7 @@ TEST_F(ShillManagerClientTest, DisableTechnology) {
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, ConfigureService) {
@@ -313,7 +313,7 @@ TEST_F(ShillManagerClientTest, ConfigureService) {
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, GetService) {
@@ -337,7 +337,7 @@ TEST_F(ShillManagerClientTest, GetService) {
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos
diff --git a/chromeos/dbus/shill_network_client_unittest.cc b/chromeos/dbus/shill_network_client_unittest.cc
index e300332..7effd88 100644
--- a/chromeos/dbus/shill_network_client_unittest.cc
+++ b/chromeos/dbus/shill_network_client_unittest.cc
@@ -36,7 +36,7 @@ class ShillNetworkClientTest : public ShillClientUnittestBase {
     client_.reset(ShillNetworkClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
                                                 mock_bus_));
     // Run the message loop to run the signal connection result callback.
-    message_loop_.RunAllPending();
+    message_loop_.RunUntilIdle();
   }
 
   virtual void TearDown() {
@@ -145,7 +145,7 @@ TEST_F(ShillNetworkClientTest, GetProperties) {
   client_->GetProperties(dbus::ObjectPath(kExampleNetworkPath),
                          base::Bind(&ExpectDictionaryValueResult, &value));
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillNetworkClientTest, CallGetPropertiesAndBlock) {
diff --git a/chromeos/dbus/shill_profile_client_unittest.cc b/chromeos/dbus/shill_profile_client_unittest.cc
index 47d6cc0..fa02ef9 100644
--- a/chromeos/dbus/shill_profile_client_unittest.cc
+++ b/chromeos/dbus/shill_profile_client_unittest.cc
@@ -44,7 +44,7 @@ class ShillProfileClientTest : public ShillClientUnittestBase {
     client_.reset(ShillProfileClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
                                                 mock_bus_));
     // Run the message loop to run the signal connection result callback.
-    message_loop_.RunAllPending();
+    message_loop_.RunUntilIdle();
   }
 
   virtual void TearDown() {
@@ -124,7 +124,7 @@ TEST_F(ShillProfileClientTest, GetProperties) {
   EXPECT_CALL(error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillProfileClientTest, GetEntry) {
@@ -158,7 +158,7 @@ TEST_F(ShillProfileClientTest, GetEntry) {
                     error_callback.GetCallback());
   EXPECT_CALL(error_callback, Run(_, _)).Times(0);
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 TEST_F(ShillProfileClientTest, DeleteEntry) {
@@ -184,7 +184,7 @@ TEST_F(ShillProfileClientTest, DeleteEntry) {
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos
diff --git a/chromeos/network/network_sms_handler_unittest.cc b/chromeos/network/network_sms_handler_unittest.cc
index a821ce8..360755d 100644
--- a/chromeos/network/network_sms_handler_unittest.cc
+++ b/chromeos/network/network_sms_handler_unittest.cc
@@ -90,7 +90,7 @@ TEST_F(NetworkSmsHandlerTest, SmsHandlerDbusStub) {
   scoped_ptr<TestObserver> test_observer(new TestObserver());
   sms_handler->AddObserver(test_observer.get());
   sms_handler->Init();
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
   EXPECT_EQ(test_observer->message_count(), 0);
 
   // Test that no messages have been received yet
@@ -104,7 +104,7 @@ TEST_F(NetworkSmsHandlerTest, SmsHandlerDbusStub) {
   // Test for messages delivered by signals.
   test_observer->ClearMessages();
   sms_handler->RequestUpdate();
-  message_loop_.RunAllPending();
+  message_loop_.RunUntilIdle();
   EXPECT_GE(test_observer->message_count(), 1);
   EXPECT_NE(messages.find(kMessage1), messages.end());
 }