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

device/bluetooth/bluez/bluetooth_device_bluez.cc

 // Copyright 2013 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/bluez/bluetooth_device_bluez.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 162 matching lines @@
       ->GetBluetoothGattServiceClient()
       ->RemoveObserver(this);
 
   // Copy the GATT services list here and clear the original so that when we
   // send GattServiceRemoved(), GetGattServices() returns no services.
   GattServiceMap gatt_services_swapped;
   gatt_services_swapped.swap(gatt_services_);
   for (const auto& iter : gatt_services_swapped) {
     DCHECK(adapter());
     adapter()->NotifyGattServiceRemoved(
-        static_cast<BluetoothRemoteGattServiceBlueZ*>(iter.second));
+        static_cast<BluetoothRemoteGattServiceBlueZ*>(iter.second.get()));
   }
 }
 
 uint32_t BluetoothDeviceBlueZ::GetBluetoothClass() const {
   bluez::BluetoothDeviceClient::Properties* properties =
       bluez::BluezDBusManager::Get()->GetBluetoothDeviceClient()->GetProperties(
           object_path_);
   DCHECK(properties);
 
   return properties->bluetooth_class.value();
@@ skipping 474 matching lines @@
           ->GetBluetoothGattServiceClient()
           ->GetProperties(object_path);
   DCHECK(properties);
   if (properties->device.value() != object_path_) {
     VLOG(2) << "Remote GATT service does not belong to this device.";
     return;
   }
 
   VLOG(1) << "Adding new remote GATT service for device: " << GetAddress();
 
-  BluetoothRemoteGattServiceBlueZ* service =
-      new BluetoothRemoteGattServiceBlueZ(adapter(), this, object_path);
-
-  gatt_services_.set(service->GetIdentifier(),
-                     std::unique_ptr<BluetoothRemoteGattService>(service));
-  DCHECK(service->object_path() == object_path);
-  DCHECK(service->GetUUID().IsValid());
+  std::unique_ptr<device::BluetoothRemoteGattService> service(
+      new BluetoothRemoteGattServiceBlueZ(adapter(), this, object_path));
+  auto insertion = gatt_services_.insert(
+      std::make_pair(service->GetIdentifier(), std::move(service)));
+  if (!insertion.second) {
+    // insertion failed.
+    VLOG(1) << "Insertion of new remote GATT service failed for device: "
+            << GetAddress();
+    return;
+  }
+  BluetoothRemoteGattServiceBlueZ* bluez =
+      static_cast<BluetoothRemoteGattServiceBlueZ*>(
+          insertion.first->second.get());
+  DCHECK(bluez->object_path() == object_path);
+  DCHECK(bluez->GetUUID().IsValid());
 
   DCHECK(adapter());
-  adapter()->NotifyGattServiceAdded(service);
+  adapter()->NotifyGattServiceAdded(bluez);
 }
 
 void BluetoothDeviceBlueZ::GattServiceRemoved(
     const dbus::ObjectPath& object_path) {
-  GattServiceMap::const_iterator iter =
-      gatt_services_.find(object_path.value());
+  auto iter = gatt_services_.find(object_path.value());
   if (iter == gatt_services_.end()) {
     VLOG(3) << "Unknown GATT service removed: " << object_path.value();
     return;
   }
+  // Hold onto the service so that we can erase it safely.
+  auto scoped_service = std::move(iter->second);
+  gatt_services_.erase(iter);
+  discovery_complete_notified_.erase(scoped_service.get());
 
-  BluetoothRemoteGattServiceBlueZ* service =
-      static_cast<BluetoothRemoteGattServiceBlueZ*>(iter->second);
-
+  BluetoothRemoteGattServiceBlueZ* bluez =
+      static_cast<BluetoothRemoteGattServiceBlueZ*>(scoped_service.get());
+  DCHECK(bluez->object_path() == object_path);
   VLOG(1) << "Removing remote GATT service with UUID: '"
-          << service->GetUUID().canonical_value()
+          << scoped_service->GetUUID().canonical_value()
           << "' from device: " << GetAddress();
 
-  DCHECK(service->object_path() == object_path);
-  std::unique_ptr<BluetoothRemoteGattService> scoped_service =
-      gatt_services_.take_and_erase(iter->first);
-
   DCHECK(adapter());
-  discovery_complete_notified_.erase(service);
-  adapter()->NotifyGattServiceRemoved(service);
+  adapter()->NotifyGattServiceRemoved(scoped_service.get());
 }
 
 void BluetoothDeviceBlueZ::UpdateGattServices(
     const dbus::ObjectPath& object_path) {
   if (object_path != object_path_) {
     // No need to update map if update is for a different device.
     return;
   }
 
   DCHECK(IsGattServicesDiscoveryComplete());
@@ skipping 221 matching lines @@
 void BluetoothDeviceBlueZ::OnForgetError(const ErrorCallback& error_callback,
                                          const std::string& error_name,
                                          const std::string& error_message) {
   LOG(WARNING) << object_path_.value()
                << ": Failed to remove device: " << error_name << ": "
                << error_message;
   error_callback.Run();
 }
 
 }  // namespace bluez