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

chromeos/dbus/ibus/ibus_input_context_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_input_context_client.h"
 
 #include <map>
 #include <string>
 #include "base/message_loop.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
@@ skipping 83 matching lines @@
                                             ibus::kServiceName,
                                             dbus::ObjectPath(kObjectPath));
 
     // Create a client.
     client_.reset(IBusInputContextClient::Create(
         REAL_DBUS_CLIENT_IMPLEMENTATION));
 
     // Set an expectation so mock_bus's GetObjectProxy() for the given service
     // name and the object path will return mock_proxy_. The GetObjectProxy
     // function is called in Initialized function.
-    EXPECT_CALL(*mock_bus_, GetObjectProxy(ibus::kServiceName,
-                                           dbus::ObjectPath(kObjectPath)))
+    EXPECT_CALL(
+        *mock_bus_.get(),
+        GetObjectProxy(ibus::kServiceName, dbus::ObjectPath(kObjectPath)))
         .WillOnce(Return(mock_proxy_.get()));
 
     // Set expectations so mock_proxy's ConnectToSignal will use
     // OnConnectToSignal() to run the callback. The ConnectToSignal is called in
     // Initialize function.
-    EXPECT_CALL(*mock_proxy_, ConnectToSignal(
-        ibus::input_context::kServiceInterface,
-        ibus::input_context::kCommitTextSignal, _, _))
+    EXPECT_CALL(*mock_proxy_.get(),
+                ConnectToSignal(ibus::input_context::kServiceInterface,
+                                ibus::input_context::kCommitTextSignal,
+                                _,
+                                _))
         .WillRepeatedly(
-            Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
-    EXPECT_CALL(*mock_proxy_, ConnectToSignal(
-        ibus::input_context::kServiceInterface,
-        ibus::input_context::kForwardKeyEventSignal, _, _))
+             Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
+    EXPECT_CALL(*mock_proxy_.get(),
+                ConnectToSignal(ibus::input_context::kServiceInterface,
+                                ibus::input_context::kForwardKeyEventSignal,
+                                _,
+                                _))
         .WillRepeatedly(
-            Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
-    EXPECT_CALL(*mock_proxy_, ConnectToSignal(
-        ibus::input_context::kServiceInterface,
-        ibus::input_context::kHidePreeditTextSignal, _, _))
+             Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
+    EXPECT_CALL(*mock_proxy_.get(),
+                ConnectToSignal(ibus::input_context::kServiceInterface,
+                                ibus::input_context::kHidePreeditTextSignal,
+                                _,
+                                _))
         .WillRepeatedly(
-            Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
-    EXPECT_CALL(*mock_proxy_, ConnectToSignal(
-        ibus::input_context::kServiceInterface,
-        ibus::input_context::kShowPreeditTextSignal, _, _))
+             Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
+    EXPECT_CALL(*mock_proxy_.get(),
+                ConnectToSignal(ibus::input_context::kServiceInterface,
+                                ibus::input_context::kShowPreeditTextSignal,
+                                _,
+                                _))
         .WillRepeatedly(
-            Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
-    EXPECT_CALL(*mock_proxy_, ConnectToSignal(
-        ibus::input_context::kServiceInterface,
-        ibus::input_context::kUpdatePreeditTextSignal, _, _))
+             Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
+    EXPECT_CALL(*mock_proxy_.get(),
+                ConnectToSignal(ibus::input_context::kServiceInterface,
+                                ibus::input_context::kUpdatePreeditTextSignal,
+                                _,
+                                _))
         .WillRepeatedly(
-            Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
-    EXPECT_CALL(*mock_proxy_, ConnectToSignal(
-        ibus::input_context::kServiceInterface,
-        ibus::input_context::kDeleteSurroundingTextSignal, _, _))
+             Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
+    EXPECT_CALL(
+        *mock_proxy_.get(),
+        ConnectToSignal(ibus::input_context::kServiceInterface,
+                        ibus::input_context::kDeleteSurroundingTextSignal,
+                        _,
+                        _))
         .WillRepeatedly(
-            Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
+             Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
 
     // Call Initialize to create object proxy and connect signals.
     client_->Initialize(mock_bus_.get(), dbus::ObjectPath(kObjectPath));
   }
 
   virtual void TearDown() OVERRIDE {
     EXPECT_TRUE(client_->IsObjectProxyReady());
     client_->ResetObjectProxy();
     EXPECT_FALSE(client_->IsObjectProxyReady());
   }
@@ skipping 312 matching lines @@
       &signal);
 
   // Unset the handler so expect not calling handler.
   client_->SetInputContextHandler(NULL);
   signal_callback_map_[ibus::input_context::kUpdatePreeditTextSignal].Run(
       &signal);
 }
 
 TEST_F(IBusInputContextClientTest, FocusInTest) {
   // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusInputContextClientTest::OnFocusIn));
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // Call FocusIn.
   client_->FocusIn();
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, FocusOutTest) {
   // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusInputContextClientTest::OnFocusOut));
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // Call FocusOut.
   client_->FocusOut();
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, ResetTest) {
   // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusInputContextClientTest::OnReset));
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // Call Reset.
   client_->Reset();
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, SetCapabilitiesTest) {
   // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusInputContextClientTest::OnSetCapabilities));
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // Call SetCapabilities.
   client_->SetCapabilities(kCapabilities);
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
@@ skipping 13 matching lines @@
                                         kCompositionHeight);
   // Call SetCursorLocation.
   client_->SetCursorLocation(cursor_location, composition_location);
 
   EXPECT_EQ(1, on_set_cursor_location_call_count_);
   client_->UnsetSetCursorLocationHandler();
 }
 
 TEST_F(IBusInputContextClientTest, OnProcessKeyEvent) {
   // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusInputContextClientTest::OnProcessKeyEvent));
   MockProcessKeyEventHandler callback;
   MockProcessKeyEventErrorHandler error_callback;
 
   EXPECT_CALL(callback, Run(kIsKeyHandled));
   EXPECT_CALL(error_callback, Run()).Times(0);
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendBool(kIsKeyHandled);
   response_ = response.get();
 
   // Call ProcessKeyEvent.
   client_->ProcessKeyEvent(kKeyval,
                            kKeycode,
                            kState,
                            base::Bind(&MockProcessKeyEventHandler::Run,
                                       base::Unretained(&callback)),
                            base::Bind(&MockProcessKeyEventErrorHandler::Run,
                                       base::Unretained(&error_callback)));
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, OnProcessKeyEventFail) {
   // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
-      .WillOnce(Invoke(this,
-                       &IBusInputContextClientTest::OnProcessKeyEventFail));
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
+      .WillOnce(
+           Invoke(this, &IBusInputContextClientTest::OnProcessKeyEventFail));
   MockProcessKeyEventHandler callback;
   MockProcessKeyEventErrorHandler error_callback;
 
   EXPECT_CALL(callback, Run(_)).Times(0);
   EXPECT_CALL(error_callback, Run());
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendBool(kIsKeyHandled);
   response_ = response.get();
 
   // Call ProcessKeyEvent.
   client_->ProcessKeyEvent(kKeyval,
                            kKeycode,
                            kState,
                            base::Bind(&MockProcessKeyEventHandler::Run,
                                       base::Unretained(&callback)),
                            base::Bind(&MockProcessKeyEventErrorHandler::Run,
                                       base::Unretained(&error_callback)));
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, SetSurroundingTextTest) {
   // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
-      .WillOnce(Invoke(this,
-                       &IBusInputContextClientTest::OnSetSurroundingText));
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
+      .WillOnce(
+           Invoke(this, &IBusInputContextClientTest::OnSetSurroundingText));
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // Call SetCursorLocation.
   client_->SetSurroundingText(kSurroundingText, kCursorPos, kAnchorPos);
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, PropertyActivateTest) {
   // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
-      .WillOnce(Invoke(this,
-                       &IBusInputContextClientTest::OnPropertyActivate));
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
+      .WillOnce(Invoke(this, &IBusInputContextClientTest::OnPropertyActivate));
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // Call SetCursorLocation.
   client_->PropertyActivate(kPropertyKey, kPropertyState);
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 }  // namespace chromeos