Remove ScopedVector from bluetooth.

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/logging.h"
 #include "base/memory/ptr_util.h"
-#include "base/memory/scoped_vector.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "device/bluetooth/bluetooth_adapter_win.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service_win.h"
 #include "device/bluetooth/bluetooth_service_record_win.h"
 #include "device/bluetooth/bluetooth_socket_thread.h"
 #include "device/bluetooth/bluetooth_socket_win.h"
 #include "device/bluetooth/bluetooth_task_manager_win.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
@@ skipping 185 matching lines @@
 
 void BluetoothDeviceWin::CreateGattConnection(
       const GattConnectionCallback& callback,
       const ConnectErrorCallback& error_callback) {
   // TODO(armansito): Implement.
   error_callback.Run(ERROR_UNSUPPORTED_DEVICE);
 }
 
 const BluetoothServiceRecordWin* BluetoothDeviceWin::GetServiceRecord(
     const device::BluetoothUUID& uuid) const {
-  for (auto iter = service_record_list_.begin();
-       iter != service_record_list_.end(); ++iter) {
-    if ((*iter)->uuid() == uuid)
-      return *iter;
-  }
-  return NULL;
+  for (const auto& record : service_record_list_)
+    if (record->uuid() == uuid)
+      return record.get();
+
+  return nullptr;
 }
 
 bool BluetoothDeviceWin::IsEqual(
     const BluetoothTaskManagerWin::DeviceState& device_state) {
   if (address_ != device_state.address || name_ != device_state.name ||
       bluetooth_class_ != device_state.bluetooth_class ||
       visible_ != device_state.visible ||
       connected_ != device_state.connected ||
       paired_ != device_state.authenticated) {
     return false;
@@ skipping 10 matching lines @@
     new_services.insert(service_record->uuid());
     new_service_records[service_record->uuid().canonical_value()] =
         std::move(service_record);
   }
 
   // Check that no new services have been added or removed.
   if (uuids_ != new_services) {
     return false;
   }
 
-  for (auto iter = service_record_list_.begin();
-       iter != service_record_list_.end(); ++iter) {
-    BluetoothServiceRecordWin* service_record = (*iter);
+  for (const auto& service_record : service_record_list_) {
     BluetoothServiceRecordWin* new_service_record =
-        new_service_records[(*iter)->uuid().canonical_value()].get();
+        new_service_records[service_record->uuid().canonical_value()].get();
     if (!service_record->IsEqual(*new_service_record))
       return false;
   }
   return true;
 }
 
 void BluetoothDeviceWin::Update(
     const BluetoothTaskManagerWin::DeviceState& device_state) {
   address_ = device_state.address;
   // Note: Callers are responsible for providing a canonicalized address.
@@ skipping 20 matching lines @@
 
 void BluetoothDeviceWin::SetVisible(bool visible) {
   visible_ = visible;
 }
 
 void BluetoothDeviceWin::UpdateServices(
     const BluetoothTaskManagerWin::DeviceState& device_state) {
   uuids_.clear();
   service_record_list_.clear();
 
-  for (auto 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);
-    service_record_list_.push_back(service_record);
+  for (const auto& record_state : device_state.service_record_states) {
+    auto service_record = base::MakeUnique<BluetoothServiceRecordWin>(
+        device_state.address, record_state->name, record_state->sdp_bytes,
+        record_state->gatt_uuid);
     uuids_.insert(service_record->uuid());
+    service_record_list_.push_back(std::move(service_record));
   }
 
   if (!device_state.is_bluetooth_classic())
     UpdateGattServices(device_state.service_record_states);
 }
 
 bool BluetoothDeviceWin::IsGattServiceDiscovered(BluetoothUUID& uuid,
                                                  uint16_t attribute_handle) {
   for (const auto& gatt_service : gatt_services_) {
     uint16_t it_att_handle =
         static_cast<BluetoothRemoteGattServiceWin*>(gatt_service.second.get())
             ->GetAttributeHandle();
     BluetoothUUID it_uuid = gatt_service.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();
-  auto it = service_state.begin();
-  for (; it != service_state.end(); ++it) {
-    if (attribute_handle == (*it)->attribute_handle && uuid == (*it)->gatt_uuid)
+  for (const auto& record_state : service_state) {
+    if (attribute_handle == record_state->attribute_handle &&
+        uuid == record_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.get())) {
         to_be_removed_services.push_back(gatt_service.first);
       }
     }
     for (const auto& service : to_be_removed_services) {
       std::unique_ptr<BluetoothRemoteGattService> service_ptr =
           std::move(gatt_services_[service]);
       gatt_services_.erase(service);
     }
     // Update previously discovered services.
     for (const auto& gatt_service : gatt_services_) {
       static_cast<BluetoothRemoteGattServiceWin*>(gatt_service.second.get())
           ->Update();
     }
   }
 
   // Return if no new services have been added.
   if (gatt_services_.size() == service_state.size())
     return;
 
   // Add new services.
-  for (auto it = service_state.begin(); it != service_state.end(); ++it) {
-    if (!IsGattServiceDiscovered((*it)->gatt_uuid, (*it)->attribute_handle)) {
+  for (const auto& record_state : service_state) {
+    if (!IsGattServiceDiscovered(record_state->gatt_uuid,
+                                 record_state->attribute_handle)) {
       BluetoothRemoteGattServiceWin* primary_service =
-          new BluetoothRemoteGattServiceWin(this, (*it)->path, (*it)->gatt_uuid,
-                                            (*it)->attribute_handle, true,
-                                            nullptr, ui_task_runner_);
+          new BluetoothRemoteGattServiceWin(
+              this, record_state->path, record_state->gatt_uuid,
+              record_state->attribute_handle, true, nullptr, ui_task_runner_);
       gatt_services_[primary_service->GetIdentifier()] =
           base::WrapUnique(primary_service);
       adapter_->NotifyGattServiceAdded(primary_service);
     }
   }
 
   adapter_->NotifyGattServicesDiscovered(this);
 }
 
 }  // namespace device