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

device/bluetooth/bluetooth_low_energy_win.cc

Index: device/bluetooth/bluetooth_low_energy_win.cc
diff --git a/device/bluetooth/bluetooth_low_energy_win.cc b/device/bluetooth/bluetooth_low_energy_win.cc
index 29abbad9eef86626b24e792fdd7cacd6d2078dbb..f5234e31426d02c5a51aa5fa48af19f83a261dd2 100644
--- a/device/bluetooth/bluetooth_low_energy_win.cc
+++ b/device/bluetooth/bluetooth_low_energy_win.cc
@@ -372,7 +372,7 @@ bool CollectBluetoothLowEnergyDeviceStatus(
 
 bool CollectBluetoothLowEnergyDeviceServices(
     const base::FilePath& device_path,
-    ScopedVector<BluetoothLowEnergyServiceInfo>* services,
+    std::vector<std::unique_ptr<BluetoothLowEnergyServiceInfo>>* services,
     std::string* error) {
   base::File file(device_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
   if (!file.IsValid()) {
@@ -408,11 +408,11 @@ bool CollectBluetoothLowEnergyDeviceServices(
 
   for (USHORT i = 0; i < actual_length; ++i) {
     BTH_LE_GATT_SERVICE& gatt_service(gatt_services.get()[i]);
-    BluetoothLowEnergyServiceInfo* service_info =
-        new BluetoothLowEnergyServiceInfo();
+    std::unique_ptr<BluetoothLowEnergyServiceInfo> service_info(
+        new BluetoothLowEnergyServiceInfo());
     service_info->uuid = gatt_service.ServiceUuid;
     service_info->attribute_handle = gatt_service.AttributeHandle;
-    services->push_back(service_info);
+    services->push_back(std::move(service_info));
   }
 
   return true;
@@ -542,7 +542,7 @@ HRESULT OpenBluetoothLowEnergyDevices(GUID device_interface_guid,
 // Gatt service devices.
 bool EnumerateKnownBLEOrBLEGattServiceDevices(
     GUID guid,
-    ScopedVector<BluetoothLowEnergyDeviceInfo>* devices,
+    std::vector<std::unique_ptr<BluetoothLowEnergyDeviceInfo>>* devices,
     std::string* error) {
   ScopedDeviceInfoSetHandle info_set_handle;
   HRESULT hr = OpenBluetoothLowEnergyDevices(guid, &info_set_handle);
@@ -678,7 +678,8 @@ bool BluetoothLowEnergyWrapper::IsBluetoothLowEnergySupported() {
 }
 
 bool BluetoothLowEnergyWrapper::EnumerateKnownBluetoothLowEnergyDevices(
-    ScopedVector<BluetoothLowEnergyDeviceInfo>* devices,
+    std::vector<std::unique_ptr<BluetoothLowEnergyDeviceInfo>>* devices,
+

[Reilly Grant (use Gerrit), 2016/12/21 22:25:14]

stray newline?

[dougt, 2016/12/22 01:18:03]

Done.

     std::string* error) {
   if (!IsBluetoothLowEnergySupported()) {
     *error = kPlatformNotSupported;
@@ -691,7 +692,8 @@ bool BluetoothLowEnergyWrapper::EnumerateKnownBluetoothLowEnergyDevices(
 
 bool BluetoothLowEnergyWrapper::
     EnumerateKnownBluetoothLowEnergyGattServiceDevices(
-        ScopedVector<BluetoothLowEnergyDeviceInfo>* devices,
+        std::vector<std::unique_ptr<BluetoothLowEnergyDeviceInfo>>* devices,
+

[Reilly Grant (use Gerrit), 2016/12/21 22:25:14]

stray newline?

[dougt, 2016/12/22 01:18:03]

Done.

         std::string* error) {
   if (!IsBluetoothLowEnergySupported()) {
     *error = kPlatformNotSupported;
@@ -704,7 +706,8 @@ bool BluetoothLowEnergyWrapper::
 
 bool BluetoothLowEnergyWrapper::EnumerateKnownBluetoothLowEnergyServices(
     const base::FilePath& device_path,
-    ScopedVector<BluetoothLowEnergyServiceInfo>* services,
+    std::vector<std::unique_ptr<BluetoothLowEnergyServiceInfo>>* services,
+

[Reilly Grant (use Gerrit), 2016/12/21 22:25:14]

stray newline?

[dougt, 2016/12/22 01:18:03]

Done.

     std::string* error) {
   if (!IsBluetoothLowEnergySupported()) {
     *error = kPlatformNotSupported;