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

device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc

 // Copyright 2015 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_le_advertisement_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/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_le_advertisement_service_provider.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ skipping 14 matching lines @@
       Delegate* delegate,
       AdvertisementType type,
       scoped_ptr<UUIDList> service_uuids,
       scoped_ptr<ManufacturerData> manufacturer_data,
       scoped_ptr<UUIDList> solicit_uuids,
       scoped_ptr<ServiceData> service_data)
       : origin_thread_id_(base::PlatformThread::CurrentId()),
         bus_(bus),
         delegate_(delegate),
         type_(type),
-        service_uuids_(service_uuids.Pass()),
-        manufacturer_data_(manufacturer_data.Pass()),
-        solicit_uuids_(solicit_uuids.Pass()),
-        service_data_(service_data.Pass()),
+        service_uuids_(std::move(service_uuids)),
+        manufacturer_data_(std::move(manufacturer_data)),
+        solicit_uuids_(std::move(solicit_uuids)),
+        service_data_(std::move(service_data)),
         weak_ptr_factory_(this) {
     DCHECK(bus);
     DCHECK(delegate);
 
     VLOG(1) << "Creating Bluetooth Advertisement: " << object_path_.value();
 
     object_path_ = object_path;
     exported_object_ = bus_->GetExportedObject(object_path_);
 
     // Export Bluetooth Advertisement interface methods.
@@ skipping 54 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 advertisement interface is supported.
     if (interface_name !=
         bluetooth_advertisement::kBluetoothAdvertisementInterface) {
       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 variant_writer(NULL);
 
     if (property_name == bluetooth_advertisement::kTypeProperty) {
       writer.OpenVariant("s", &variant_writer);
@@ skipping 20 matching lines @@
     } else if ((property_name ==
                 bluetooth_advertisement::kServiceDataProperty) &&
                service_data_) {
       writer.OpenVariant("o", &variant_writer);
       AppendServiceDataVariant(&variant_writer);
     } else {
       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));
     }
 
     writer.CloseContainer(&variant_writer);
-    response_sender.Run(response.Pass());
+    response_sender.Run(std::move(response));
   }
 
   // Called by dbus:: when the Bluetooth daemon fetches all properties of the
   // descriptor.
   void GetAll(dbus::MethodCall* method_call,
               dbus::ExportedObject::ResponseSender response_sender) {
     VLOG(2) << "BluetoothAdvertisementServiceProvider::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 advertisement interface is supported.
     if (interface_name !=
         bluetooth_advertisement::kBluetoothAdvertisementInterface) {
       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;
     }
 
-    response_sender.Run(CreateGetAllResponse(method_call).Pass());
+    response_sender.Run(CreateGetAllResponse(method_call));
   }
 
   // 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 29 matching lines @@
     VLOG(2) << "Returning descriptor value obtained from delegate.";
     scoped_ptr<dbus::Response> response =
         dbus::Response::FromMethodCall(method_call);
     dbus::MessageWriter writer(response.get());
     dbus::MessageWriter variant_writer(NULL);
 
     writer.OpenVariant("ay", &variant_writer);
     variant_writer.AppendArrayOfBytes(value.data(), value.size());
     writer.CloseContainer(&variant_writer);
 
-    response_sender.Run(response.Pass());
+    response_sender.Run(std::move(response));
   }
 
   void AppendArrayVariantOfStrings(dbus::MessageWriter* dict_writer,
                                    const UUIDList& strings) {
     dbus::MessageWriter strings_array_variant(nullptr);
     dict_writer->OpenVariant("as", &strings_array_variant);
     strings_array_variant.AppendArrayOfStrings(strings);
     dict_writer->CloseContainer(&strings_array_variant);
   }
 
@@ skipping 137 matching lines @@
     dbus::Bus* bus,
     const dbus::ObjectPath& object_path,
     Delegate* delegate,
     AdvertisementType type,
     scoped_ptr<UUIDList> service_uuids,
     scoped_ptr<ManufacturerData> manufacturer_data,
     scoped_ptr<UUIDList> solicit_uuids,
     scoped_ptr<ServiceData> service_data) {
   if (!bluez::BluezDBusManager::Get()->IsUsingStub()) {
     return make_scoped_ptr(new BluetoothAdvertisementServiceProviderImpl(
-        bus, object_path, delegate, type, service_uuids.Pass(),
-        manufacturer_data.Pass(), solicit_uuids.Pass(), service_data.Pass()));
+        bus, object_path, delegate, type, std::move(service_uuids),
+        std::move(manufacturer_data), std::move(solicit_uuids),
+        std::move(service_data)));
   } else {
     return make_scoped_ptr(
         new FakeBluetoothLEAdvertisementServiceProvider(object_path, delegate));
   }
 }
 
 }  // namespace bluez