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

device/bluetooth/bluetooth_device_win_unittest.cc

 // Copyright (c) 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_device_win.h"
 
 #include <memory>
 
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/test_simple_task_runner.h"
 #include "device/bluetooth/bluetooth_service_record_win.h"
 #include "device/bluetooth/bluetooth_socket_thread.h"
 #include "device/bluetooth/bluetooth_task_manager_win.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ skipping 25 matching lines @@
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner(
         new base::TestSimpleTaskRunner());
     scoped_refptr<BluetoothSocketThread> socket_thread(
         BluetoothSocketThread::Get());
 
     // Add device with audio/video services.
     device_state_.reset(new BluetoothTaskManagerWin::DeviceState());
     device_state_->name = std::string(kDeviceName);
     device_state_->address = kDeviceAddress;
 
-    BluetoothTaskManagerWin::ServiceRecordState* audio_state =
-        new BluetoothTaskManagerWin::ServiceRecordState();
+    auto audio_state =
+        base::MakeUnique<BluetoothTaskManagerWin::ServiceRecordState>();
     audio_state->name = kTestAudioSdpName;
     base::HexStringToBytes(kTestAudioSdpBytes, &audio_state->sdp_bytes);
-    device_state_->service_record_states.push_back(audio_state);
+    device_state_->service_record_states.push_back(std::move(audio_state));
 
-    BluetoothTaskManagerWin::ServiceRecordState* video_state =
-        new BluetoothTaskManagerWin::ServiceRecordState();
+    auto video_state =
+        base::MakeUnique<BluetoothTaskManagerWin::ServiceRecordState>();
     video_state->name = kTestVideoSdpName;
     base::HexStringToBytes(kTestVideoSdpBytes, &video_state->sdp_bytes);
-    device_state_->service_record_states.push_back(video_state);
+    device_state_->service_record_states.push_back(std::move(video_state));
 
     device_.reset(new BluetoothDeviceWin(NULL, *device_state_, ui_task_runner,
                                          socket_thread, NULL,
                                          net::NetLogSource()));
 
     // Add empty device.
     empty_device_state_.reset(new BluetoothTaskManagerWin::DeviceState());
     empty_device_state_->name = std::string(kDeviceName);
     empty_device_state_->address = kDeviceAddress;
     empty_device_.reset(new BluetoothDeviceWin(NULL, *empty_device_state_,
@@ skipping 20 matching lines @@
 }
 
 TEST_F(BluetoothDeviceWinTest, IsEqual) {
   EXPECT_TRUE(device_->IsEqual(*device_state_));
   EXPECT_FALSE(device_->IsEqual(*empty_device_state_));
   EXPECT_FALSE(empty_device_->IsEqual(*device_state_));
   EXPECT_TRUE(empty_device_->IsEqual(*empty_device_state_));
 }
 
 }  // namespace device