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

dbus/exported_object.h

 // 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.
 
 #ifndef DBUS_EXPORTED_OBJECT_H_
 #define DBUS_EXPORTED_OBJECT_H_
 
 #include <dbus/dbus.h>
 
 #include <map>
@@ skipping 23 matching lines @@
 class CHROME_DBUS_EXPORT ExportedObject
     : public base::RefCountedThreadSafe<ExportedObject> {
  public:
   // Client code should use Bus::GetExportedObject() instead of this
   // constructor.
   ExportedObject(Bus* bus, const ObjectPath& object_path);
 
   // Called to send a response from an exported method. |response| is the
   // response message. Callers should pass NULL in the event of an error that
   // prevents the sending of a response.
-  //
-  // ResponseSender takes ownership of |response| hence client code should
-  // not delete |response|.
-  // TODO(satorux): Change this to take scoped_ptr<Response> to make
-  // ownership clearer. crbug.com/163231
-  typedef base::Callback<void (Response* response)> ResponseSender;
+  typedef base::Callback<void (scoped_ptr<Response> response)> ResponseSender;
 
   // Called when an exported method is called. |method_call| is the request
   // message. |sender| is the callback that's used to send a response.
   //
   // |method_call| is owned by ExportedObject, hence client code should not
   // delete |method_call|.
   typedef base::Callback<void (MethodCall* method_call, ResponseSender sender)>
       MethodCallCallback;
 
   // Called when method exporting is done.
@@ skipping 67 matching lines @@
   // BLOCKING CALL.
   bool Register();
 
   // Handles the incoming request messages and dispatches to the exported
   // methods.
   DBusHandlerResult HandleMessage(DBusConnection* connection,
                                   DBusMessage* raw_message);
 
   // Runs the method. Helper function for HandleMessage().
   void RunMethod(MethodCallCallback method_call_callback,
-                 MethodCall* method_call,
+                 scoped_ptr<MethodCall> method_call,
                  base::TimeTicks start_time);
 
   // Callback invoked by service provider to send a response to a method call.
   // Can be called immediately from a MethodCallCallback to implement a
   // synchronous service or called later to implement an asynchronous service.
   void SendResponse(base::TimeTicks start_time,
-                    MethodCall* method_call,
-                    Response* response);
+                    scoped_ptr<MethodCall> method_call,
+                    scoped_ptr<Response> response);
 
   // Called on completion of the method run from SendResponse().
   // Takes ownership of |method_call| and |response|.
-  void OnMethodCompleted(MethodCall* method_call,
-                         Response* response,
+  void OnMethodCompleted(scoped_ptr<MethodCall> method_call,
+                         scoped_ptr<Response> response,
                          base::TimeTicks start_time);
 
   // Called when the object is unregistered.
   void OnUnregistered(DBusConnection* connection);
 
   // Redirects the function call to HandleMessage().
   static DBusHandlerResult HandleMessageThunk(DBusConnection* connection,
                                               DBusMessage* raw_message,
                                               void* user_data);
 
   // Redirects the function call to OnUnregistered().
   static void OnUnregisteredThunk(DBusConnection* connection,
                                   void* user_data);
 
   scoped_refptr<Bus> bus_;
   ObjectPath object_path_;
   bool object_is_registered_;
 
   // The method table where keys are absolute method names (i.e. interface
   // name + method name), and values are the corresponding callbacks.
   typedef std::map<std::string, MethodCallCallback> MethodTable;
   MethodTable method_table_;
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_EXPORTED_OBJECT_H_