Remove calls to deprecated MessageLoop methods in chromeos.

chromeos/dbus/shill_manager_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_manager_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::kFlimflamManagerInterface,
                                 dbus::ObjectPath(shill::kFlimflamServicePath)) {
   }
 
   void SetUp() override {
     ShillClientUnittestBase::SetUp();
     // Create a client with the mock bus.
     client_.reset(ShillManagerClient::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<ShillManagerClient> client_;
 };
 
 TEST_F(ShillManagerClientTest, PropertyChanged) {
   // Create a signal.
@@ skipping 43 matching lines @@
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(shill::kOfflineModeProperty,
                                 new base::FundamentalValue(true));
   // Set expectations.
   PrepareForMethodCall(shill::kGetPropertiesFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   client_->GetProperties(base::Bind(&ExpectDictionaryValueResult, &value));
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, GetNetworksForGeolocation) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter type_dict_writer(NULL);
   writer.OpenArray("{sv}", &type_dict_writer);
   dbus::MessageWriter type_entry_writer(NULL);
@@ skipping 29 matching lines @@
 
   // Set expectations.
   PrepareForMethodCall(shill::kGetNetworksForGeolocation,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   client_->GetNetworksForGeolocation(base::Bind(&ExpectDictionaryValueResult,
                                                 &type_dict_value));
 
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, SetProperty) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   base::StringValue value("portal list");
   PrepareForMethodCall(shill::kSetPropertyFunction,
                        base::Bind(ExpectStringAndValueArguments,
                                   shill::kCheckPortalListProperty,
                                   &value),
                        response.get());
   // Call method.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   client_->SetProperty(shill::kCheckPortalListProperty,
                        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(ShillManagerClientTest, RequestScan) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   PrepareForMethodCall(shill::kRequestScanFunction,
                        base::Bind(&ExpectStringArgument, shill::kTypeWifi),
                        response.get());
   // Call method.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   client_->RequestScan(shill::kTypeWifi,
                        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(ShillManagerClientTest, EnableTechnology) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   PrepareForMethodCall(shill::kEnableTechnologyFunction,
                        base::Bind(&ExpectStringArgument, shill::kTypeWifi),
                        response.get());
   // Call method.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   client_->EnableTechnology(shill::kTypeWifi,
                             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(ShillManagerClientTest, DisableTechnology) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   PrepareForMethodCall(shill::kDisableTechnologyFunction,
                        base::Bind(&ExpectStringArgument, shill::kTypeWifi),
                        response.get());
   // Call method.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   client_->DisableTechnology(shill::kTypeWifi,
                              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(ShillManagerClientTest, ConfigureService) {
   // Create response.
   const dbus::ObjectPath object_path("/");
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendObjectPath(object_path);
   // Create the argument dictionary.
   std::unique_ptr<base::DictionaryValue> arg(CreateExampleServiceProperties());
   // Use a variant valued dictionary rather than a string valued one.
   const bool string_valued = false;
   // Set expectations.
   PrepareForMethodCall(
       shill::kConfigureServiceFunction,
       base::Bind(&ExpectDictionaryValueArgument, arg.get(), string_valued),
       response.get());
   // Call method.
   MockErrorCallback mock_error_callback;
   client_->ConfigureService(*arg,
                             base::Bind(&ExpectObjectPathResultWithoutStatus,
                                        object_path),
                             mock_error_callback.GetCallback());
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, GetService) {
   // Create response.
   const dbus::ObjectPath object_path("/");
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendObjectPath(object_path);
   // Create the argument dictionary.
   std::unique_ptr<base::DictionaryValue> arg(CreateExampleServiceProperties());
   // Use a variant valued dictionary rather than a string valued one.
   const bool string_valued = false;
   // Set expectations.
   PrepareForMethodCall(
       shill::kGetServiceFunction,
       base::Bind(&ExpectDictionaryValueArgument, arg.get(), string_valued),
       response.get());
   // Call method.
   MockErrorCallback mock_error_callback;
   client_->GetService(*arg,
                       base::Bind(&ExpectObjectPathResultWithoutStatus,
                                  object_path),
                       mock_error_callback.GetCallback());
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, VerifyDestination) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   bool expected = true;
   writer.AppendBool(expected);
   // Set expectations.
   std::vector<std::string> arguments;
@@ skipping 18 matching lines @@
   properties.device_serial = arguments[4];
   properties.device_ssid = arguments[5];
   properties.device_bssid = arguments[6];
   client_->VerifyDestination(
       properties,
       base::Bind(&ExpectBoolResultWithoutStatus, expected),
       mock_error_callback.GetCallback());
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, VerifyAndEncryptCredentials) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   std::string expected = "encrypted_credentials";
   writer.AppendString(expected);
   // Set expectations.
   std::vector<std::string> arguments;
@@ skipping 23 matching lines @@
   properties.device_ssid = arguments[5];
   properties.device_bssid = arguments[6];
   client_->VerifyAndEncryptCredentials(
       properties,
       service_path,
       base::Bind(&ExpectStringResultWithoutStatus, expected),
       mock_error_callback.GetCallback());
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillManagerClientTest, VerifyAndEncryptData) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   std::string expected = "encrypted_data";
   writer.AppendString(expected);
   // Set expectations.
   std::vector<std::string> arguments;
@@ skipping 20 matching lines @@
   properties.device_ssid = arguments[5];
   properties.device_bssid = arguments[6];
   client_->VerifyAndEncryptData(
       properties,
       arguments[7],
       base::Bind(&ExpectStringResultWithoutStatus, expected),
       mock_error_callback.GetCallback());
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
-  message_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace chromeos