| Index: webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
|
| index f9514ad4bdb7bf53a325b1d6f0ad2d898cfe01f8..5bbafe459d22d8c8aea0d8e0ddf43a30b72b93f0 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
|
| @@ -8,7 +8,6 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#include <memory>
|
| #include <vector>
|
|
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| @@ -77,7 +76,7 @@
|
| const RTPVideoHeaderVP9& expected,
|
| size_t expected_hdr_length,
|
| size_t expected_length) {
|
| - std::unique_ptr<RtpDepacketizer> depacketizer(new RtpDepacketizerVp9());
|
| + rtc::scoped_ptr<RtpDepacketizer> depacketizer(new RtpDepacketizerVp9());
|
| RtpDepacketizer::ParsedPayload parsed;
|
| ASSERT_TRUE(depacketizer->Parse(&parsed, packet, expected_length));
|
| EXPECT_EQ(kRtpVideoVp9, parsed.type.Video.codec);
|
| @@ -128,12 +127,12 @@
|
| expected_.InitRTPVideoHeaderVP9();
|
| }
|
|
|
| - std::unique_ptr<uint8_t[]> packet_;
|
| - std::unique_ptr<uint8_t[]> payload_;
|
| + rtc::scoped_ptr<uint8_t[]> packet_;
|
| + rtc::scoped_ptr<uint8_t[]> payload_;
|
| size_t payload_size_;
|
| size_t payload_pos_;
|
| RTPVideoHeaderVP9 expected_;
|
| - std::unique_ptr<RtpPacketizerVp9> packetizer_;
|
| + rtc::scoped_ptr<RtpPacketizerVp9> packetizer_;
|
|
|
| void Init(size_t payload_size, size_t packet_size) {
|
| payload_.reset(new uint8_t[payload_size]);
|
| @@ -470,7 +469,7 @@
|
| }
|
|
|
| RTPVideoHeaderVP9 expected_;
|
| - std::unique_ptr<RtpDepacketizer> depacketizer_;
|
| + rtc::scoped_ptr<RtpDepacketizer> depacketizer_;
|
| };
|
|
|
| TEST_F(RtpDepacketizerVp9Test, ParseBasicHeader) {
|
|
|