Remove base::ScopedPtrHashMap from device/.

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>
 
 #include "base/memory/ptr_util.h"
-#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_gatt_connection.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
 #include "device/bluetooth/string_util_icu.h"
 #include "grit/bluetooth_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace device {
 
-BluetoothDevice::DeviceUUIDs::DeviceUUIDs() {}
+BluetoothDevice::DeviceUUIDs::DeviceUUIDs() = default;
 
-BluetoothDevice::DeviceUUIDs::~DeviceUUIDs() {}
+BluetoothDevice::DeviceUUIDs::~DeviceUUIDs() = default;
+
+BluetoothDevice::DeviceUUIDs::DeviceUUIDs(const DeviceUUIDs& other) = default;
+
+BluetoothDevice::DeviceUUIDs& BluetoothDevice::DeviceUUIDs::operator=(
+    const DeviceUUIDs& other) = default;
 
 void BluetoothDevice::DeviceUUIDs::ReplaceAdvertisedUUIDs(
     UUIDList new_advertised_uuids) {
   advertised_uuids_.clear();
   for (auto& it : new_advertised_uuids) {
     advertised_uuids_.insert(std::move(it));
   }
   UpdateDeviceUUIDs();
 }
 
 void BluetoothDevice::DeviceUUIDs::ClearAdvertisedUUIDs() {
   advertised_uuids_.clear();
   UpdateDeviceUUIDs();
 }
 
 void BluetoothDevice::DeviceUUIDs::ReplaceServiceUUIDs(
     const GattServiceMap& gatt_services) {
   service_uuids_.clear();
-  for (const auto& gatt_service_pair : gatt_services) {
+  for (const auto& gatt_service_pair : gatt_services)
     service_uuids_.insert(gatt_service_pair.second->GetUUID());
-  }
   UpdateDeviceUUIDs();
 }
 
 void BluetoothDevice::DeviceUUIDs::ClearServiceUUIDs() {
   service_uuids_.clear();
   UpdateDeviceUUIDs();
 }
 
 const BluetoothDevice::UUIDSet& BluetoothDevice::DeviceUUIDs::GetUUIDs() const {
   return device_uuids_;
@@ skipping 304 matching lines @@
 }
 
 bool BluetoothDevice::IsGattServicesDiscoveryComplete() const {
   return gatt_services_discovery_complete_;
 }
 
 std::vector<BluetoothRemoteGattService*> BluetoothDevice::GetGattServices()
     const {
   std::vector<BluetoothRemoteGattService*> 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);
+  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