Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1820)

Unified Diff: device/bluetooth/bluetooth_low_energy_win.h

Issue 2614753004: Remove ScopedVector from bluetooth. (Closed)
Patch Set: last win bits Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_discovery_filter.cc ('k') | device/bluetooth/bluetooth_low_energy_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..da00758ebf195ee956fc1939176b8537fa6f24d2 100644
--- a/device/bluetooth/bluetooth_low_energy_win.h
+++ b/device/bluetooth/bluetooth_low_energy_win.h
@@ -9,10 +9,10 @@
#include <stdint.h>
#include <memory>
+#include <vector>
#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 +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,
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|.
« no previous file with comments | « device/bluetooth/bluetooth_discovery_filter.cc ('k') | device/bluetooth/bluetooth_low_energy_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698