Convert device to std::unique_ptr

device/usb/usb_service_impl.cc

 // Copyright 2014 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/usb/usb_service_impl.h"
 
 #include <stdint.h>
+
 #include <list>
+#include <memory>
 #include <set>
 #include <utility>
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 98 matching lines @@
   device_handle->Close();
   continuation.Run();
 }
 
 void SaveStringsAndRunContinuation(
     scoped_refptr<UsbDeviceImpl> device,
     uint8_t manufacturer,
     uint8_t product,
     uint8_t serial_number,
     const base::Closure& continuation,
-    scoped_ptr<std::map<uint8_t, base::string16>> string_map) {
+    std::unique_ptr<std::map<uint8_t, base::string16>> string_map) {
   if (manufacturer != 0)
     device->set_manufacturer_string((*string_map)[manufacturer]);
   if (product != 0)
     device->set_product_string((*string_map)[product]);
   if (serial_number != 0)
     device->set_serial_number((*string_map)[serial_number]);
   continuation.Run();
 }
 
 void OnReadBosDescriptor(scoped_refptr<UsbDeviceHandle> device_handle,
                          const base::Closure& barrier,
-                         scoped_ptr<WebUsbAllowedOrigins> allowed_origins,
+                         std::unique_ptr<WebUsbAllowedOrigins> allowed_origins,
                          const GURL& landing_page) {
   scoped_refptr<UsbDeviceImpl> device =
       static_cast<UsbDeviceImpl*>(device_handle->GetDevice().get());
 
   if (allowed_origins)
     device->set_webusb_allowed_origins(std::move(allowed_origins));
   if (landing_page.is_valid())
     device->set_webusb_landing_page(landing_page);
 
   barrier.Run();
 }
 
 void OnDeviceOpenedReadDescriptors(
     uint8_t manufacturer,
     uint8_t product,
     uint8_t serial_number,
     bool read_bos_descriptors,
     const base::Closure& success_closure,
     const base::Closure& failure_closure,
     scoped_refptr<UsbDeviceHandle> device_handle) {
   if (device_handle) {
-    scoped_ptr<std::map<uint8_t, base::string16>> string_map(
+    std::unique_ptr<std::map<uint8_t, base::string16>> string_map(
         new std::map<uint8_t, base::string16>());
     if (manufacturer != 0)
       (*string_map)[manufacturer] = base::string16();
     if (product != 0)
       (*string_map)[product] = base::string16();
     if (serial_number != 0)
       (*string_map)[serial_number] = base::string16();
 
     int count = 0;
     if (!string_map->empty())
@@ skipping 436 matching lines @@
   PlatformDeviceMap::iterator it = platform_devices_.find(platform_device);
   if (it != platform_devices_.end()) {
     RemoveDevice(it->second);
   } else {
     devices_being_enumerated_.erase(platform_device);
   }
   libusb_unref_device(platform_device);
 }
 
 }  // namespace device