| Index: device/bluetooth/bluetooth_device_win.h
|
| diff --git a/device/bluetooth/bluetooth_device_win.h b/device/bluetooth/bluetooth_device_win.h
|
| index f07652c89bf78063e43d61df7ceeb972e6020382..18a380c14e424385764f00ce20c07470b2368857 100644
|
| --- a/device/bluetooth/bluetooth_device_win.h
|
| +++ b/device/bluetooth/bluetooth_device_win.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| @@ -104,8 +105,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceWin : public BluetoothDevice {
|
| private:
|
| friend class BluetoothAdapterWin;
|
|
|
| - typedef ScopedVector<BluetoothServiceRecordWin> ServiceRecordList;
|
| -
|
| // Used by BluetoothAdapterWin to update the visible state during
|
| // discovery.
|
| void SetVisible(bool visible);
|
| @@ -120,13 +119,14 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceWin : public BluetoothDevice {
|
| // Checks if |service| still exist on device according to newly discovered
|
| // |service_state|.
|
| bool DoesGattServiceExist(
|
| - const ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>&
|
| - service_state,
|
| + const std::vector<std::unique_ptr<
|
| + BluetoothTaskManagerWin::ServiceRecordState>>& service_state,
|
| BluetoothRemoteGattService* service);
|
|
|
| // Updates the GATT services with the services stored in |service_state|.
|
| void UpdateGattServices(
|
| - const ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>&
|
| + const std::vector<
|
| + std::unique_ptr<BluetoothTaskManagerWin::ServiceRecordState>>&
|
| service_state);
|
|
|
| scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
|
| @@ -157,7 +157,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceWin : public BluetoothDevice {
|
| UUIDSet uuids_;
|
|
|
| // The service records retrieved from SDP.
|
| - ServiceRecordList service_record_list_;
|
| + std::vector<std::unique_ptr<BluetoothServiceRecordWin>> service_record_list_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceWin);
|
| };
|
|
|