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

device/bluetooth/bluetooth_low_energy_win.h

Index: device/bluetooth/bluetooth_low_energy_win.h
diff --git a/device/bluetooth/bluetooth_low_energy_win.h b/device/bluetooth/bluetooth_low_energy_win.h
index 5e819a9c918a6b8d597c188f271fa8a92c17933e..49357f05e60014e06e57105e53a143c5c756b919 100644
--- a/device/bluetooth/bluetooth_low_energy_win.h
+++ b/device/bluetooth/bluetooth_low_energy_win.h
@@ -134,7 +134,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyWrapper {
   // Note: This function returns an error if Bluetooth Low Energy is not
   // supported on this Windows platform.
   virtual bool EnumerateKnownBluetoothLowEnergyDevices(
-      ScopedVector<BluetoothLowEnergyDeviceInfo>* devices,
+      std::vector<std::unique_ptr<BluetoothLowEnergyDeviceInfo>> devices,

[scheib, 2016/12/13 00:51:06]

Looks like the parameter 'devices' is passed in to be modified, should be a
pointer to the vector<...> then. Ditto the next 2.

       std::string* error);
 
   // Enumerates the list of known Bluetooth LE GATT service devices on this
@@ -145,7 +145,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyWrapper {
   // Note: This function returns an error if Bluetooth Low Energy is not
   // supported on this Windows platform.
   virtual bool EnumerateKnownBluetoothLowEnergyGattServiceDevices(
-      ScopedVector<BluetoothLowEnergyDeviceInfo>* devices,
+      std::vector<std::unique_ptr<BluetoothLowEnergyDeviceInfo>> devices,
       std::string* error);
 
   // Enumerates the list of known (i.e. cached) GATT services for a given
@@ -156,7 +156,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyWrapper {
   // supported on this Windows platform.
   virtual bool EnumerateKnownBluetoothLowEnergyServices(
       const base::FilePath& device_path,
-      ScopedVector<BluetoothLowEnergyServiceInfo>* services,
+      std::vector<std::unique_ptr<BluetoothLowEnergyServiceInfo>>& services,
       std::string* error);
 
   // Reads characteristics of |service| with service device path |service_path|.