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

dbus/mock_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/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "dbus/message.h"
@@ skipping 21 matching lines @@
     mock_bus_ = new dbus::MockBus(options);
 
     // Create a mock proxy.
     mock_proxy_ = new dbus::MockObjectProxy(
         mock_bus_.get(),
         "org.chromium.TestService",
         dbus::ObjectPath("/org/chromium/TestObject"));
 
     // Set an expectation so mock_proxy's CallMethodAndBlock() will use
     // CreateMockProxyResponse() to return responses.
-    EXPECT_CALL(*mock_proxy_, CallMethodAndBlock(_, _))
+    EXPECT_CALL(*mock_proxy_, MockCallMethodAndBlock(_, _))
         .WillRepeatedly(Invoke(this, &MockTest::CreateMockProxyResponse));
 
     // Set an expectation so mock_proxy's CallMethod() will use
     // HandleMockProxyResponseWithMessageLoop() to return responses.
     EXPECT_CALL(*mock_proxy_, CallMethod(_, _, _))
         .WillRepeatedly(
             Invoke(this,
                    &MockTest::HandleMockProxyResponseWithMessageLoop));
 
     // Set an expectation so mock_bus's GetObjectProxy() for the given
@@ skipping 31 matching lines @@
  private:
   // Returns a response for the given method call. Used to implement
   // CallMethodAndBlock() for |mock_proxy_|.
   dbus::Response* CreateMockProxyResponse(dbus::MethodCall* method_call,
                                           int timeout_ms) {
     if (method_call->GetInterface() == "org.chromium.TestInterface" &&
         method_call->GetMember() == "Echo") {
       dbus::MessageReader reader(method_call);
       std::string text_message;
       if (reader.PopString(&text_message)) {
-        dbus::Response* response = dbus::Response::CreateEmpty();
-        dbus::MessageWriter writer(response);
+        scoped_ptr<dbus::Response> response = dbus::Response::CreateEmpty();
+        dbus::MessageWriter writer(response.get());
         writer.AppendString(text_message);
-        return response;
+        return response.release();
       }
     }
 
     LOG(ERROR) << "Unexpected method call: " << method_call->ToString();
     return NULL;
   }
 
   // Creates a response and runs the given response callback in the
   // message loop with the response. Used to implement for |mock_proxy_|.
   void HandleMockProxyResponseWithMessageLoop(
@@ skipping 64 matching lines @@
   // Call the method.
   proxy->CallMethod(&method_call,
                     dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                     base::Bind(&MockTest::OnResponse,
                                base::Unretained(this)));
   // Run the message loop to let OnResponse be called.
   message_loop_.Run();
 
   EXPECT_EQ(kHello, response_string_);
 }