Convert media/formats to std::unique_ptr

media/formats/mp4/box_reader_unittest.cc

Index: media/formats/mp4/box_reader_unittest.cc
diff --git a/media/formats/mp4/box_reader_unittest.cc b/media/formats/mp4/box_reader_unittest.cc
index a2f8a2960d0c6d3c3e0d2751d316917bfd54a6f0..bd050782b1fcda57caadf89217c82beb7161cf1b 100644
--- a/media/formats/mp4/box_reader_unittest.cc
+++ b/media/formats/mp4/box_reader_unittest.cc
@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "media/formats/mp4/box_reader.h"
+
 #include <stdint.h>
 #include <string.h>
 
+#include <memory>
+
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "media/base/mock_media_log.h"
 #include "media/formats/mp4/box_definitions.h"
-#include "media/formats/mp4/box_reader.h"
 #include "media/formats/mp4/rcheck.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -92,7 +94,7 @@ class BoxReaderTest : public testing::Test {
     std::vector<uint8_t> buf(data, data + size);
 
     bool err;
-    scoped_ptr<BoxReader> reader(
+    std::unique_ptr<BoxReader> reader(
         BoxReader::ReadTopLevelBox(&buf[0], buf.size(), media_log_, &err));
 
     EXPECT_FALSE(err);
@@ -107,7 +109,7 @@ class BoxReaderTest : public testing::Test {
 TEST_F(BoxReaderTest, ExpectedOperationTest) {
   std::vector<uint8_t> buf = GetBuf();
   bool err;
-  scoped_ptr<BoxReader> reader(
+  std::unique_ptr<BoxReader> reader(
       BoxReader::ReadTopLevelBox(&buf[0], buf.size(), media_log_, &err));
   EXPECT_FALSE(err);
   EXPECT_TRUE(reader.get());
@@ -135,7 +137,7 @@ TEST_F(BoxReaderTest, OuterTooShortTest) {
   bool err;
 
   // Create a soft failure by truncating the outer box.
-  scoped_ptr<BoxReader> r(
+  std::unique_ptr<BoxReader> r(
       BoxReader::ReadTopLevelBox(&buf[0], buf.size() - 2, media_log_, &err));
 
   EXPECT_FALSE(err);
@@ -148,7 +150,7 @@ TEST_F(BoxReaderTest, InnerTooLongTest) {
 
   // Make an inner box too big for its outer box.
   buf[25] = 1;
-  scoped_ptr<BoxReader> reader(
+  std::unique_ptr<BoxReader> reader(
       BoxReader::ReadTopLevelBox(&buf[0], buf.size(), media_log_, &err));
 
   SkipBox box;
@@ -167,7 +169,7 @@ TEST_F(BoxReaderTest, WrongFourCCTest) {
 
   EXPECT_MEDIA_LOG(HasSubstr("Unrecognized top-level box type DALE"));
 
-  scoped_ptr<BoxReader> reader(
+  std::unique_ptr<BoxReader> reader(
       BoxReader::ReadTopLevelBox(&buf[0], buf.size(), media_log_, &err));
   EXPECT_FALSE(reader.get());
   EXPECT_TRUE(err);
@@ -176,7 +178,7 @@ TEST_F(BoxReaderTest, WrongFourCCTest) {
 TEST_F(BoxReaderTest, ScanChildrenTest) {
   std::vector<uint8_t> buf = GetBuf();
   bool err;
-  scoped_ptr<BoxReader> reader(
+  std::unique_ptr<BoxReader> reader(
       BoxReader::ReadTopLevelBox(&buf[0], buf.size(), media_log_, &err));
 
   EXPECT_TRUE(reader->SkipBytes(16) && reader->ScanChildren());
@@ -200,7 +202,7 @@ TEST_F(BoxReaderTest, ReadAllChildrenTest) {
   // Modify buffer to exclude its last 'free' box
   buf[3] = 0x38;
   bool err;
-  scoped_ptr<BoxReader> reader(
+  std::unique_ptr<BoxReader> reader(
       BoxReader::ReadTopLevelBox(&buf[0], buf.size(), media_log_, &err));
 
   std::vector<PsshBox> kids;
@@ -258,7 +260,7 @@ TEST_F(BoxReaderTest, NestedBoxWithHugeSize) {
       0x00, 0x01, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x05, 0x06, 0x07, 0x08};
 
   bool err;
-  scoped_ptr<BoxReader> reader(
+  std::unique_ptr<BoxReader> reader(
       BoxReader::ReadTopLevelBox(kData, sizeof(kData), media_log_, &err));
 
   EXPECT_FALSE(err);
@@ -285,7 +287,7 @@ TEST_F(BoxReaderTest, ScanChildrenWithInvalidChild) {
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
   bool err;
-  scoped_ptr<BoxReader> reader(
+  std::unique_ptr<BoxReader> reader(
       BoxReader::ReadTopLevelBox(kData, sizeof(kData), media_log_, &err));
 
   EXPECT_FALSE(err);
@@ -316,7 +318,7 @@ TEST_F(BoxReaderTest, ReadAllChildrenWithInvalidChild) {
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
   bool err;
-  scoped_ptr<BoxReader> reader(
+  std::unique_ptr<BoxReader> reader(
       BoxReader::ReadTopLevelBox(kData, sizeof(kData), media_log_, &err));
 
   EXPECT_FALSE(err);