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

Unified Diff: device/bluetooth/bluetooth_remote_gatt_service_android.h

Issue 2606823002: Remove base::ScopedPtrHashMap from device/. (Closed)
Patch Set: one last fix 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_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..38827024c5f7497dfe01888bd0fe7eef380fcb65 100644
--- a/device/bluetooth/bluetooth_remote_gatt_service_android.h
+++ b/device/bluetooth/bluetooth_remote_gatt_service_android.h
@@ -8,11 +8,11 @@
#include <map>
#include <memory>
#include <string>
+#include <unordered_map>
#include <vector>
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
-#include "base/containers/scoped_ptr_hash_map.h"
#include "base/macros.h"
#include "device/bluetooth/bluetooth_remote_gatt_service.h"
#include "device/bluetooth/bluetooth_uuid.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);

Powered by Google App Engine
This is Rietveld 408576698