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

device/bluetooth/test/mock_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/test/mock_bluetooth_device.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/strings/utf_string_conversions.h"
@@ skipping 55 matching lines @@
 MockBluetoothDevice::~MockBluetoothDevice() {}
 
 void MockBluetoothDevice::AddMockService(
     std::unique_ptr<MockBluetoothGattService> mock_service) {
   mock_services_.push_back(std::move(mock_service));
 }
 
 std::vector<BluetoothRemoteGattService*> MockBluetoothDevice::GetMockServices()
     const {
   std::vector<BluetoothRemoteGattService*> services;
-  for (BluetoothRemoteGattService* service : mock_services_) {
-    services.push_back(service);
+  for (auto& service : mock_services_) {

[Reilly Grant (use Gerrit), 2016/12/21 22:25:15]

Prefer const auto& if possible.

[dougt, 2016/12/22 01:18:03]

Done.

+    services.push_back(service.get());
   }
   return services;
 }
 
 BluetoothRemoteGattService* MockBluetoothDevice::GetMockService(
     const std::string& identifier) const {
-  for (BluetoothRemoteGattService* service : mock_services_) {
+  for (auto& service : mock_services_) {

[dougt, 2016/12/22 01:18:03]

same here.

     if (service->GetIdentifier() == identifier)
-      return service;
+      return service.get();
   }
   return nullptr;
 }
 
 void MockBluetoothDevice::PushPendingCallback(const base::Closure& callback) {
   pending_callbacks_.push(callback);
 }
 
 void MockBluetoothDevice::RunPendingCallbacks() {
   while (!pending_callbacks_.empty()) {
     pending_callbacks_.front().Run();
     pending_callbacks_.pop();
   }
 }
 
 }  // namespace device