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

device/bluetooth/bluetooth_discovery_filter.cc

Index: device/bluetooth/bluetooth_discovery_filter.cc
diff --git a/device/bluetooth/bluetooth_discovery_filter.cc b/device/bluetooth/bluetooth_discovery_filter.cc
index 8a6cc0b9fda69298f42624284f665748ee3f67c9..41905564cac86a42324dd12b64de831e75614088 100644
--- a/device/bluetooth/bluetooth_discovery_filter.cc
+++ b/device/bluetooth/bluetooth_discovery_filter.cc
@@ -64,18 +64,18 @@ void BluetoothDiscoveryFilter::GetUUIDs(
     std::set<device::BluetoothUUID>& out_uuids) const {
   out_uuids.clear();
 
-  for (auto* uuid : uuids_)
-    out_uuids.insert(*uuid);
+  for (const 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 (const auto& uuid_it : uuids_) {
+    if (uuid_it == uuid)
       return;
   }
 
-  uuids_.push_back(new device::BluetoothUUID(uuid));
+  uuids_.push_back(uuid);
 }
 
 void BluetoothDiscoveryFilter::CopyFrom(
@@ -83,8 +83,8 @@ void BluetoothDiscoveryFilter::CopyFrom(
   transport_ = filter.transport_;
 
   if (filter.uuids_.size()) {
-    for (auto* uuid : filter.uuids_)
-      AddUUID(*uuid);
+    for (const auto& uuid : filter.uuids_)
+      AddUUID(uuid);
   } else
     uuids_.clear();