Convert device to std::unique_ptr

device/usb/usb_descriptors_unittest.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/usb/usb_descriptors.h"
+
 #include <stdint.h>
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "device/usb/mock_usb_device_handle.h"
-#include "device/usb/usb_descriptors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 namespace device {
 
 namespace {
 
 ACTION_P2(InvokeCallback, data, length) {
   size_t transferred_length = std::min(length, arg7);
   memcpy(arg6->data(), data, transferred_length);
   arg9.Run(USB_TRANSFER_COMPLETED, arg6, transferred_length);
 }
 
 void ExpectStringDescriptors(
-    scoped_ptr<std::map<uint8_t, base::string16>> string_map) {
+    std::unique_ptr<std::map<uint8_t, base::string16>> string_map) {
   EXPECT_EQ(3u, string_map->size());
   EXPECT_EQ(base::ASCIIToUTF16("String 1"), (*string_map)[1]);
   EXPECT_EQ(base::ASCIIToUTF16("String 2"), (*string_map)[2]);
   EXPECT_EQ(base::ASCIIToUTF16("String 3"), (*string_map)[3]);
 }
 
 class UsbDescriptorsTest : public ::testing::Test {};
 
 TEST_F(UsbDescriptorsTest, NoInterfaceAssociations) {
   UsbConfigDescriptor config(1, false, false, 0);
@@ skipping 137 matching lines @@
 TEST_F(UsbDescriptorsTest, OneByteStringDescriptor) {
   // The string is only one byte.
   static const uint8_t kBuffer[] = {0x03, 0x03, '?'};
   base::string16 string;
   ASSERT_TRUE(ParseUsbStringDescriptor(
       std::vector<uint8_t>(kBuffer, kBuffer + sizeof(kBuffer)), &string));
   EXPECT_EQ(base::string16(), string);
 }
 
 TEST_F(UsbDescriptorsTest, ReadStringDescriptors) {
-  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>());
   (*string_map)[1] = base::string16();
   (*string_map)[2] = base::string16();
   (*string_map)[3] = base::string16();
 
   scoped_refptr<MockUsbDeviceHandle> device_handle(
       new MockUsbDeviceHandle(nullptr));
   static const uint8_t kStringDescriptor0[] = {0x04, 0x03, 0x21, 0x43};
   EXPECT_CALL(*device_handle,
               ControlTransfer(USB_DIRECTION_INBOUND, UsbDeviceHandle::STANDARD,
@@ skipping 25 matching lines @@
                               _, _, _))
       .WillOnce(InvokeCallback(kStringDescriptor3, sizeof(kStringDescriptor3)));
 
   ReadUsbStringDescriptors(device_handle, std::move(string_map),
                            base::Bind(&ExpectStringDescriptors));
 }
 
 }  // namespace
 
 }  // namespace device