| Index: device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
|
| diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
|
| index 5d7a4cfd8e1ebd14eccfd3440aa549c8ae4840b1..06967e96b0cbe53de89897d4b5d4b5cf0bdce11b 100644
|
| --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
|
| +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
|
| @@ -8,10 +8,10 @@
|
| #include <stdint.h>
|
|
|
| #include <memory>
|
| +#include <unordered_map>
|
|
|
| #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_characteristic.h"
|
| #include "device/bluetooth/bluetooth_remote_gatt_service.h"
|
| @@ -142,8 +142,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicAndroid
|
| std::vector<uint8_t> value_;
|
|
|
| // Map of descriptors, keyed by descriptor identifier.
|
| - base::ScopedPtrHashMap<std::string,
|
| - std::unique_ptr<BluetoothRemoteGattDescriptorAndroid>>
|
| + std::unordered_map<std::string,
|
| + std::unique_ptr<BluetoothRemoteGattDescriptorAndroid>>
|
| descriptors_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattCharacteristicAndroid);
|
|
|