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

chromeos/dbus/ibus/ibus_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_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
@@ skipping 119 matching lines @@
   }
 
  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::bus::kServicePath));
-    EXPECT_CALL(*mock_bus_, GetObjectProxy(ibus::kServiceName,
-                                           dbus::ObjectPath(
-                                               ibus::bus::kServicePath)))
+    EXPECT_CALL(*mock_bus_.get(),
+                GetObjectProxy(ibus::kServiceName,
+                               dbus::ObjectPath(ibus::bus::kServicePath)))
         .WillOnce(Return(mock_proxy_.get()));
 
-    EXPECT_CALL(*mock_bus_, ShutdownAndBlock());
-    client_.reset(IBusClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
-                                     mock_bus_));
+    EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock());
+    client_.reset(
+        IBusClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION, mock_bus_.get()));
   }
 
   virtual void TearDown() OVERRIDE {
     mock_bus_->ShutdownAndBlock();
   }
 
   // The IBus client to be tested.
   scoped_ptr<IBusClient> client_;
 
   // A message loop to emulate asynchronous behavior.
   base::MessageLoop message_loop_;
   scoped_refptr<dbus::MockBus> mock_bus_;
   scoped_refptr<dbus::MockObjectProxy> mock_proxy_;
 
   // Response returned by mock methods.
   dbus::Response* response_;
   dbus::ErrorResponse* error_response_;
 };
 
 TEST_F(IBusClientTest, CreateInputContextTest) {
   // Set expectations.
   const dbus::ObjectPath kInputContextObjectPath =
       dbus::ObjectPath("/some/object/path");
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusClientTest::OnCreateInputContext));
   MockCreateInputContextCallback callback;
   EXPECT_CALL(callback, Run(kInputContextObjectPath));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run()).Times(0);
 
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendObjectPath(kInputContextObjectPath);
   response_ = response.get();
 
   // Call CreateInputContext.
   client_->CreateInputContext(
       kClientName,
       base::Bind(&MockCreateInputContextCallback::Run,
                  base::Unretained(&callback)),
       base::Bind(&MockErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, CreateInputContext_NullResponseFail) {
   // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusClientTest::OnCreateInputContext));
   MockCreateInputContextCallback callback;
   EXPECT_CALL(callback, Run(_)).Times(0);
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Set NULL response.
   response_ = NULL;
 
   // Call CreateInputContext.
   client_->CreateInputContext(
       kClientName,
       base::Bind(&MockCreateInputContextCallback::Run,
                  base::Unretained(&callback)),
       base::Bind(&MockErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, CreateInputContext_InvalidResponseFail) {
   // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusClientTest::OnCreateInputContext));
   MockCreateInputContextCallback callback;
   EXPECT_CALL(callback, Run(_)).Times(0);
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Create invalid(empty) response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // Call CreateInputContext.
   client_->CreateInputContext(
       kClientName,
       base::Bind(&MockCreateInputContextCallback::Run,
                  base::Unretained(&callback)),
       base::Bind(&MockErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, CreateInputContext_MethodCallFail) {
   // Set expectations
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusClientTest::OnCreateInputContextFail));
   MockCreateInputContextCallback callback;
   EXPECT_CALL(callback, Run(_)).Times(0);
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // The error response is not used in CreateInputContext.
   error_response_ = NULL;
 
   // Call CreateInputContext.
   client_->CreateInputContext(
       kClientName,
       base::Bind(&MockCreateInputContextCallback::Run,
                  base::Unretained(&callback)),
       base::Bind(&MockErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, SetGlobalEngineTest) {
   // Set expectations
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusClientTest::OnSetGlobalEngine));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run()).Times(0);
 
   // Create empty response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // The error response is not used in SetGLobalEngine.
   error_response_ = NULL;
 
   // Call CreateInputContext.
   client_->SetGlobalEngine(
       kEngineName,
       base::Bind(&MockErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, SetGlobalEngineTest_InvalidResponse) {
   // Set expectations
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusClientTest::OnSetGlobalEngineFail));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Set invalid response.
   response_ = NULL;
 
   // The error response is not used in SetGLobalEngine.
   error_response_ = NULL;
 
   // Call CreateInputContext.
   client_->SetGlobalEngine(
       kEngineName,
       base::Bind(&MockErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, SetGlobalEngineTest_MethodCallFail) {
   // Set expectations
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusClientTest::OnSetGlobalEngineFail));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Create empty response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // The error response is not used in SetGLobalEngine.
   error_response_ = NULL;
 
   // Call CreateInputContext.
   client_->SetGlobalEngine(
       kEngineName,
       base::Bind(&MockErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, ExitTest) {
   // Set expectations
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusClientTest::OnExit));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run()).Times(0);
 
   // Create empty response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // The error response is not used in SetGLobalEngine.
   error_response_ = NULL;
 
   // Call CreateInputContext.
   client_->Exit(
       IBusClient::RESTART_IBUS_DAEMON,
       base::Bind(&MockErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, ExitTest_InvalidResponse) {
   // Set expectations
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusClientTest::OnExit));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Set invalid response.
   response_ = NULL;
 
   // The error response is not used in SetGLobalEngine.
   error_response_ = NULL;
 
   // Call CreateInputContext.
   client_->Exit(
       IBusClient::RESTART_IBUS_DAEMON,
       base::Bind(&MockErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusClientTest, ExitTest_MethodCallFail) {
   // Set expectations
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
+  EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusClientTest::OnExitFail));
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
   // Create empty response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // The error response is not used in SetGLobalEngine.
   error_response_ = NULL;
 
   // Call CreateInputContext.
   client_->Exit(
       IBusClient::RESTART_IBUS_DAEMON,
       base::Bind(&MockErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos