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

device/bluetooth/bluetooth_adapter_mac_unittest.mm

 // Copyright 2013 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/bluetooth_adapter_mac.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
@@ skipping 66 matching lines @@
       CBAdvertisementDataServiceDataKey : [NSDictionary dictionary],
     };
     return [advertisement_data retain];
   }
 
   std::string GetHashAddress(CBPeripheral* peripheral) {
     return BluetoothLowEnergyDeviceMac::GetPeripheralHashAddress(peripheral);
   }
 
   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(); }
 
   bool DevicePresent(CBPeripheral* peripheral) {
     BluetoothDevice* device = adapter_mac_->GetDevice(
         BluetoothLowEnergyDeviceMac::GetPeripheralHashAddress(peripheral));
     return (device != NULL);
   }
 
@@ skipping 154 matching lines @@
   base::scoped_nsobject<NSDictionary> advertisement_data(AdvertisementData());
 
   EXPECT_EQ(0, NumDevices());
   EXPECT_FALSE(DevicePresent(mock_peripheral));
   LowEnergyDeviceUpdated(mock_peripheral, advertisement_data, kTestRssi);
   EXPECT_EQ(1, NumDevices());
   EXPECT_TRUE(DevicePresent(mock_peripheral));
 }
 
 }  // namespace device