Convert Pass()→std::move() in //device

device/bluetooth/dbus/bluetooth_gatt_service_service_provider.cc

 // Copyright 2014 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 "device/bluetooth/dbus/bluetooth_gatt_service_service_provider.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "device/bluetooth/dbus/fake_bluetooth_gatt_service_service_provider.h"
@@ skipping 72 matching lines @@
 
     dbus::MessageReader reader(method_call);
 
     std::string interface_name;
     std::string property_name;
     if (!reader.PopString(&interface_name) ||
         !reader.PopString(&property_name) || reader.HasMoreData()) {
       scoped_ptr<dbus::ErrorResponse> error_response =
           dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs,
                                               "Expected 'ss'.");
-      response_sender.Run(error_response.Pass());
+      response_sender.Run(std::move(error_response));
       return;
     }
 
     // Only the GATT service interface is allowed.
     if (interface_name !=
         bluetooth_gatt_service::kBluetoothGattServiceInterface) {
       scoped_ptr<dbus::ErrorResponse> error_response =
           dbus::ErrorResponse::FromMethodCall(
               method_call, kErrorInvalidArgs,
               "No such interface: '" + interface_name + "'.");
-      response_sender.Run(error_response.Pass());
+      response_sender.Run(std::move(error_response));
       return;
     }
 
     // Return error if |property_name| is unknown.
     if (property_name != bluetooth_gatt_service::kUUIDProperty &&
         property_name != bluetooth_gatt_service::kIncludesProperty) {
       scoped_ptr<dbus::ErrorResponse> error_response =
           dbus::ErrorResponse::FromMethodCall(
               method_call, kErrorInvalidArgs,
               "No such property: '" + property_name + "'.");
-      response_sender.Run(error_response.Pass());
+      response_sender.Run(std::move(error_response));
       return;
     }
 
     scoped_ptr<dbus::Response> response =
         dbus::Response::FromMethodCall(method_call);
     dbus::MessageWriter writer(response.get());
     dbus::MessageWriter variant_writer(NULL);
 
     if (property_name == bluetooth_gatt_service::kUUIDProperty) {
       writer.OpenVariant("s", &variant_writer);
       variant_writer.AppendString(uuid_);
       writer.CloseContainer(&variant_writer);
     } else {
       writer.OpenVariant("ao", &variant_writer);
       variant_writer.AppendArrayOfObjectPaths(includes_);
       writer.CloseContainer(&variant_writer);
     }
 
-    response_sender.Run(response.Pass());
+    response_sender.Run(std::move(response));
   }
 
   // Called by dbus:: when the Bluetooth daemon sets a single property of the
   // service.
   void Set(dbus::MethodCall* method_call,
            dbus::ExportedObject::ResponseSender response_sender) {
     VLOG(2) << "BluetoothGattServiceServiceProvider::Set: "
             << object_path_.value();
     DCHECK(OnOriginThread());
 
     // All of the properties on this interface are read-only, so just return
     // error.
     scoped_ptr<dbus::ErrorResponse> error_response =
         dbus::ErrorResponse::FromMethodCall(method_call, kErrorPropertyReadOnly,
                                             "All properties are read-only.");
-    response_sender.Run(error_response.Pass());
+    response_sender.Run(std::move(error_response));
   }
 
   // Called by dbus:: when the Bluetooth daemon fetches all properties of the
   // service.
   void GetAll(dbus::MethodCall* method_call,
               dbus::ExportedObject::ResponseSender response_sender) {
     VLOG(2) << "BluetoothGattServiceServiceProvider::GetAll: "
             << object_path_.value();
     DCHECK(OnOriginThread());
 
     dbus::MessageReader reader(method_call);
 
     std::string interface_name;
     if (!reader.PopString(&interface_name) || reader.HasMoreData()) {
       scoped_ptr<dbus::ErrorResponse> error_response =
           dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs,
                                               "Expected 's'.");
-      response_sender.Run(error_response.Pass());
+      response_sender.Run(std::move(error_response));
       return;
     }
 
     // Only the GATT service interface is allowed.
     if (interface_name !=
         bluetooth_gatt_service::kBluetoothGattServiceInterface) {
       scoped_ptr<dbus::ErrorResponse> error_response =
           dbus::ErrorResponse::FromMethodCall(
               method_call, kErrorInvalidArgs,
               "No such interface: '" + interface_name + "'.");
-      response_sender.Run(error_response.Pass());
+      response_sender.Run(std::move(error_response));
       return;
     }
 
     scoped_ptr<dbus::Response> response =
         dbus::Response::FromMethodCall(method_call);
     dbus::MessageWriter writer(response.get());
     dbus::MessageWriter array_writer(NULL);
     dbus::MessageWriter dict_entry_writer(NULL);
     dbus::MessageWriter variant_writer(NULL);
 
     writer.OpenArray("{sv}", &array_writer);
 
     array_writer.OpenDictEntry(&dict_entry_writer);
     dict_entry_writer.AppendString(bluetooth_gatt_service::kUUIDProperty);
     dict_entry_writer.AppendVariantOfString(uuid_);
     array_writer.CloseContainer(&dict_entry_writer);
 
     array_writer.OpenDictEntry(&dict_entry_writer);
     dict_entry_writer.AppendString(bluetooth_gatt_service::kIncludesProperty);
     dict_entry_writer.OpenVariant("ao", &variant_writer);
     variant_writer.AppendArrayOfObjectPaths(includes_);
     dict_entry_writer.CloseContainer(&variant_writer);
     array_writer.CloseContainer(&dict_entry_writer);
 
     writer.CloseContainer(&array_writer);
 
-    response_sender.Run(response.Pass());
+    response_sender.Run(std::move(response));
   }
 
   // Called by dbus:: when a method is exported.
   void OnExported(const std::string& interface_name,
                   const std::string& method_name,
                   bool success) {
     LOG_IF(WARNING, !success) << "Failed to export " << interface_name << "."
                               << method_name;
   }
 
@@ skipping 41 matching lines @@
     const std::vector<dbus::ObjectPath>& includes) {
   if (!bluez::BluezDBusManager::Get()->IsUsingStub()) {
     return new BluetoothGattServiceServiceProviderImpl(bus, object_path, uuid,
                                                        includes);
   }
   return new FakeBluetoothGattServiceServiceProvider(object_path, uuid,
                                                      includes);
 }
 
 }  // namespace bluez