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

device/bluetooth/bluetooth_low_energy_win.h

 // Copyright 2014 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_LOW_ENERGY_WIN_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_WIN_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 116 matching lines @@
 
   // Returns true only on Windows platforms supporting Bluetooth Low Energy.
   virtual bool IsBluetoothLowEnergySupported();
 
   // Enumerates the list of known (i.e. already paired) Bluetooth LE devices on
   // this machine. In case of error, returns false and sets |error| with an
   // error message describing the problem.
   // 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
   // machine (a Bluetooth LE device usually has more than one GATT
   // services that each of them has a device interface on the machine). In case
   // of error, returns false and sets |error| with an error message describing
   // the problem.
   // 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
   // Bluetooth LE device |device_path| into |services|. In case of error,
   // returns false and sets |error| with an error message describing the
   // problem.
   // Note: This function returns an error if Bluetooth Low Energy is not
   // 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|.
   // The result will be stored in |*out_included_characteristics| and
   // |*out_counts|.
   virtual HRESULT ReadCharacteristicsOfAService(
       base::FilePath& service_path,
       const PBTH_LE_GATT_SERVICE service,
       std::unique_ptr<BTH_LE_GATT_CHARACTERISTIC>* out_included_characteristics,
       USHORT* out_counts);
@@ skipping 43 matching lines @@
 
  protected:
   BluetoothLowEnergyWrapper();
   virtual ~BluetoothLowEnergyWrapper();
 };
 
 }  // namespace win
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_WIN_H_