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

chromeos/dbus/bluetooth_agent_service_provider.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/bluetooth_agent_service_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
@@ skipping 121 matching lines @@
 
   // Called by dbus:: when the agent is unregistered from the Bluetooth
   // daemon, generally at the end of a pairing request.
   void Release(dbus::MethodCall* method_call,
                dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(OnOriginThread());
     DCHECK(delegate_);
 
     delegate_->Release();
 
-    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
-    response_sender.Run(response);
+    response_sender.Run(dbus::Response::FromMethodCall(method_call));
   }
 
   // Called by dbus:: when the Release method is exported.
   void ReleaseExported(const std::string& interface_name,
                        const std::string& method_name,
                        bool success) {
     LOG_IF(WARNING, !success) << "Failed to export "
                               << interface_name << "." << method_name;
   }
 
@@ skipping 74 matching lines @@
     std::string pincode;
     if (!reader.PopObjectPath(&device_path) ||
         !reader.PopString(&pincode)) {
       LOG(WARNING) << "DisplayPinCode called with incorrect paramters: "
                    << method_call->ToString();
       return;
     }
 
     delegate_->DisplayPinCode(device_path, pincode);
 
-    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
-    response_sender.Run(response);
+    response_sender.Run(dbus::Response::FromMethodCall(method_call));
   }
 
   // Called by dbus:: when the DisplayPinCode method is exported.
   void DisplayPinCodeExported(const std::string& interface_name,
                               const std::string& method_name,
                               bool success) {
     LOG_IF(WARNING, !success) << "Failed to export "
                               << interface_name << "." << method_name;
   }
 
@@ skipping 10 matching lines @@
     uint32 passkey;
     if (!reader.PopObjectPath(&device_path) ||
         !reader.PopUint32(&passkey)) {
       LOG(WARNING) << "DisplayPasskey called with incorrect paramters: "
                    << method_call->ToString();
       return;
     }
 
     delegate_->DisplayPasskey(device_path, passkey);
 
-    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
-    response_sender.Run(response);
+    response_sender.Run(dbus::Response::FromMethodCall(method_call));
   }
 
   // Called by dbus:: when the DisplayPasskey method is exported.
   void DisplayPasskeyExported(const std::string& interface_name,
                               const std::string& method_name,
                               bool success) {
     LOG_IF(WARNING, !success) << "Failed to export "
                               << interface_name << "." << method_name;
   }
 
