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

device/bluetooth/bluetooth_discovery_filter.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/bluetooth_discovery_filter.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "device/bluetooth/bluetooth_common.h"
@@ skipping 46 matching lines @@
 
 void BluetoothDiscoveryFilter::SetTransport(BluetoothTransport transport) {
   DCHECK(transport != BLUETOOTH_TRANSPORT_INVALID);
   transport_ = transport;
 }
 
 void BluetoothDiscoveryFilter::GetUUIDs(
     std::set<device::BluetoothUUID>& out_uuids) const {
   out_uuids.clear();
 
-  for (auto* uuid : uuids_)
-    out_uuids.insert(*uuid);
+  for (auto uuid : uuids_)
+    out_uuids.insert(uuid);
 }
 
 void BluetoothDiscoveryFilter::AddUUID(const device::BluetoothUUID& uuid) {
   DCHECK(uuid.IsValid());
-  for (auto* uuid_it : uuids_) {
-    if (*uuid_it == uuid)
+  for (auto uuid_it : uuids_) {
+    if (uuid_it == uuid)
       return;
   }
 
-  uuids_.push_back(new device::BluetoothUUID(uuid));
+  uuids_.push_back(uuid);
 }
 
 void BluetoothDiscoveryFilter::CopyFrom(
     const BluetoothDiscoveryFilter& filter) {
   transport_ = filter.transport_;
 
   if (filter.uuids_.size()) {
-    for (auto* uuid : filter.uuids_)
-      AddUUID(*uuid);
+    for (auto uuid : filter.uuids_)
+      AddUUID(uuid);
   } else
     uuids_.clear();
 
   if (filter.rssi_.get()) {
     SetRSSI(*filter.rssi_);
   } else
     rssi_.reset();
 
   if (filter.pathloss_.get()) {
     SetPathloss(*filter.pathloss_);
@@ skipping 76 matching lines @@
 
   return true;
 }
 
 bool BluetoothDiscoveryFilter::IsDefault() const {
   return !(rssi_.get() || pathloss_.get() || uuids_.size() ||
            transport_ != BLUETOOTH_TRANSPORT_DUAL);
 }
 
 }  // namespace device