Index: device/bluetooth/bluetooth_remote_gatt_service_android.cc |
diff --git a/device/bluetooth/bluetooth_remote_gatt_service_android.cc b/device/bluetooth/bluetooth_remote_gatt_service_android.cc |
index 25087b733697c9bab9b56d0437bfcf121a425ae8..4889cb761c1fc2d4f8de1e47df7798d68d4abbdb 100644 |
--- a/device/bluetooth/bluetooth_remote_gatt_service_android.cc |
+++ b/device/bluetooth/bluetooth_remote_gatt_service_android.cc |
@@ -135,7 +135,7 @@ BluetoothRemoteGattServiceAndroid::GetCharacteristics() const { |
EnsureCharacteristicsCreated(); |
std::vector<device::BluetoothRemoteGattCharacteristic*> characteristics; |
for (const auto& map_iter : characteristics_) |
- characteristics.push_back(map_iter.second); |
+ characteristics.push_back(map_iter.second.get()); |
return characteristics; |
} |
@@ -150,9 +150,11 @@ BluetoothRemoteGattServiceAndroid::GetCharacteristic( |
const std::string& identifier) const { |
EnsureCharacteristicsCreated(); |
const auto& iter = characteristics_.find(identifier); |
- if (iter == characteristics_.end()) |
+ if (iter == characteristics_.end()) { |
return nullptr; |
- return iter->second; |
+ } |
+ |
+ return iter->second.get(); |
} |
void BluetoothRemoteGattServiceAndroid::CreateGattRemoteCharacteristic( |
@@ -165,14 +167,13 @@ void BluetoothRemoteGattServiceAndroid::CreateGattRemoteCharacteristic( |
jobject>& /* ChromeBluetoothDevice */ chrome_bluetooth_device) { |
std::string instance_id_string = |
base::android::ConvertJavaStringToUTF8(env, instance_id); |
+ DCHECK(!base::ContainsKey(characteristics_, instance_id_string)); |
+ auto characteristic = BluetoothRemoteGattCharacteristicAndroid::Create( |
+ adapter_, this, instance_id_string, bluetooth_gatt_characteristic_wrapper, |
+ chrome_bluetooth_device); |
- DCHECK(!characteristics_.contains(instance_id_string)); |
- |
- characteristics_.set( |
- instance_id_string, |
- BluetoothRemoteGattCharacteristicAndroid::Create( |
- adapter_, this, instance_id_string, |
- bluetooth_gatt_characteristic_wrapper, chrome_bluetooth_device)); |
+ characteristics_.insert( |
+ std::make_pair(instance_id_string, std::move(characteristic))); |
} |
BluetoothRemoteGattServiceAndroid::BluetoothRemoteGattServiceAndroid( |