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

device/bluetooth/test/mock_bluetooth_adapter.cc

 // Copyright (c) 2012 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/test/mock_bluetooth_adapter.h"
 
 #include <memory>
 #include <utility>
 
 #include "build/build_config.h"
@@ skipping 50 matching lines @@
                                      error_callback);
 }
 
 void MockBluetoothAdapter::AddMockDevice(
     std::unique_ptr<MockBluetoothDevice> mock_device) {
   mock_devices_.push_back(std::move(mock_device));
 }
 
 std::unique_ptr<MockBluetoothDevice> MockBluetoothAdapter::RemoveMockDevice(
     const std::string& address) {
-  for (auto it = mock_devices_.begin(); it != mock_devices_.end(); ++it) {
-    if ((*it)->GetAddress() != address) {
+  for (auto& device : mock_devices_) {
+    if (device->GetAddress() != address) {
       continue;
     }
-    std::unique_ptr<MockBluetoothDevice> removed_device(*it);
-    mock_devices_.weak_erase(it);
-    return removed_device;
+    std::unique_ptr<MockBluetoothDevice> removed_device = std::move(device);
+    auto it = std::find(mock_devices_.begin(), mock_devices_.end(), device);
+    if (it != mock_devices_.end()) {
+      mock_devices_.erase(it);
+      return removed_device;
+    }
   }
   return nullptr;
 }
 
 BluetoothAdapter::ConstDeviceList MockBluetoothAdapter::GetConstMockDevices() {
   BluetoothAdapter::ConstDeviceList devices;
-  for (auto* it : mock_devices_) {
-    devices.push_back(it);
+  for (auto& device : mock_devices_) {
+    devices.push_back(device.get());
   }
   return devices;
 }
 
 BluetoothAdapter::DeviceList MockBluetoothAdapter::GetMockDevices() {
   BluetoothAdapter::DeviceList devices;
-  for (auto* it : mock_devices_) {
-    devices.push_back(it);
+  for (auto& device : mock_devices_) {
+    devices.push_back(device.get());
   }
   return devices;
 }
 
 void MockBluetoothAdapter::RegisterAdvertisement(
     std::unique_ptr<BluetoothAdvertisement::Data> advertisement_data,
     const CreateAdvertisementCallback& callback,
     const AdvertisementErrorCallback& error_callback) {
   callback.Run(new MockBluetoothAdvertisement);
 }
 
 #if defined(OS_CHROMEOS) || defined(OS_LINUX)
 void MockBluetoothAdapter::SetAdvertisingInterval(
     const base::TimeDelta& min,
     const base::TimeDelta& max,
     const base::Closure& callback,
     const AdvertisementErrorCallback& error_callback) {}
 #endif
 
 }  // namespace device