Index: media/filters/h264_to_annex_b_bitstream_converter_unittest.cc |
diff --git a/media/filters/h264_to_annex_b_bitstream_converter_unittest.cc b/media/filters/h264_to_annex_b_bitstream_converter_unittest.cc |
index 97a7704bbe5445430d78f781c401161c2049edca..044cc85e2aae66d0408d30f69d94044e8c343f1f 100644 |
--- a/media/filters/h264_to_annex_b_bitstream_converter_unittest.cc |
+++ b/media/filters/h264_to_annex_b_bitstream_converter_unittest.cc |
@@ -2,11 +2,13 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "media/filters/h264_to_annex_b_bitstream_converter.h" |
+ |
#include <stdint.h> |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
-#include "media/filters/h264_to_annex_b_bitstream_converter.h" |
#include "media/formats/mp4/box_definitions.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -289,7 +291,7 @@ static const uint8_t kPacketDataOkWithFieldLen4[] = { |
TEST_F(H264ToAnnexBBitstreamConverterTest, Success) { |
// Initialize converter. |
- scoped_ptr<uint8_t[]> output; |
+ std::unique_ptr<uint8_t[]> output; |
H264ToAnnexBBitstreamConverter converter; |
// Parse the headers. |
@@ -347,7 +349,7 @@ TEST_F(H264ToAnnexBBitstreamConverterTest, FailureHeaderBufferOverflow) { |
TEST_F(H264ToAnnexBBitstreamConverterTest, FailureNalUnitBreakage) { |
// Initialize converter. |
- scoped_ptr<uint8_t[]> output; |
+ std::unique_ptr<uint8_t[]> output; |
H264ToAnnexBBitstreamConverter converter; |
// Parse the headers. |
@@ -395,7 +397,7 @@ TEST_F(H264ToAnnexBBitstreamConverterTest, FailureNalUnitBreakage) { |
TEST_F(H264ToAnnexBBitstreamConverterTest, FailureTooSmallOutputBuffer) { |
// Initialize converter. |
- scoped_ptr<uint8_t[]> output; |
+ std::unique_ptr<uint8_t[]> output; |
H264ToAnnexBBitstreamConverter converter; |
// Parse the headers. |
@@ -471,7 +473,7 @@ static const uint8_t kCorruptedPacketData[] = { |
TEST_F(H264ToAnnexBBitstreamConverterTest, CorruptedPacket) { |
// Initialize converter. |
- scoped_ptr<uint8_t[]> output; |
+ std::unique_ptr<uint8_t[]> output; |
H264ToAnnexBBitstreamConverter converter; |
// Parse the headers. |