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

device/bluetooth/bluetooth_adapter_win_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 416 matching lines @@
       DiscoverySessionErrorCallback());
   ui_task_runner_->ClearPendingTasks();
   adapter_win_->DiscoveryStarted(false);
   ui_task_runner_->RunPendingTasks();
   EXPECT_EQ(1, num_start_discovery_error_callbacks_);
   EXPECT_EQ(1, num_stop_discovery_callbacks_);
   EXPECT_EQ(0, observer_.discovering_changed_count());
 }
 
 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();
   adapter_win_->DevicesPolled(devices);
   EXPECT_EQ(3, observer_.device_added_count());
   EXPECT_EQ(0, observer_.device_removed_count());
   EXPECT_EQ(0, observer_.device_changed_count());
 
   // Change a device name
   android_phone_state->name = std::string("phone2");
@@ skipping 17 matching lines @@
   adapter_win_->DevicesPolled(devices);
   EXPECT_EQ(0, observer_.device_added_count());
   EXPECT_EQ(1, observer_.device_removed_count());
   EXPECT_EQ(0, observer_.device_changed_count());
 
   // Add a service
   BluetoothTaskManagerWin::ServiceRecordState* audio_state =
       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());
   EXPECT_EQ(0, observer_.device_removed_count());
   EXPECT_EQ(1, observer_.device_changed_count());
 
   // Change a service
   audio_state->name = kTestAudioSdpName2;
   observer_.Reset();
   adapter_win_->DevicesPolled(devices);
   EXPECT_EQ(0, observer_.device_added_count());
   EXPECT_EQ(0, observer_.device_removed_count());
   EXPECT_EQ(1, observer_.device_changed_count());
 
   // Remove a service
   laptop_state->service_record_states.clear();
   observer_.Reset();
   adapter_win_->DevicesPolled(devices);
   EXPECT_EQ(0, observer_.device_added_count());
   EXPECT_EQ(0, observer_.device_removed_count());
   EXPECT_EQ(1, observer_.device_changed_count());
 }
 
 }  // namespace device