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

device/bluetooth/bluetooth_adapter_mac_unittest.mm

Index: device/bluetooth/bluetooth_adapter_mac_unittest.mm
diff --git a/device/bluetooth/bluetooth_adapter_mac_unittest.mm b/device/bluetooth/bluetooth_adapter_mac_unittest.mm
index a17dabd717186f0729263fad8339dc79190c405e..26b9425f7de4e3022d95a9c94eff8cac4de29d3a 100644
--- a/device/bluetooth/bluetooth_adapter_mac_unittest.mm
+++ b/device/bluetooth/bluetooth_adapter_mac_unittest.mm
@@ -84,8 +84,8 @@ class BluetoothAdapterMacTest : public testing::Test {
   }
 
   void AddLowEnergyDevice(BluetoothLowEnergyDeviceMac* device) {
-    adapter_mac_->devices_.set(device->GetAddress(),
-                               std::unique_ptr<BluetoothDevice>(device));
+    adapter_mac_->devices_.insert(
+        std::make_pair(device->GetAddress(), std::move(device)));

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

When the intent is to replace the device (as set does) use:

devices_[device->GetAddress()] = std::move(device);

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

This works in places where we don't have to immediately use 'device'.  It might
be nice to have a set that returns the insertion result so that you can use
'device'??

   }
 
   int NumDevices() { return adapter_mac_->devices_.size(); }