Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc |
index ff3da600a52f0f577f79aad408fb4f0e7928b5dc..d6c7fc1dc4fdb95b062faaab2e8acdee56d01444 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc |
@@ -12,7 +12,6 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
-using webrtc::rtcp::RawPacket; |
using webrtc::rtcp::ReceiverReport; |
using webrtc::rtcp::ReportBlock; |
using webrtc::RTCPUtility::RtcpCommonHeader; |
@@ -42,15 +41,14 @@ class RtcpPacketReceiverReportTest : public ::testing::Test { |
void BuildPacket() { packet = rr.Build(); } |
void ParsePacket() { |
RtcpCommonHeader header; |
- EXPECT_TRUE( |
- RtcpParseCommonHeader(packet->Buffer(), packet->Length(), &header)); |
- EXPECT_EQ(header.BlockSize(), packet->Length()); |
+ EXPECT_TRUE(RtcpParseCommonHeader(packet.data(), packet.size(), &header)); |
+ EXPECT_EQ(header.BlockSize(), packet.size()); |
EXPECT_TRUE(parsed_.Parse( |
- header, packet->Buffer() + RtcpCommonHeader::kHeaderSizeBytes)); |
+ header, packet.data() + RtcpCommonHeader::kHeaderSizeBytes)); |
pbos-webrtc
2016/02/16 10:31:23
I think I've seen this function far too many times
|
} |
ReceiverReport rr; |
- rtc::scoped_ptr<RawPacket> packet; |
+ rtc::Buffer packet; |
const ReceiverReport& parsed() { return parsed_; } |
private: |
@@ -96,8 +94,8 @@ TEST_F(RtcpPacketReceiverReportTest, Create) { |
BuildPacket(); |
- ASSERT_EQ(kPacketLength, packet->Length()); |
- EXPECT_EQ(0, memcmp(kPacket, packet->Buffer(), kPacketLength)); |
+ ASSERT_EQ(kPacketLength, packet.size()); |
+ EXPECT_EQ(0, memcmp(kPacket, packet.data(), kPacketLength)); |
} |
TEST_F(RtcpPacketReceiverReportTest, WithoutReportBlocks) { |