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..a6b6791451539d3eca248723c3ed5eb319c28ba7 100644
--- a/device/bluetooth/bluetooth_adapter_mac_unittest.mm
+++ b/device/bluetooth/bluetooth_adapter_mac_unittest.mm
@@ -7,6 +7,7 @@
 #include <memory>
 
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/test_simple_task_runner.h"
 #include "build/build_config.h"
@@ -84,8 +85,7 @@ class BluetoothAdapterMacTest : public testing::Test {
   }
 
   void AddLowEnergyDevice(BluetoothLowEnergyDeviceMac* device) {

[Reilly Grant (use Gerrit), 2016/12/22 22:00:52]

TODO: Update AddLowEnergyDevice to take a std::unique_ptr.

-    adapter_mac_->devices_.set(device->GetAddress(),
-                               std::unique_ptr<BluetoothDevice>(device));
+    adapter_mac_->devices_[device->GetAddress()] = base::WrapUnique(device);
   }
 
   int NumDevices() { return adapter_mac_->devices_.size(); }