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

device/bluetooth/test/mock_bluetooth_gatt_service.cc

 // Copyright 2014 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/test/mock_bluetooth_gatt_service.h"
 
 #include <memory>
 #include <utility>
 
 #include "device/bluetooth/test/mock_bluetooth_device.h"
@@ skipping 27 matching lines @@
 }
 
 void MockBluetoothGattService::AddMockCharacteristic(
     std::unique_ptr<MockBluetoothGattCharacteristic> mock_characteristic) {
   mock_characteristics_.push_back(std::move(mock_characteristic));
 }
 
 std::vector<BluetoothRemoteGattCharacteristic*>
 MockBluetoothGattService::GetMockCharacteristics() const {
   std::vector<BluetoothRemoteGattCharacteristic*> characteristics;
-  for (BluetoothRemoteGattCharacteristic* characteristic :
-       mock_characteristics_) {
-    characteristics.push_back(characteristic);
+  for (auto& mock : mock_characteristics_) {
+    characteristics.push_back(mock.get());
   }
   return characteristics;
 }
 
 BluetoothRemoteGattCharacteristic*
 MockBluetoothGattService::GetMockCharacteristic(
     const std::string& identifier) const {
-  for (BluetoothRemoteGattCharacteristic* characteristic :
-       mock_characteristics_) {
-    if (characteristic->GetIdentifier() == identifier) {
-      return characteristic;
+  for (auto& mock : mock_characteristics_) {
+    if (mock->GetIdentifier() == identifier) {
+      return mock.get();
     }
   }
   return nullptr;
 }
 
 }  // namespace device