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

device/bluetooth/bluetooth_device_win.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_win.h"
 
 #include <memory>
 #include <string>
 
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 221 matching lines @@
     return false;
   }
 
   // Checks service collection
   typedef base::ScopedPtrHashMap<std::string,
                                  std::unique_ptr<BluetoothServiceRecordWin>>
       ServiceRecordMap;
 
   UUIDSet new_services;
   ServiceRecordMap new_service_records;
-  for (ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>::const_iterator
-           iter = device_state.service_record_states.begin();
-       iter != device_state.service_record_states.end(); ++iter) {
+  for (auto& state : device_state.service_record_states) {
     BluetoothServiceRecordWin* service_record = new BluetoothServiceRecordWin(
-        address_, (*iter)->name, (*iter)->sdp_bytes, (*iter)->gatt_uuid);
+        address_, state->name, state->sdp_bytes, state->gatt_uuid);
     new_services.insert(service_record->uuid());
     new_service_records.set(
         service_record->uuid().canonical_value(),
         std::unique_ptr<BluetoothServiceRecordWin>(service_record));
   }
 
   // Check that no new services have been added or removed.
   if (uuids_ != new_services) {
     return false;
   }
@@ skipping 36 matching lines @@
 
 void BluetoothDeviceWin::SetVisible(bool visible) {
   visible_ = visible;
 }
 
 void BluetoothDeviceWin::UpdateServices(
     const BluetoothTaskManagerWin::DeviceState& device_state) {
   uuids_.clear();
   service_record_list_.clear();
 
-  for (ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>::const_iterator
-           iter = device_state.service_record_states.begin();
-       iter != device_state.service_record_states.end(); ++iter) {
-    BluetoothServiceRecordWin* service_record =
-        new BluetoothServiceRecordWin(device_state.address, (*iter)->name,
-                                      (*iter)->sdp_bytes, (*iter)->gatt_uuid);
+  for (auto& state : device_state.service_record_states) {
+    BluetoothServiceRecordWin* service_record = new BluetoothServiceRecordWin(
+        device_state.address, state->name, state->sdp_bytes, state->gatt_uuid);
     service_record_list_.push_back(service_record);
     uuids_.insert(service_record->uuid());
   }
 
   if (!device_state.is_bluetooth_classic())
     UpdateGattServices(device_state.service_record_states);
 }
 
 bool BluetoothDeviceWin::IsGattServiceDiscovered(BluetoothUUID& uuid,
                                                  uint16_t attribute_handle) {
   GattServiceMap::iterator it = gatt_services_.begin();
   for (; it != gatt_services_.end(); it++) {
     uint16_t it_att_handle =
         static_cast<BluetoothRemoteGattServiceWin*>(it->second)
             ->GetAttributeHandle();
     BluetoothUUID it_uuid = it->second->GetUUID();
     if (attribute_handle == it_att_handle && uuid == it_uuid) {
       return true;
     }
   }
   return false;
 }
 
 bool BluetoothDeviceWin::DoesGattServiceExist(
-    const ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>&
-        service_state,
+    const std::vector<std::unique_ptr<
+        BluetoothTaskManagerWin::ServiceRecordState>>& service_state,
     BluetoothRemoteGattService* service) {
   uint16_t attribute_handle =
       static_cast<BluetoothRemoteGattServiceWin*>(service)
           ->GetAttributeHandle();
   BluetoothUUID uuid = service->GetUUID();
-  ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>::const_iterator it =
-      service_state.begin();
-  for (; it != service_state.end(); ++it) {
-    if (attribute_handle == (*it)->attribute_handle && uuid == (*it)->gatt_uuid)
+  for (auto& state : service_state) {
+    if (attribute_handle == state->attribute_handle && uuid == state->gatt_uuid)
       return true;
   }
   return false;
 }
 
 void BluetoothDeviceWin::UpdateGattServices(
-    const ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>&
+    const std::vector<
+        std::unique_ptr<BluetoothTaskManagerWin::ServiceRecordState>>&
         service_state) {
   // First, remove no longer exist GATT service.
   {
     std::vector<std::string> to_be_removed_services;
     for (const auto& gatt_service : gatt_services_) {
       if (!DoesGattServiceExist(service_state, gatt_service.second)) {
         to_be_removed_services.push_back(gatt_service.first);
       }
     }
     for (const auto& service : to_be_removed_services) {
       gatt_services_.take_and_erase(service);
     }
     // Update previously discovered services.
     for (auto gatt_service : gatt_services_) {
       static_cast<BluetoothRemoteGattServiceWin*>(gatt_service.second)
           ->Update();
     }
   }
 
   // Return if no new services have been added.
   if (gatt_services_.size() == service_state.size())
     return;
 
   // Add new services.
-  for (ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>::const_iterator
-           it = service_state.begin();
-       it != service_state.end(); ++it) {
-    if (!IsGattServiceDiscovered((*it)->gatt_uuid, (*it)->attribute_handle)) {
+  for (auto& state : service_state) {
+    if (!IsGattServiceDiscovered(state->gatt_uuid, state->attribute_handle)) {
       BluetoothRemoteGattServiceWin* primary_service =
-          new BluetoothRemoteGattServiceWin(this, (*it)->path, (*it)->gatt_uuid,
-                                            (*it)->attribute_handle, true,
+          new BluetoothRemoteGattServiceWin(this, state->path, state->gatt_uuid,
+                                            state->attribute_handle, true,
                                             nullptr, ui_task_runner_);
       gatt_services_.add(
           primary_service->GetIdentifier(),
           std::unique_ptr<BluetoothRemoteGattService>(primary_service));
       adapter_->NotifyGattServiceAdded(primary_service);
     }
   }
 
   adapter_->NotifyGattServicesDiscovered(this);
 }
 
 }  // namespace device