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

device/bluetooth/test/bluetooth_test.cc

 // Copyright 2015 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/test/bluetooth_test.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 92 matching lines @@
   if (expected == Call::EXPECTED)
     ++actual_success_callback_calls_;
   else
     unexpected_success_callback_ = true;
 }
 
 void BluetoothTestBase::DiscoverySessionCallback(
     Call expected,
     std::unique_ptr<BluetoothDiscoverySession> discovery_session) {
   ++callback_count_;
-  discovery_sessions_.push_back(discovery_session.release());
+  discovery_sessions_.push_back(std::move(discovery_session));
 
   if (expected == Call::EXPECTED)
     ++actual_success_callback_calls_;
   else
     unexpected_success_callback_ = true;
 }
 
 void BluetoothTestBase::GattConnectionCallback(
     Call expected,
     std::unique_ptr<BluetoothGattConnection> connection) {
   ++callback_count_;
-  gatt_connections_.push_back(connection.release());
+  gatt_connections_.push_back(std::move(connection));
 
   if (expected == Call::EXPECTED)
     ++actual_success_callback_calls_;
   else
     unexpected_success_callback_ = true;
 }
 
 void BluetoothTestBase::NotifyCallback(
     Call expected,
     std::unique_ptr<BluetoothGattNotifySession> notify_session) {
-  notify_sessions_.push_back(notify_session.release());
+  notify_sessions_.push_back(std::move(notify_session));
 
   ++callback_count_;
   if (expected == Call::EXPECTED)
     ++actual_success_callback_calls_;
   else
     unexpected_success_callback_ = true;
 }
 
 void BluetoothTestBase::NotifyCheckForPrecedingCalls(
     int num_of_preceding_calls,
     std::unique_ptr<BluetoothGattNotifySession> notify_session) {
   EXPECT_EQ(num_of_preceding_calls, callback_count_);
 
-  notify_sessions_.push_back(notify_session.release());
+  notify_sessions_.push_back(std::move(notify_session));
 
   ++callback_count_;
   ++actual_success_callback_calls_;
 }
 
 void BluetoothTestBase::StopNotifyCallback(Call expected) {
   ++callback_count_;
 
   if (expected == Call::EXPECTED)
     ++actual_success_callback_calls_;
@@ skipping 213 matching lines @@
   gatt_write_characteristic_attempts_ = 0;
   gatt_read_descriptor_attempts_ = 0;
   gatt_write_descriptor_attempts_ = 0;
 }
 
 void BluetoothTestBase::RemoveTimedOutDevices() {
   adapter_->RemoveTimedOutDevices();
 }
 
 }  // namespace device