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

device/bluetooth/bluetooth_adapter_win_unittest.cc

Index: device/bluetooth/bluetooth_adapter_win_unittest.cc
diff --git a/device/bluetooth/bluetooth_adapter_win_unittest.cc b/device/bluetooth/bluetooth_adapter_win_unittest.cc
index e5126e8cf59344ae43ae4c002095060ea4386ff2..0160cb70ba00e28332f5201f047cc6a495835e22 100644
--- a/device/bluetooth/bluetooth_adapter_win_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_win_unittest.cc
@@ -434,19 +434,22 @@ TEST_F(BluetoothAdapterWinTest, StopDiscoveryBeforeDiscoveryStartedAndFailed) {
 }
 
 TEST_F(BluetoothAdapterWinTest, DevicesPolled) {
-  BluetoothTaskManagerWin::DeviceState* android_phone_state =
-      new BluetoothTaskManagerWin::DeviceState();
+  BluetoothTaskManagerWin::DeviceState* android_phone_state(
+      new BluetoothTaskManagerWin::DeviceState());
   MakeDeviceState("phone", "A1:B2:C3:D4:E5:E0", android_phone_state);
-  BluetoothTaskManagerWin::DeviceState* laptop_state =
-      new BluetoothTaskManagerWin::DeviceState();
+  BluetoothTaskManagerWin::DeviceState* laptop_state(
+      new BluetoothTaskManagerWin::DeviceState());
   MakeDeviceState("laptop", "A1:B2:C3:D4:E5:E1", laptop_state);
-  BluetoothTaskManagerWin::DeviceState* iphone_state =
-      new BluetoothTaskManagerWin::DeviceState();
+  BluetoothTaskManagerWin::DeviceState* iphone_state(
+      new BluetoothTaskManagerWin::DeviceState());
   MakeDeviceState("phone", "A1:B2:C3:D4:E5:E2", iphone_state);
-  ScopedVector<BluetoothTaskManagerWin::DeviceState> devices;
-  devices.push_back(android_phone_state);
-  devices.push_back(laptop_state);
-  devices.push_back(iphone_state);
+  std::vector<std::unique_ptr<BluetoothTaskManagerWin::DeviceState>> devices;
+  devices.push_back(std::unique_ptr<BluetoothTaskManagerWin::DeviceState>(
+      android_phone_state));
+  devices.push_back(
+      std::unique_ptr<BluetoothTaskManagerWin::DeviceState>(laptop_state));
+  devices.push_back(
+      std::unique_ptr<BluetoothTaskManagerWin::DeviceState>(iphone_state));

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

auto state = base::MakeUnique<BluetoothTaskManagerWin::DeviceState>();
MakeDeviceState(..., state.get());
devices.push_back(std::move(state));

Or, update MakeDeviceState() to return a
std::unique_ptr<BluetoothTaskManagerWin::DeviceState>. I like that option
because it will probably make this code less verbose.

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

recall, below I need to access the ptr, so std::move(state) will not work here.

instead, I have clean this code up a bit to have MakeDeviceState return an
allocated ptr which ends up getting owned by the devices vector.

 
   // Add 3 devices
   observer_.Reset();
@@ -484,7 +487,9 @@ TEST_F(BluetoothAdapterWinTest, DevicesPolled) {
       new BluetoothTaskManagerWin::ServiceRecordState();
   audio_state->name = kTestAudioSdpName;
   base::HexStringToBytes(kTestAudioSdpBytes, &audio_state->sdp_bytes);
-  laptop_state->service_record_states.push_back(audio_state);
+  laptop_state->service_record_states.push_back(
+      std::unique_ptr<BluetoothTaskManagerWin::ServiceRecordState>(
+          audio_state));

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

Use base::WrapUnique() if you really want to convert a T* into an
std::unique_ptr<T>, but I would rather see base::MakeUnique() used here.

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

Done.

   observer_.Reset();
   adapter_win_->DevicesPolled(devices);
   EXPECT_EQ(0, observer_.device_added_count());