Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"

chromeos/dbus/ibus/ibus_config_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 "chromeos/dbus/ibus/ibus_config_client.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 264 matching lines @@
   IBusConfigClientTest() {}
 
  protected:
   virtual void SetUp() OVERRIDE {
     dbus::Bus::Options options;
     mock_bus_ = new dbus::MockBus(options);
     mock_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(),
                                             ibus::kServiceName,
                                             dbus::ObjectPath(
                                                 ibus::config::kServicePath));
-    EXPECT_CALL(*mock_bus_, ShutdownAndBlock());
+    EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock());
     client_.reset(IBusConfigClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
-                                           mock_bus_));
+                                           mock_bus_.get()));
 
     // Surpress uninteresting mock function call warning.
     EXPECT_CALL(*mock_bus_.get(), AssertOnOriginThread())
         .WillRepeatedly(Return());
   }
 
   virtual void TearDown() OVERRIDE {
     mock_bus_->ShutdownAndBlock();
   }
 
   // Initialize |client_| by replying valid owner name synchronously.
   void InitializeSync() {
-    EXPECT_CALL(*mock_bus_, GetObjectProxy(ibus::config::kServiceName,
-                                           dbus::ObjectPath(
-                                               ibus::config::kServicePath)))
+    EXPECT_CALL(*mock_bus_.get(),
+                GetObjectProxy(ibus::config::kServiceName,
+                               dbus::ObjectPath(ibus::config::kServicePath)))
         .WillOnce(Return(mock_proxy_.get()));
 
     scoped_refptr<dbus::MockObjectProxy> mock_dbus_proxy
         = new dbus::MockObjectProxy(mock_bus_.get(),
                                     ibus::kDBusServiceName,
                                     dbus::ObjectPath(ibus::kDBusObjectPath));
-    EXPECT_CALL(*mock_bus_,
+    EXPECT_CALL(*mock_bus_.get(),
                 GetObjectProxy(ibus::kDBusServiceName,
                                dbus::ObjectPath(ibus::kDBusObjectPath)))
         .WillOnce(Return(mock_dbus_proxy.get()));
 
     MockGetNameOwnerMethodCallHandler mock_get_name_owner_method_call;
-    EXPECT_CALL(*mock_dbus_proxy, CallMethodWithErrorCallback(_, _, _, _))
+    EXPECT_CALL(*mock_dbus_proxy.get(), CallMethodWithErrorCallback(_, _, _, _))
         .WillOnce(Invoke(&mock_get_name_owner_method_call,
                          &MockGetNameOwnerMethodCallHandler::Run));
     NameOwnerChangedHandler handler;
-    EXPECT_CALL(*mock_dbus_proxy, ConnectToSignal(
-        ibus::kDBusInterface,
-        ibus::kNameOwnerChangedSignal,
-        _,
-        _)).WillOnce(Invoke(&handler,
-                            &NameOwnerChangedHandler::OnConnectToSignal));
+    EXPECT_CALL(*mock_dbus_proxy.get(),
+                ConnectToSignal(
+                    ibus::kDBusInterface, ibus::kNameOwnerChangedSignal, _, _))
+        .WillOnce(
+             Invoke(&handler, &NameOwnerChangedHandler::OnConnectToSignal));
     client_->InitializeAsync(base::Bind(&base::DoNothing));
     mock_get_name_owner_method_call.EmitReplyCallback(":0.1");
   }
 
   // The IBus config client to be tested.
   scoped_ptr<IBusConfigClient> client_;
 
   // A message loop to emulate asynchronous behavior.
   base::MessageLoop message_loop_;
   scoped_refptr<dbus::MockBus> mock_bus_;
   scoped_refptr<dbus::MockObjectProxy> mock_proxy_;
 };
 
 TEST_F(IBusConfigClientTest, SetStringValueTest) {
   // Set expectations
   InitializeSync();
   const char value[] = "value";
   SetStringValueHandler handler(kSection, kKey, value, HANDLER_SUCCESS);
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run()).Times(0);
 
   // Call SetStringValue.
   client_->SetStringValue(kKey, kSection, value,
                           base::Bind(&MockErrorCallback::Run,
                                      base::Unretained(&error_callback)));
 }
 
 TEST_F(IBusConfigClientTest, SetStringValueTest_Fail) {
   // Set expectations
   InitializeSync();
   const char value[] = "value";
   SetStringValueHandler handler(kSection, kKey, value, HANDLER_FAIL);
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Call SetStringValue.
   client_->SetStringValue(kKey, kSection, value,
                           base::Bind(&MockErrorCallback::Run,
                                      base::Unretained(&error_callback)));
 }
 
 TEST_F(IBusConfigClientTest, SetIntValueTest) {
   // Set expectations
   InitializeSync();
   const int value = 1234;
   SetIntValueHandler handler(kSection, kKey, value, HANDLER_SUCCESS);
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run()).Times(0);
 
   // Call SetIntValue.
   client_->SetIntValue(kKey, kSection, value,
                        base::Bind(&MockErrorCallback::Run,
                                   base::Unretained(&error_callback)));
 }
 
 TEST_F(IBusConfigClientTest, SetIntValueTest_Fail) {
   // Set expectations
   InitializeSync();
   const int value = 1234;
   SetIntValueHandler handler(kSection, kKey, value, HANDLER_FAIL);
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Call SetIntValue.
   client_->SetIntValue(kKey, kSection, value,
                        base::Bind(&MockErrorCallback::Run,
                                   base::Unretained(&error_callback)));
 }
 
 TEST_F(IBusConfigClientTest, SetBoolValueTest) {
   // Set expectations
   InitializeSync();
   const bool value = true;
   SetBoolValueHandler handler(kSection, kKey, value, HANDLER_SUCCESS);
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run()).Times(0);
 
   // Call SetBoolValue.
   client_->SetBoolValue(kKey, kSection, value,
                         base::Bind(&MockErrorCallback::Run,
                                    base::Unretained(&error_callback)));
 }
 
 TEST_F(IBusConfigClientTest, SetBoolValueTest_Fail) {
   // Set expectations
   InitializeSync();
   const bool value = true;
   SetBoolValueHandler handler(kSection, kKey, value, HANDLER_FAIL);
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Call SetBoolValue.
   client_->SetBoolValue(kKey, kSection, value,
                        base::Bind(&MockErrorCallback::Run,
                                   base::Unretained(&error_callback)));
 }
 
 TEST_F(IBusConfigClientTest, SetStringListValueTest) {
   // Set expectations
   InitializeSync();
   std::vector<std::string> value;
   value.push_back("Sample value 1");
   value.push_back("Sample value 2");
 
   SetStringListValueHandler handler(kSection, kKey, value, HANDLER_SUCCESS);
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run()).Times(0);
 
   // Call SetStringListValue.
   client_->SetStringListValue(kKey, kSection, value,
                               base::Bind(&MockErrorCallback::Run,
                                          base::Unretained(&error_callback)));
 }
 
 TEST_F(IBusConfigClientTest, SetStringListValueTest_Fail) {
   // Set expectations
   InitializeSync();
   std::vector<std::string> value;
   value.push_back("Sample value 1");
   value.push_back("Sample value 2");
 
   SetStringListValueHandler handler(kSection, kKey, value, HANDLER_FAIL);
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Call SetStringListValue.
   client_->SetStringListValue(kKey, kSection, value,
                               base::Bind(&MockErrorCallback::Run,
                                          base::Unretained(&error_callback)));
 }
 
 TEST_F(IBusConfigClientTest, IBusConfigDaemon_NotAvailableTest) {
   MockGetNameOwnerMethodCallHandler mock_get_name_owner_method_call;
 
-  EXPECT_CALL(*mock_bus_, GetObjectProxy(ibus::kServiceName,
-                                         dbus::ObjectPath(
-                                             ibus::config::kServicePath)))
+  EXPECT_CALL(*mock_bus_.get(),
+              GetObjectProxy(ibus::kServiceName,
+                             dbus::ObjectPath(ibus::config::kServicePath)))
       .Times(0);
 
   scoped_refptr<dbus::MockObjectProxy> mock_dbus_proxy
       = new dbus::MockObjectProxy(mock_bus_.get(),
                                   ibus::kDBusServiceName,
                                   dbus::ObjectPath(ibus::kDBusObjectPath));
-  EXPECT_CALL(*mock_bus_,
+  EXPECT_CALL(*mock_bus_.get(),
               GetObjectProxy(ibus::kDBusServiceName,
                              dbus::ObjectPath(ibus::kDBusObjectPath)))
       .WillOnce(Return(mock_dbus_proxy.get()));
-  EXPECT_CALL(*mock_dbus_proxy, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_dbus_proxy.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&mock_get_name_owner_method_call,
                        &MockGetNameOwnerMethodCallHandler::Run));
   NameOwnerChangedHandler handler;
-  EXPECT_CALL(*mock_dbus_proxy, ConnectToSignal(
-      ibus::kDBusInterface,
-      ibus::kNameOwnerChangedSignal,
-      _,
-      _)).WillOnce(Invoke(&handler,
-                          &NameOwnerChangedHandler::OnConnectToSignal));
+  EXPECT_CALL(*mock_dbus_proxy.get(),
+              ConnectToSignal(
+                  ibus::kDBusInterface, ibus::kNameOwnerChangedSignal, _, _))
+      .WillOnce(Invoke(&handler, &NameOwnerChangedHandler::OnConnectToSignal));
   client_->InitializeAsync(base::Bind(&base::DoNothing));
 
   // Passing empty string means there is no owner, thus ibus-config daemon is
   // not ready.
   mock_get_name_owner_method_call.EmitReplyCallback("");
 
   // Make sure not crashing by function call without initialize.
   const bool value = true;
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _)).Times(0);
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
+      .Times(0);
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run()).Times(0);
   client_->SetBoolValue(kKey, kSection, value,
                         base::Bind(&MockErrorCallback::Run,
                                    base::Unretained(&error_callback)));
 }
 
 TEST_F(IBusConfigClientTest, IBusConfigDaemon_SlowInitializeTest) {
   MockGetNameOwnerMethodCallHandler mock_get_name_owner_method_call;
 
-  EXPECT_CALL(*mock_bus_, GetObjectProxy(ibus::config::kServiceName,
-                                         dbus::ObjectPath(
-                                             ibus::config::kServicePath)))
+  EXPECT_CALL(*mock_bus_.get(),
+              GetObjectProxy(ibus::config::kServiceName,
+                             dbus::ObjectPath(ibus::config::kServicePath)))
       .WillOnce(Return(mock_proxy_.get()));
 
   scoped_refptr<dbus::MockObjectProxy> mock_dbus_proxy
       = new dbus::MockObjectProxy(mock_bus_.get(),
                                   ibus::kDBusServiceName,
                                   dbus::ObjectPath(ibus::kDBusObjectPath));
-  EXPECT_CALL(*mock_bus_,
+  EXPECT_CALL(*mock_bus_.get(),
               GetObjectProxy(ibus::kDBusServiceName,
                              dbus::ObjectPath(ibus::kDBusObjectPath)))
       .WillOnce(Return(mock_dbus_proxy.get()));
-  EXPECT_CALL(*mock_dbus_proxy, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_dbus_proxy.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&mock_get_name_owner_method_call,
                        &MockGetNameOwnerMethodCallHandler::Run));
   NameOwnerChangedHandler name_owner_changed_handler;
-  EXPECT_CALL(*mock_dbus_proxy, ConnectToSignal(
-      ibus::kDBusInterface,
-      ibus::kNameOwnerChangedSignal,
-      _,
-      _)).WillOnce(Invoke(&name_owner_changed_handler,
-                          &NameOwnerChangedHandler::OnConnectToSignal));
+  EXPECT_CALL(*mock_dbus_proxy.get(),
+              ConnectToSignal(
+                  ibus::kDBusInterface, ibus::kNameOwnerChangedSignal, _, _))
+      .WillOnce(Invoke(&name_owner_changed_handler,
+                       &NameOwnerChangedHandler::OnConnectToSignal));
   client_->InitializeAsync(base::Bind(&base::DoNothing));
 
   // Passing empty string means there is no owner, thus ibus-config daemon is
   // not ready.
   mock_get_name_owner_method_call.EmitReplyCallback("");
 
   // Fire NameOwnerChanged signal to emulate ibus-config daemon was acquired
   // well-known name.
   name_owner_changed_handler.InvokeSignal(ibus::config::kServiceName,
                                           "",
                                           ":0.1");
 
   // Make sure it is possible to emit method calls.
   const bool value = true;
   SetBoolValueHandler handler(kSection, kKey, value, HANDLER_FAIL);
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&handler, &SetValueVerifierBase::Run));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Call SetBoolValue.
   client_->SetBoolValue(kKey, kSection, value,
                        base::Bind(&MockErrorCallback::Run,
                                   base::Unretained(&error_callback)));
 }
 
 TEST_F(IBusConfigClientTest, IBusConfigDaemon_ShutdownTest) {
   MockGetNameOwnerMethodCallHandler mock_get_name_owner_method_call;
 
-  EXPECT_CALL(*mock_bus_, GetObjectProxy(ibus::config::kServiceName,
-                                         dbus::ObjectPath(
-                                             ibus::config::kServicePath)))
+  EXPECT_CALL(*mock_bus_.get(),
+              GetObjectProxy(ibus::config::kServiceName,
+                             dbus::ObjectPath(ibus::config::kServicePath)))
       .WillRepeatedly(Return(mock_proxy_.get()));
 
   scoped_refptr<dbus::MockObjectProxy> mock_dbus_proxy
       = new dbus::MockObjectProxy(mock_bus_.get(),
                                   ibus::kDBusServiceName,
                                   dbus::ObjectPath(ibus::kDBusObjectPath));
-  EXPECT_CALL(*mock_bus_,
+  EXPECT_CALL(*mock_bus_.get(),
               GetObjectProxy(ibus::kDBusServiceName,
                              dbus::ObjectPath(ibus::kDBusObjectPath)))
       .WillOnce(Return(mock_dbus_proxy.get()));
-  EXPECT_CALL(*mock_dbus_proxy, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_dbus_proxy.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(&mock_get_name_owner_method_call,
                        &MockGetNameOwnerMethodCallHandler::Run));
   NameOwnerChangedHandler name_owner_changed_handler;
-  EXPECT_CALL(*mock_dbus_proxy, ConnectToSignal(
-      ibus::kDBusInterface,
-      ibus::kNameOwnerChangedSignal,
-      _,
-      _)).WillOnce(Invoke(&name_owner_changed_handler,
-                          &NameOwnerChangedHandler::OnConnectToSignal));
+  EXPECT_CALL(*mock_dbus_proxy.get(),
+              ConnectToSignal(
+                  ibus::kDBusInterface, ibus::kNameOwnerChangedSignal, _, _))
+      .WillOnce(Invoke(&name_owner_changed_handler,
+                       &NameOwnerChangedHandler::OnConnectToSignal));
   client_->InitializeAsync(base::Bind(&base::DoNothing));
 
   const bool value = true;
   SetBoolValueHandler handler(kSection, kKey, value, HANDLER_FAIL);
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillRepeatedly(Invoke(&handler, &SetValueVerifierBase::Run));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run()).WillRepeatedly(Return());
 
   // Initialize succeeded sucessfully.
   mock_get_name_owner_method_call.EmitReplyCallback(":0.2");
 
   // Call SetBoolValue.
   client_->SetBoolValue(kKey, kSection, value,
                        base::Bind(&MockErrorCallback::Run,
@@ skipping 15 matching lines @@
                                           "",
                                           ":0.2");
 
   // Make sure it is possible to emit method calls.
   client_->SetBoolValue(kKey, kSection, value,
                        base::Bind(&MockErrorCallback::Run,
                                   base::Unretained(&error_callback)));
 }
 
 }  // namespace chromeos