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..da704efebc9b2e149663f847295e0c5af4463a40 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 (const auto& service : mock_services_) {
+    services.push_back(service.get());
   }
   return services;
 }
 
 BluetoothRemoteGattService* MockBluetoothDevice::GetMockService(
     const std::string& identifier) const {
-  for (BluetoothRemoteGattService* service : mock_services_) {
+  for (const auto& service : mock_services_) {
     if (service->GetIdentifier() == identifier)
-      return service;
+      return service.get();
   }
   return nullptr;
 }