@@ skipping 115 matching lines @@
 
   // Called by dbus:: when the request failed before a reply was returned
   // from the device.
   void Cancel(dbus::MethodCall* method_call,
               dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(OnOriginThread());
     DCHECK(delegate_);
 
     delegate_->Cancel();
 
-    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
-    response_sender.Run(response);
+    response_sender.Run(dbus::Response::FromMethodCall(method_call));
   }
 
   // Called by dbus:: when the Cancel method is exported.
   void CancelExported(const std::string& interface_name,
                       const std::string& method_name,
                       bool success) {
     LOG_IF(WARNING, !success) << "Failed to export "
                               << interface_name << "." << method_name;
   }
 
   // Called by the Delegate to response to a method requesting a PIN code.
   void OnPinCode(dbus::MethodCall* method_call,
                  dbus::ExportedObject::ResponseSender response_sender,
                  Delegate::Status status,
                  const std::string& pincode) {
     DCHECK(OnOriginThread());
 
     switch (status) {
       case Delegate::SUCCESS: {
-        dbus::Response* response = dbus::Response::FromMethodCall(method_call);
-        dbus::MessageWriter writer(response);
+        scoped_ptr<dbus::Response> response(
+            dbus::Response::FromMethodCall(method_call));
+        dbus::MessageWriter writer(response.get());
         writer.AppendString(pincode);
-        response_sender.Run(response);
+        response_sender.Run(response.Pass());
         break;
       }
       case Delegate::REJECTED: {
-        dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
-            method_call, bluetooth_agent::kErrorRejected, "rejected");
-        response_sender.Run(response);
+        response_sender.Run(
+            dbus::ErrorResponse::FromMethodCall(
+                method_call, bluetooth_agent::kErrorRejected, "rejected")
+            .PassAs<dbus::Response>());
         break;
       }
       case Delegate::CANCELLED: {
-        dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
-            method_call, bluetooth_agent::kErrorCanceled, "canceled");
-        response_sender.Run(response);
+        response_sender.Run(
+            dbus::ErrorResponse::FromMethodCall(
+                method_call, bluetooth_agent::kErrorCanceled, "canceled")
+            .PassAs<dbus::Response>());
         break;
       }
       default:
         NOTREACHED() << "Unexpected status code from delegate: " << status;
     }
   }
 
   // Called by the Delegate to response to a method requesting a Passkey.
   void OnPasskey(dbus::MethodCall* method_call,
                  dbus::ExportedObject::ResponseSender response_sender,
                  Delegate::Status status,
                  uint32 passkey) {
     DCHECK(OnOriginThread());
 
     switch (status) {
       case Delegate::SUCCESS: {
-        dbus::Response* response = dbus::Response::FromMethodCall(method_call);
-        dbus::MessageWriter writer(response);
+        scoped_ptr<dbus::Response> response(
+            dbus::Response::FromMethodCall(method_call));
+        dbus::MessageWriter writer(response.get());
         writer.AppendUint32(passkey);
-        response_sender.Run(response);
+        response_sender.Run(response.Pass());
         break;
       }
       case Delegate::REJECTED: {
-        dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
-            method_call, bluetooth_agent::kErrorRejected, "rejected");
-        response_sender.Run(response);
+        response_sender.Run(
+            dbus::ErrorResponse::FromMethodCall(
+                method_call, bluetooth_agent::kErrorRejected, "rejected")
+            .PassAs<dbus::Response>());
         break;
       }
       case Delegate::CANCELLED: {
-        dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
-            method_call, bluetooth_agent::kErrorCanceled, "canceled");
-        response_sender.Run(response);
+        response_sender.Run(
+            dbus::ErrorResponse::FromMethodCall(
+                method_call, bluetooth_agent::kErrorCanceled, "canceled")
+            .PassAs<dbus::Response>());
         break;
       }
       default:
         NOTREACHED() << "Unexpected status code from delegate: " << status;
     }
   }
 
   // Called by the Delegate in response to a method requiring confirmation.
   void OnConfirmation(dbus::MethodCall* method_call,
                       dbus::ExportedObject::ResponseSender response_sender,
                       Delegate::Status status) {
     DCHECK(OnOriginThread());
 
     switch (status) {
       case Delegate::SUCCESS: {
-        dbus::Response* response = dbus::Response::FromMethodCall(method_call);
-        response_sender.Run(response);
+        response_sender.Run(dbus::Response::FromMethodCall(method_call));
         break;
       }
       case Delegate::REJECTED: {
-        dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
-            method_call, bluetooth_agent::kErrorRejected, "rejected");
-        response_sender.Run(response);
+        response_sender.Run(
+            dbus::ErrorResponse::FromMethodCall(
+                method_call, bluetooth_agent::kErrorRejected, "rejected")
+            .PassAs<dbus::Response>());
         break;
       }
       case Delegate::CANCELLED: {
-        dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
-            method_call, bluetooth_agent::kErrorCanceled, "canceled");
-        response_sender.Run(response);
+        response_sender.Run(
+            dbus::ErrorResponse::FromMethodCall(
+                method_call, bluetooth_agent::kErrorCanceled, "canceled")
+            .PassAs<dbus::Response>());
         break;
       }
       default:
         NOTREACHED() << "Unexpected status code from delegate: " << status;
     }
   }
 
   // Origin thread (i.e. the UI thread in production).
   base::PlatformThreadId origin_thread_id_;
 
@@ skipping 46 matching lines @@
     const dbus::ObjectPath& object_path,
     Delegate* delegate) {
   if (base::chromeos::IsRunningOnChromeOS()) {
     return new BluetoothAgentServiceProviderImpl(bus, object_path, delegate);
   } else {
     return new BluetoothAgentServiceProviderStubImpl(delegate);
   }
 }
 
 }  // namespace chromeos