Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

chromeos/dbus/bluetooth_agent_service_provider.cc

 // Copyright 2013 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/logging.h"
@@ skipping 329 matching lines @@
     switch (status) {
       case Delegate::SUCCESS: {
         scoped_ptr<dbus::Response> response(
             dbus::Response::FromMethodCall(method_call));
         dbus::MessageWriter writer(response.get());
         writer.AppendString(pincode);
         response_sender.Run(response.Pass());
         break;
       }
       case Delegate::REJECTED: {
-        response_sender.Run(
-            dbus::ErrorResponse::FromMethodCall(
-                method_call, bluetooth_agent::kErrorRejected, "rejected")
-            .PassAs<dbus::Response>());
+        response_sender.Run(dbus::ErrorResponse::FromMethodCall(
+            method_call, bluetooth_agent::kErrorRejected, "rejected"));
         break;
       }
       case Delegate::CANCELLED: {
-        response_sender.Run(
-            dbus::ErrorResponse::FromMethodCall(
-                method_call, bluetooth_agent::kErrorCanceled, "canceled")
-            .PassAs<dbus::Response>());
+        response_sender.Run(dbus::ErrorResponse::FromMethodCall(
+            method_call, bluetooth_agent::kErrorCanceled, "canceled"));
         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: {
         scoped_ptr<dbus::Response> response(
             dbus::Response::FromMethodCall(method_call));
         dbus::MessageWriter writer(response.get());
         writer.AppendUint32(passkey);
         response_sender.Run(response.Pass());
         break;
       }
       case Delegate::REJECTED: {
-        response_sender.Run(
-            dbus::ErrorResponse::FromMethodCall(
-                method_call, bluetooth_agent::kErrorRejected, "rejected")
-            .PassAs<dbus::Response>());
+        response_sender.Run(dbus::ErrorResponse::FromMethodCall(
+            method_call, bluetooth_agent::kErrorRejected, "rejected"));
         break;
       }
       case Delegate::CANCELLED: {
-        response_sender.Run(
-            dbus::ErrorResponse::FromMethodCall(
-                method_call, bluetooth_agent::kErrorCanceled, "canceled")
-            .PassAs<dbus::Response>());
+        response_sender.Run(dbus::ErrorResponse::FromMethodCall(
+            method_call, bluetooth_agent::kErrorCanceled, "canceled"));
         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: {
         response_sender.Run(dbus::Response::FromMethodCall(method_call));
         break;
       }
       case Delegate::REJECTED: {
-        response_sender.Run(
-            dbus::ErrorResponse::FromMethodCall(
-                method_call, bluetooth_agent::kErrorRejected, "rejected")
-            .PassAs<dbus::Response>());
+        response_sender.Run(dbus::ErrorResponse::FromMethodCall(
+            method_call, bluetooth_agent::kErrorRejected, "rejected"));
         break;
       }
       case Delegate::CANCELLED: {
-        response_sender.Run(
-            dbus::ErrorResponse::FromMethodCall(
-                method_call, bluetooth_agent::kErrorCanceled, "canceled")
-            .PassAs<dbus::Response>());
+        response_sender.Run(dbus::ErrorResponse::FromMethodCall(
+            method_call, bluetooth_agent::kErrorCanceled, "canceled"));
         break;
       }
       default:
         NOTREACHED() << "Unexpected status code from delegate: " << status;
     }
   }
 
   // Origin thread (i.e. the UI thread in production).
   base::PlatformThreadId origin_thread_id_;
 
@@ skipping 34 matching lines @@
     const dbus::ObjectPath& object_path,
     Delegate* delegate) {
   if (!DBusThreadManager::Get()->IsUsingStub(DBusClientBundle::BLUETOOTH)) {
     return new BluetoothAgentServiceProviderImpl(bus, object_path, delegate);
   } else {
     return new FakeBluetoothAgentServiceProvider(object_path, delegate);
   }
 }
 
 }  // namespace chromeos