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

device/bluetooth/bluetooth_remote_gatt_service_android.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_remote_gatt_service_android.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 117 matching lines @@
 
 device::BluetoothDevice* BluetoothRemoteGattServiceAndroid::GetDevice() const {
   return device_;
 }
 
 std::vector<device::BluetoothRemoteGattCharacteristic*>
 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;
 }
 
 std::vector<device::BluetoothRemoteGattService*>
 BluetoothRemoteGattServiceAndroid::GetIncludedServices() const {
   NOTIMPLEMENTED();
   return std::vector<device::BluetoothRemoteGattService*>();
 }
 
 device::BluetoothRemoteGattCharacteristic*
 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(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const JavaParamRef<jstring>& instance_id,
     const JavaParamRef<jobject>& /* BluetoothGattCharacteristicWrapper */
     bluetooth_gatt_characteristic_wrapper,
     const JavaParamRef<
         jobject>& /* ChromeBluetoothDevice */ chrome_bluetooth_device) {
   std::string instance_id_string =
       base::android::ConvertJavaStringToUTF8(env, instance_id);
 
-  DCHECK(!characteristics_.contains(instance_id_string));
+  // DCHECK(characteristics_.find(instance_id_string) != nullptr);

[Reilly Grant (use Gerrit), 2016/12/21 22:25:15]

Same comment as previous.

[dougt, 2016/12/22 01:18:03]

Done.

 
-  characteristics_.set(
-      instance_id_string,
-      BluetoothRemoteGattCharacteristicAndroid::Create(
-          adapter_, this, instance_id_string,
-          bluetooth_gatt_characteristic_wrapper, chrome_bluetooth_device));
+  auto characteristic = 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(
     BluetoothAdapterAndroid* adapter,
     BluetoothDeviceAndroid* device,
     const std::string& instance_id)
     : adapter_(adapter), device_(device), instance_id_(instance_id) {}
 
 void BluetoothRemoteGattServiceAndroid::EnsureCharacteristicsCreated() const {
   if (!characteristics_.empty())
     return;
 
   // Java call
   Java_ChromeBluetoothRemoteGattService_createCharacteristics(
       AttachCurrentThread(), j_service_);
 }
 
 }  // namespace device