diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 18:04:02 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 18:04:02 +0000 |
| commit | 0307006a55e425b8d5876de52d4266e416f88cda (patch) | |
| tree | 3508cd6533a99d0d4a376e0aaed71eb822476ae1 /chromeos/dbus/shill_manager_client_unittest.cc | |
| parent | ed0e37b591abc315da137f5e76ffe92fb374891a (diff) | |
| download | chromium_src-0307006a55e425b8d5876de52d4266e416f88cda.zip chromium_src-0307006a55e425b8d5876de52d4266e416f88cda.tar.gz chromium_src-0307006a55e425b8d5876de52d4266e416f88cda.tar.bz2 | |
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
Diffstat (limited to 'chromeos/dbus/shill_manager_client_unittest.cc')
| -rw-r--r-- | chromeos/dbus/shill_manager_client_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
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 |