Index: device/usb/usb_descriptors.h |
diff --git a/device/usb/usb_descriptors.h b/device/usb/usb_descriptors.h |
index 11b606ea9d91133fb29b2e9640b5e03e9d38807d..33ff650a0adfbaaa31c3e27e3fb7cf0e4b79106b 100644 |
--- a/device/usb/usb_descriptors.h |
+++ b/device/usb/usb_descriptors.h |
@@ -8,11 +8,11 @@ |
#include <stdint.h> |
#include <map> |
+#include <memory> |
#include <vector> |
#include "base/callback_forward.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/strings/string16.h" |
namespace device { |
@@ -117,9 +117,9 @@ bool ParseUsbStringDescriptor(const std::vector<uint8_t>& descriptor, |
void ReadUsbStringDescriptors( |
scoped_refptr<UsbDeviceHandle> device_handle, |
- scoped_ptr<std::map<uint8_t, base::string16>> index_map, |
- const base::Callback<void(scoped_ptr<std::map<uint8_t, base::string16>>)>& |
- callback); |
+ std::unique_ptr<std::map<uint8_t, base::string16>> index_map, |
+ const base::Callback< |
+ void(std::unique_ptr<std::map<uint8_t, base::string16>>)>& callback); |
} // namespace device |