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

device/bluetooth/bluetooth_adapter_android.cc

 // Copyright 2015 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_adapter_android.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 179 matching lines @@
   BluetoothDeviceAndroid* device_android;
 
   if (iter == devices_.end()) {
     // New device.
     is_new_device = true;
     device_android_owner.reset(
         BluetoothDeviceAndroid::Create(this, bluetooth_device_wrapper));
     device_android = device_android_owner.get();
   } else {
     // Existing device.
-    device_android = static_cast<BluetoothDeviceAndroid*>(iter->second);
+    device_android = static_cast<BluetoothDeviceAndroid*>(iter->second.get());
   }
   DCHECK(device_android);
 
   std::vector<std::string> advertised_uuids_strings;
   AppendJavaStringArrayToStringVector(env, advertised_uuids,
                                       &advertised_uuids_strings);
   BluetoothDevice::UUIDList advertised_bluetooth_uuids;
   for (std::string& uuid : advertised_uuids_strings) {
     advertised_bluetooth_uuids.push_back(BluetoothUUID(std::move(uuid)));
   }
 
   int8_t clamped_tx_power = BluetoothDevice::ClampPower(tx_power);
 
   device_android->UpdateAdvertisementData(
       BluetoothDevice::ClampPower(rssi), std::move(advertised_bluetooth_uuids),
       {} /* service_data */,
       // Android uses INT32_MIN to indicate no Advertised Tx Power.
       // https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getTxPowerLevel()
       tx_power == INT32_MIN ? nullptr : &clamped_tx_power);
 
   if (is_new_device) {
-    devices_.add(device_address, std::move(device_android_owner));
+    auto insertion = devices_.insert(
+        std::make_pair(device_address, std::move(device_android_owner)));
+    if (!insertion.second) {
+      VLOG(1) << "Insertion of device failed.";
+    }

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

I would make the loop below contingent on insertion.second being true.
insertion.first->second won't be equal to device_android_owner if there was
already an element with that device address.

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

Done.

     for (auto& observer : observers_)
-      observer.DeviceAdded(this, device_android);
+      observer.DeviceAdded(this, insertion.first->second.get());
   } else {
     for (auto& observer : observers_)
       observer.DeviceChanged(this, device_android);
   }
 }
 
 BluetoothAdapterAndroid::BluetoothAdapterAndroid() : weak_ptr_factory_(this) {
 }
 
 BluetoothAdapterAndroid::~BluetoothAdapterAndroid() {
@@ skipping 90 matching lines @@
   // TODO(scheib): Support filters crbug.com/490401
   NOTIMPLEMENTED();
   error_callback.Run(UMABluetoothDiscoverySessionOutcome::NOT_IMPLEMENTED);
 }
 
 void BluetoothAdapterAndroid::RemovePairingDelegateInternal(
     device::BluetoothDevice::PairingDelegate* pairing_delegate) {
 }
 
 }  // namespace device