device/bluetooth/bluetooth_remote_gatt_service_android.h - Issue 2567903004: Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluetooth_remote_gatt_service_android.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:

Index: device/bluetooth/bluetooth_remote_gatt_service_android.h

diff --git a/device/bluetooth/bluetooth_remote_gatt_service_android.h b/device/bluetooth/bluetooth_remote_gatt_service_android.h

index ef3be1bc075ac5b3f6fd512c4da59f7c0bcdfed4..2a868e71aa08cecf8107352c682315e1f6098164 100644

--- a/device/bluetooth/bluetooth_remote_gatt_service_android.h

+++ b/device/bluetooth/bluetooth_remote_gatt_service_android.h

@@ -109,9 +109,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceAndroid

std::string instance_id_;

// Map of characteristics, keyed by characteristic identifier.

- base::ScopedPtrHashMap<

- std::string,

- std::unique_ptr<BluetoothRemoteGattCharacteristicAndroid>>

+ std::unordered_map<std::string,

+ std::unique_ptr<BluetoothRemoteGattCharacteristicAndroid>>

characteristics_;

DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattServiceAndroid);