[rtp_rtcp] rtc::scoped_ptr<rtcp::RawPacket> replaced with rtc::Buffer

webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
 #include "webrtc/test/rtcp_packet_parser.h"
 
 using webrtc::rtcp::Bye;
 using webrtc::rtcp::CompoundPacket;
 using webrtc::rtcp::Fir;
-using webrtc::rtcp::RawPacket;
 using webrtc::rtcp::ReceiverReport;
 using webrtc::rtcp::ReportBlock;
 using webrtc::rtcp::SenderReport;
 using webrtc::test::RtcpPacketParser;
 
 namespace webrtc {
 
 const uint32_t kSenderSsrc = 0x12345678;
 const uint32_t kRemoteSsrc = 0x23456789;
 const uint8_t kSeqNo = 13;
 
 TEST(RtcpCompoundPacketTest, AppendPacket) {
   Fir fir;
   fir.WithRequestTo(kRemoteSsrc, kSeqNo);
   ReportBlock rb;
   ReceiverReport rr;
   rr.From(kSenderSsrc);
   EXPECT_TRUE(rr.WithReportBlock(rb));
   rr.Append(&fir);
 
-  rtc::scoped_ptr<RawPacket> packet(rr.Build());
+  rtc::Buffer packet = rr.Build();
   RtcpPacketParser parser;
-  parser.Parse(packet->Buffer(), packet->Length());
+  parser.Parse(packet.data(), packet.size());
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
   EXPECT_EQ(kSenderSsrc, parser.receiver_report()->Ssrc());
   EXPECT_EQ(1, parser.report_block()->num_packets());
   EXPECT_EQ(1, parser.fir()->num_packets());
 }
 
 TEST(RtcpCompoundPacketTest, AppendPacketOnEmpty) {
   CompoundPacket empty;
   ReceiverReport rr;
   rr.From(kSenderSsrc);
   empty.Append(&rr);
 
-  rtc::scoped_ptr<RawPacket> packet(empty.Build());
+  rtc::Buffer packet = empty.Build();
   RtcpPacketParser parser;
-  parser.Parse(packet->Buffer(), packet->Length());
+  parser.Parse(packet.data(), packet.size());
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
   EXPECT_EQ(0, parser.report_block()->num_packets());
 }
 
 TEST(RtcpCompoundPacketTest, AppendPacketWithOwnAppendedPacket) {
   Fir fir;
   fir.WithRequestTo(kRemoteSsrc, kSeqNo);
   Bye bye;
   ReportBlock rb;
 
   ReceiverReport rr;
   EXPECT_TRUE(rr.WithReportBlock(rb));
   rr.Append(&fir);
 
   SenderReport sr;
   sr.Append(&bye);
   sr.Append(&rr);
 
-  rtc::scoped_ptr<RawPacket> packet(sr.Build());
+  rtc::Buffer packet = sr.Build();
   RtcpPacketParser parser;
-  parser.Parse(packet->Buffer(), packet->Length());
+  parser.Parse(packet.data(), packet.size());
   EXPECT_EQ(1, parser.sender_report()->num_packets());
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
   EXPECT_EQ(1, parser.report_block()->num_packets());
   EXPECT_EQ(1, parser.bye()->num_packets());
   EXPECT_EQ(1, parser.fir()->num_packets());
 }
 
 TEST(RtcpCompoundPacketTest, BuildWithInputBuffer) {
   Fir fir;
   fir.WithRequestTo(kRemoteSsrc, kSeqNo);
@@ skipping 62 matching lines @@
 
     int packets_created_ = 0;
   } verifier;
   const size_t kBufferSize = kRrLength + kReportBlockLength;
   uint8_t buffer[kBufferSize];
   EXPECT_TRUE(rr.BuildExternalBuffer(buffer, kBufferSize, &verifier));
   EXPECT_EQ(2, verifier.packets_created_);
 }
 
 }  // namespace webrtc