Followup cleanup from the removal of base::ScopedPtrHashMap from device/.

device/bluetooth/bluetooth_device_win.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 "device/bluetooth/bluetooth_device_win.h"
 
 #include <memory>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 221 matching lines @@
       paired_ != device_state.authenticated) {
     return false;
   }
 
   // Checks service collection
   UUIDSet new_services;
   std::unordered_map<std::string, std::unique_ptr<BluetoothServiceRecordWin>>
       new_service_records;
   for (auto iter = device_state.service_record_states.begin();
        iter != device_state.service_record_states.end(); ++iter) {
-    std::unique_ptr<BluetoothServiceRecordWin> service_record =
-        base::MakeUnique<BluetoothServiceRecordWin>(
-            address_, (*iter)->name, (*iter)->sdp_bytes, (*iter)->gatt_uuid);
+    auto service_record = base::MakeUnique<BluetoothServiceRecordWin>(
+        address_, (*iter)->name, (*iter)->sdp_bytes, (*iter)->gatt_uuid);
     new_services.insert(service_record->uuid());
     new_service_records[service_record->uuid().canonical_value()] =
         std::move(service_record);
   }
 
   // Check that no new services have been added or removed.
   if (uuids_ != new_services) {
     return false;
   }
 
@@ skipping 122 matching lines @@
       gatt_services_[primary_service->GetIdentifier()] =
           base::WrapUnique(primary_service);
       adapter_->NotifyGattServiceAdded(primary_service);
     }
   }
 
   adapter_->NotifyGattServicesDiscovered(this);
 }
 
 }  // namespace device