Code cleaning: Uses scoped_ptr<> to express ownership rather than writing ownership in comments.

chromeos/dbus/ibus/ibus_engine_factory_service_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_engine_factory_service.h"
 
 #include <map>
 #include <string>
 #include "base/message_loop.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
@@ skipping 40 matching lines @@
   dbus::ObjectPath path_;
   MessageLoop* message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(AsynchronousCreateEngineHandler);
 };
 
 class MockCreateEngineResponseSender {
  public:
   explicit MockCreateEngineResponseSender(const dbus::ObjectPath& expected_path)
       : expected_path_(expected_path) {}
-  MOCK_METHOD1(Run, void(dbus::Response*));
+  // GMock doesn't support mocking methods which take scoped_ptr<>.
+  MOCK_METHOD1(MockRun, void(dbus::Response*));
+  void Run(scoped_ptr<dbus::Response> response) {
+    MockRun(response.get());
+  }
 
   // Checks the given |response| meets expectation for the CreateEngine method.
-  void CheckCreateEngineResponse(dbus::Response* response) {
-    scoped_ptr<dbus::Response> response_deleter(response);
+  void CheckCreateEngineResponsePtr(dbus::Response* response) {
     dbus::MessageReader reader(response);
     dbus::ObjectPath actual_path;
     ASSERT_TRUE(reader.PopObjectPath(&actual_path));
     EXPECT_EQ(expected_path_, actual_path);
   }
+  void CheckCreateEngineResponse(scoped_ptr<dbus::Response> response) {
+    CheckCreateEngineResponsePtr(response.get());
+  }
 
  private:
   dbus::ObjectPath expected_path_;
 };
 
 class IBusEngineFactoryServiceTest : public testing::Test {
  public:
   IBusEngineFactoryServiceTest() {}
 
   virtual void SetUp() OVERRIDE {
@@ skipping 55 matching lines @@
                                                  method_name,
                                                  success));
   }
 };
 
 TEST_F(IBusEngineFactoryServiceTest, SyncCreateEngineTest) {
   // Set expectations.
   const char kSampleEngine[] = "Sample Engine";
   const dbus::ObjectPath kObjectPath("/org/freedesktop/IBus/Engine/10");
   MockCreateEngineResponseSender response_sender(kObjectPath);
-  EXPECT_CALL(response_sender, Run(_))
+  EXPECT_CALL(response_sender, MockRun(_))
       .WillOnce(
           Invoke(&response_sender,
-                 &MockCreateEngineResponseSender::CheckCreateEngineResponse));
+                 &MockCreateEngineResponseSender::
+                 CheckCreateEngineResponsePtr));
 
   SynchronousCreateEngineHandler handler(kObjectPath);
   // Set handler expectations.
   service_->SetCreateEngineHandler(
       kSampleEngine,
       base::Bind(&SynchronousCreateEngineHandler::Run,
                  base::Unretained(&handler)));
   message_loop_.RunUntilIdle();
 
   // Invoke method call.
@@ skipping 18 matching lines @@
       base::Bind(&MockCreateEngineResponseSender::CheckCreateEngineResponse,
                  base::Unretained(&response_sender)));
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusEngineFactoryServiceTest, AsyncCreateEngineTest) {
   // Set expectations.
   const char kSampleEngine[] = "Sample Engine";
   const dbus::ObjectPath kObjectPath("/org/freedesktop/IBus/Engine/10");
   MockCreateEngineResponseSender response_sender(kObjectPath);
-  EXPECT_CALL(response_sender, Run(_))
+  EXPECT_CALL(response_sender, MockRun(_))
       .WillOnce(
           Invoke(&response_sender,
-                 &MockCreateEngineResponseSender::CheckCreateEngineResponse));
+                 &MockCreateEngineResponseSender::
+                 CheckCreateEngineResponsePtr));
 
   AsynchronousCreateEngineHandler handler(kObjectPath, &message_loop_);
   // Set handler expectations.
   service_->SetCreateEngineHandler(
       kSampleEngine,
       base::Bind(&AsynchronousCreateEngineHandler::Run,
                  base::Unretained(&handler)));
   message_loop_.RunUntilIdle();
 
   // Invoke method call.
@@ skipping 14 matching lines @@
   // Unset the handler so expect not calling handler.
   service_->UnsetCreateEngineHandler(kSampleEngine);
   method_exported_map_[ibus::engine_factory::kCreateEngineMethod].Run(
       &method_call,
       base::Bind(&MockCreateEngineResponseSender::CheckCreateEngineResponse,
                  base::Unretained(&response_sender)));
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos