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

device/bluetooth/bluetooth_advertisement.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_
 
 #include <stdint.h>
-
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "device/bluetooth/bluetooth_export.h"
 
 namespace device {
@@ skipping 31 matching lines @@
   using ManufacturerData = std::map<uint16_t, std::vector<uint8_t>>;
   using ServiceData = std::map<std::string, std::vector<uint8_t>>;
 
   // Structure that holds the data for an advertisement.
   class DEVICE_BLUETOOTH_EXPORT Data {
    public:
     explicit Data(AdvertisementType type);
     ~Data();
 
     AdvertisementType type() { return type_; }
-    scoped_ptr<UUIDList> service_uuids() { return service_uuids_.Pass(); }
+    scoped_ptr<UUIDList> service_uuids() { return std::move(service_uuids_); }
     scoped_ptr<ManufacturerData> manufacturer_data() {
-      return manufacturer_data_.Pass();
+      return std::move(manufacturer_data_);
     }
-    scoped_ptr<UUIDList> solicit_uuids() { return solicit_uuids_.Pass(); }
-    scoped_ptr<ServiceData> service_data() { return service_data_.Pass(); }
+    scoped_ptr<UUIDList> solicit_uuids() { return std::move(solicit_uuids_); }
+    scoped_ptr<ServiceData> service_data() { return std::move(service_data_); }
 
     void set_service_uuids(scoped_ptr<UUIDList> service_uuids) {
-      service_uuids_ = service_uuids.Pass();
+      service_uuids_ = std::move(service_uuids);
     }
     void set_manufacturer_data(scoped_ptr<ManufacturerData> manufacturer_data) {
-      manufacturer_data_ = manufacturer_data.Pass();
+      manufacturer_data_ = std::move(manufacturer_data);
     }
     void set_solicit_uuids(scoped_ptr<UUIDList> solicit_uuids) {
-      solicit_uuids_ = solicit_uuids.Pass();
+      solicit_uuids_ = std::move(solicit_uuids);
     }
     void set_service_data(scoped_ptr<ServiceData> service_data) {
-      service_data_ = service_data.Pass();
+      service_data_ = std::move(service_data);
     }
 
     void set_include_tx_power(bool include_tx_power) {
       include_tx_power_ = include_tx_power;
     }
 
    private:
     Data();
 
     AdvertisementType type_;
@@ skipping 40 matching lines @@
   // |observers_| are expected to outlive a BluetoothAdvertisement object.
   base::ObserverList<BluetoothAdvertisement::Observer> observers_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothAdvertisement);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_