Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc |
index d65af46fd7b19bd9485e57839250b7cf9a734bbc..c3b43e4e72dbc751ad23e0eb5b1dc3499fb642d5 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc |
@@ -16,7 +16,6 @@ |
using testing::ElementsAreArray; |
using testing::IsEmpty; |
using testing::make_tuple; |
-using webrtc::rtcp::RawPacket; |
using webrtc::rtcp::TmmbItem; |
using webrtc::rtcp::Tmmbn; |
using webrtc::RTCPUtility::RtcpCommonHeader; |
@@ -47,9 +46,9 @@ TEST(RtcpPacketTmmbnTest, Create) { |
tmmbn.From(kSenderSsrc); |
tmmbn.WithTmmbr(TmmbItem(kRemoteSsrc, kBitrateBps, kOverhead)); |
- rtc::scoped_ptr<RawPacket> packet = tmmbn.Build(); |
+ rtc::Buffer packet = tmmbn.Build(); |
- EXPECT_THAT(make_tuple(packet->Buffer(), packet->Length()), |
+ EXPECT_THAT(make_tuple(packet.data(), packet.size()), |
ElementsAreArray(kPacket)); |
} |
@@ -70,9 +69,9 @@ TEST(RtcpPacketTmmbnTest, CreateAndParseWithoutItems) { |
Tmmbn tmmbn; |
tmmbn.From(kSenderSsrc); |
- rtc::scoped_ptr<RawPacket> packet = tmmbn.Build(); |
+ rtc::Buffer packet = tmmbn.Build(); |
Tmmbn parsed; |
- EXPECT_TRUE(ParseTmmbn(packet->Buffer(), packet->Length(), &parsed)); |
+ EXPECT_TRUE(ParseTmmbn(packet.data(), packet.size(), &parsed)); |
EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc()); |
EXPECT_THAT(parsed.items(), IsEmpty()); |
@@ -84,9 +83,9 @@ TEST(RtcpPacketTmmbnTest, CreateAndParseWithTwoItems) { |
tmmbn.WithTmmbr(TmmbItem(kRemoteSsrc, kBitrateBps, kOverhead)); |
tmmbn.WithTmmbr(TmmbItem(kRemoteSsrc + 1, 4 * kBitrateBps, 40)); |
- rtc::scoped_ptr<RawPacket> packet = tmmbn.Build(); |
+ rtc::Buffer packet = tmmbn.Build(); |
Tmmbn parsed; |
- EXPECT_TRUE(ParseTmmbn(packet->Buffer(), packet->Length(), &parsed)); |
+ EXPECT_TRUE(ParseTmmbn(packet.data(), packet.size(), &parsed)); |
EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc()); |
EXPECT_EQ(2u, parsed.items().size()); |