Remove calls to deprecated MessageLoop methods in chromeos.

chromeos/dbus/shill_device_client_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/run_loop.h"
 #include "base/values.h"
 #include "chromeos/dbus/shill_client_unittest_base.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/values_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using testing::_;
@@ skipping 39 matching lines @@
       : ShillClientUnittestBase(shill::kFlimflamDeviceInterface,
                                    dbus::ObjectPath(kExampleDevicePath)) {
   }
 
   void SetUp() override {
     ShillClientUnittestBase::SetUp();
     // Create a client with the mock bus.
     client_.reset(ShillDeviceClient::Create());
     client_->Init(mock_bus_.get());
     // Run the message loop to run the signal connection result callback.
-    message_loop_.RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   void TearDown() override { ShillClientUnittestBase::TearDown(); }
 
  protected:
   std::unique_ptr<ShillDeviceClient> client_;
 };
 
 TEST_F(ShillDeviceClientTest, PropertyChanged) {
   const bool kValue = true;
@@ skipping 50 matching lines @@
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(shill::kCellularAllowRoamingProperty,
                                 new base::FundamentalValue(kValue));
   PrepareForMethodCall(shill::kGetPropertiesFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   client_->GetProperties(dbus::ObjectPath(kExampleDevicePath),
                          base::Bind(&ExpectDictionaryValueResult, &value));
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, ProposeScan) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   PrepareForMethodCall(shill::kProposeScanFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   client_->ProposeScan(dbus::ObjectPath(kExampleDevicePath),
                        base::Bind(&ExpectNoResultValue));
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, SetProperty) {
   const bool kValue = true;
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   const base::FundamentalValue value(kValue);
   PrepareForMethodCall(shill::kSetPropertyFunction,
                        base::Bind(&ExpectStringAndValueArguments,
                                   shill::kCellularAllowRoamingProperty,
                                   &value),
                        response.get());
   // Call method.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   client_->SetProperty(dbus::ObjectPath(kExampleDevicePath),
                        shill::kCellularAllowRoamingProperty,
                        value,
                        mock_closure.GetCallback(),
                        mock_error_callback.GetCallback());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, ClearProperty) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   PrepareForMethodCall(shill::kClearPropertyFunction,
                        base::Bind(&ExpectStringArgument,
                                   shill::kCellularAllowRoamingProperty),
                        response.get());
   // Call method.
   client_->ClearProperty(dbus::ObjectPath(kExampleDevicePath),
                          shill::kCellularAllowRoamingProperty,
                          base::Bind(&ExpectNoResultValue));
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, AddIPConfig) {
   const dbus::ObjectPath expected_result("/result/path");
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendObjectPath(expected_result);
 
   // Set expectations.
   PrepareForMethodCall(shill::kAddIPConfigFunction,
                        base::Bind(&ExpectStringArgument, shill::kTypeDHCP),
                        response.get());
   // Call method.
   client_->AddIPConfig(dbus::ObjectPath(kExampleDevicePath),
                        shill::kTypeDHCP,
                        base::Bind(&ExpectObjectPathResult, expected_result));
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, RequirePin) {
   const char kPin[] = "123456";
   const bool kRequired = true;
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(shill::kRequirePinFunction,
                        base::Bind(&ExpectStringAndBoolArguments,
                                   kPin,
                                   kRequired),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
   // Call method.
   client_->RequirePin(dbus::ObjectPath(kExampleDevicePath),
                       kPin,
                       kRequired,
                       mock_closure.GetCallback(),
                       mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, EnterPin) {
   const char kPin[] = "123456";
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(shill::kEnterPinFunction,
                        base::Bind(&ExpectStringArgument,
                                   kPin),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Call method.
   client_->EnterPin(dbus::ObjectPath(kExampleDevicePath),
                     kPin,
                     mock_closure.GetCallback(),
                     mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, UnblockPin) {
   const char kPuk[] = "987654";
   const char kPin[] = "123456";
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(shill::kUnblockPinFunction,
                        base::Bind(&ExpectTwoStringArguments, kPuk, kPin),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Call method.
   client_->UnblockPin(dbus::ObjectPath(kExampleDevicePath),
                       kPuk,
                       kPin,
                       mock_closure.GetCallback(),
                       mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, ChangePin) {
   const char kOldPin[] = "123456";
   const char kNewPin[] = "234567";
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(shill::kChangePinFunction,
                        base::Bind(&ExpectTwoStringArguments,
                                   kOldPin,
                                   kNewPin),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Call method.
   client_->ChangePin(dbus::ObjectPath(kExampleDevicePath),
                      kOldPin,
                      kNewPin,
                      mock_closure.GetCallback(),
                      mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, Register) {
   const char kNetworkId[] = "networkid";
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(shill::kRegisterFunction,
                        base::Bind(&ExpectStringArgument, kNetworkId),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Call method.
   client_->Register(dbus::ObjectPath(kExampleDevicePath),
                     kNetworkId,
                     mock_closure.GetCallback(),
                     mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, SetCarrier) {
   const char kCarrier[] = "carrier";
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(shill::kSetCarrierFunction,
                        base::Bind(&ExpectStringArgument, kCarrier),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   // Call method.
   client_->SetCarrier(dbus::ObjectPath(kExampleDevicePath),
                     kCarrier,
                     mock_closure.GetCallback(),
                     mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillDeviceClientTest, Reset) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(shill::kResetFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   // Call method.
   client_->Reset(dbus::ObjectPath(kExampleDevicePath),
                  mock_closure.GetCallback(),
                  mock_error_callback.GetCallback());
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace chromeos