Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map

device/bluetooth/bluetooth_remote_gatt_characteristic_android.h

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..ab2bf94075838d51c9b057669a9d45e28ca95e71 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.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);