Index: webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc |
index cd60d9b094ca96bc4f46a4836232ff141661a231..ee8f408720e06db8ec96c85398dd109e6a9ce8c2 100644 |
--- a/webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc |
+++ b/webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc |
@@ -11,10 +11,10 @@ |
#include <string.h> |
#include <list> |
-#include <memory> |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/modules/rtp_rtcp/include/fec_receiver.h" |
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" |
#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" |
@@ -92,9 +92,9 @@ |
uint8_t ulpfec_payload_type); |
MockRtpData rtp_data_callback_; |
- std::unique_ptr<ForwardErrorCorrection> fec_; |
- std::unique_ptr<FecReceiver> receiver_fec_; |
- std::unique_ptr<FrameGenerator> generator_; |
+ rtc::scoped_ptr<ForwardErrorCorrection> fec_; |
+ rtc::scoped_ptr<FecReceiver> receiver_fec_; |
+ rtc::scoped_ptr<FrameGenerator> generator_; |
}; |
void DeletePackets(std::list<Packet*>* packets) { |
@@ -415,12 +415,12 @@ |
size_t length, |
uint8_t ulpfec_payload_type) { |
webrtc::RTPHeader header; |
- std::unique_ptr<webrtc::RtpHeaderParser> parser( |
+ rtc::scoped_ptr<webrtc::RtpHeaderParser> parser( |
webrtc::RtpHeaderParser::Create()); |
ASSERT_TRUE(parser->Parse(data, length, &header)); |
webrtc::NullRtpData null_callback; |
- std::unique_ptr<webrtc::FecReceiver> receiver_fec( |
+ rtc::scoped_ptr<webrtc::FecReceiver> receiver_fec( |
webrtc::FecReceiver::Create(&null_callback)); |
receiver_fec->AddReceivedRedPacket(header, data, length, ulpfec_payload_type); |