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

Unified Diff: device/bluetooth/bluetooth_device_win.h

Issue 2567903004: Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map (Closed)
Patch Set: Mac bustage Created 4 years 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
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..fd2cba7fd3bd3ec221921461709c4ec972ad923c 100644
--- a/device/bluetooth/bluetooth_device_win.h
+++ b/device/bluetooth/bluetooth_device_win.h
@@ -104,7 +104,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceWin : public BluetoothDevice {
private:
friend class BluetoothAdapterWin;
- typedef ScopedVector<BluetoothServiceRecordWin> ServiceRecordList;
+ using ServiceRecordList =
+ std::vector<std::unique_ptr<BluetoothServiceRecordWin>>;
// Used by BluetoothAdapterWin to update the visible state during
// discovery.
@@ -120,13 +121,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_;

Powered by Google App Engine
This is Rietveld 408576698