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

device/bluetooth/bluetooth_device.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/bluetooth_device.h"
 
 #include <iterator>
 #include <memory>
 #include <string>
 
@@ skipping 51 matching lines @@
 void BluetoothDevice::DeviceUUIDs::UpdateDeviceUUIDs() {
   device_uuids_.clear();
   std::set_union(advertised_uuids_.begin(), advertised_uuids_.end(),
                  service_uuids_.begin(), service_uuids_.end(),
                  std::inserter(device_uuids_, device_uuids_.begin()));
 }
 
 BluetoothDevice::BluetoothDevice(BluetoothAdapter* adapter)
     : adapter_(adapter),
       gatt_services_discovery_complete_(false),
+      gatt_services_shutting_down_(false),
       last_update_time_(base::Time()) {}
 
 BluetoothDevice::~BluetoothDevice() {
   for (BluetoothGattConnection* connection : gatt_connections_) {
     connection->InvalidateConnectionReference();
   }
+  gatt_services_shutting_down_ = true;
+  gatt_services_.clear();
 }
 
 BluetoothDevice::ConnectionInfo::ConnectionInfo()
     : rssi(kUnknownPower),
       transmit_power(kUnknownPower),
       max_transmit_power(kUnknownPower) {}
 
 BluetoothDevice::ConnectionInfo::ConnectionInfo(
     int rssi, int transmit_power, int max_transmit_power)
     : rssi(rssi),
@@ skipping 275 matching lines @@
   gatt_services_discovery_complete_ = complete;
 }
 
 bool BluetoothDevice::IsGattServicesDiscoveryComplete() const {
   return gatt_services_discovery_complete_;
 }
 
 std::vector<BluetoothRemoteGattService*> BluetoothDevice::GetGattServices()
     const {
   std::vector<BluetoothRemoteGattService*> services;
+  if (gatt_services_shutting_down_)
+    return services;
   for (const auto& iter : gatt_services_)
-    services.push_back(iter.second);
+    services.push_back(iter.second.get());
   return services;
 }
 
 BluetoothRemoteGattService* BluetoothDevice::GetGattService(
     const std::string& identifier) const {
-  return gatt_services_.get(identifier);
+  if (gatt_services_shutting_down_)
+    return nullptr;
+  auto it = gatt_services_.find(identifier);
+  if (it == gatt_services_.end())
+    return nullptr;
+  return it->second.get();
 }
 
 // static
 std::string BluetoothDevice::CanonicalizeAddress(const std::string& address) {
   std::string canonicalized = address;
   if (address.size() == 12) {
     // Might be an address in the format "1A2B3C4D5E6F". Add separators.
     for (size_t i = 2; i < canonicalized.size(); i += 3) {
       canonicalized.insert(i, ":");
     }
@@ skipping 124 matching lines @@
   if (power < INT8_MIN) {
     return INT8_MIN;
   }
   if (power > INT8_MAX) {
     return INT8_MAX;
   }
   return static_cast<int8_t>(power);
 }
 
 }  // namespace device