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..aeb34df0c5f7ad6d10ea6efe9cb5da2377d6b95c 100644 |
--- a/device/bluetooth/bluetooth_low_energy_win.h |
+++ b/device/bluetooth/bluetooth_low_energy_win.h |
@@ -12,7 +12,6 @@ |
#include "base/files/file_path.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_vector.h" |
#include "base/optional.h" |
#include "device/bluetooth/bluetooth_export.h" |
#include "device/bluetooth/bluetooth_low_energy_defs_win.h" |
@@ -134,7 +133,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, |
std::string* error); |
// Enumerates the list of known Bluetooth LE GATT service devices on this |
@@ -145,7 +144,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 +155,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|. |