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

device/bluetooth/test/mock_bluetooth_device.cc

Index: device/bluetooth/test/mock_bluetooth_device.cc
diff --git a/device/bluetooth/test/mock_bluetooth_device.cc b/device/bluetooth/test/mock_bluetooth_device.cc
index 6a3e25bbff00b7d397db8b74b9ffd0c7860fcde2..e2a6c6deec5c432cb047ca925accb04743c2d5bd 100644
--- a/device/bluetooth/test/mock_bluetooth_device.cc
+++ b/device/bluetooth/test/mock_bluetooth_device.cc
@@ -73,17 +73,17 @@ void MockBluetoothDevice::AddMockService(
 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;
 }