Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map

device/bluetooth/bluez/bluetooth_device_bluez.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_
 #define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 31 matching lines @@
 // thread.
 class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceBlueZ
     : public device::BluetoothDevice,
       public bluez::BluetoothGattServiceClient::Observer {
  public:
   using GetServiceRecordsCallback =
       base::Callback<void(const std::vector<BluetoothServiceRecordBlueZ>&)>;
   using GetServiceRecordsErrorCallback =
       base::Callback<void(BluetoothServiceRecordBlueZ::ErrorCode)>;
 
+  BluetoothDeviceBlueZ(
+      BluetoothAdapterBlueZ* adapter,
+      const dbus::ObjectPath& object_path,
+      scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+      scoped_refptr<device::BluetoothSocketThread> socket_thread);
+  ~BluetoothDeviceBlueZ() override;
+
   // BluetoothDevice override
   uint32_t GetBluetoothClass() const override;
   device::BluetoothTransport GetType() const override;
   std::string GetAddress() const override;
   VendorIDSource GetVendorIDSource() const override;
   uint16_t GetVendorID() const override;
   uint16_t GetProductID() const override;
   uint16_t GetDeviceID() const override;
   uint16_t GetAppearance() const override;
   base::Optional<std::string> GetName() const override;
@@ skipping 89 matching lines @@
   // Returns the adapter which owns this device instance.
   BluetoothAdapterBlueZ* adapter() const;
 
  protected:
   // BluetoothDevice override
   void CreateGattConnectionImpl() override;
   void DisconnectGatt() override;
 
  private:
   friend class BluetoothAdapterBlueZ;
-
-  BluetoothDeviceBlueZ(
-      BluetoothAdapterBlueZ* adapter,
-      const dbus::ObjectPath& object_path,
-      scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
-      scoped_refptr<device::BluetoothSocketThread> socket_thread);
-  ~BluetoothDeviceBlueZ() override;
-
   // bluez::BluetoothGattServiceClient::Observer overrides
   void GattServiceAdded(const dbus::ObjectPath& object_path) override;
   void GattServiceRemoved(const dbus::ObjectPath& object_path) override;
 
   // Called once all services have been discovered. Invokes
   // NotifyGattDiscoveryComplete() for services for which we haven't notified
   // before e.g. if a services is exposed during construction but services
   // haven't been resolved yet..
   void UpdateGattServices(const dbus::ObjectPath& object_path);
 
@@ skipping 95 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothDeviceBlueZ> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceBlueZ);
 };
 
 }  // namespace bluez
 
 #endif  // DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_