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

webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_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/remb.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::ElementsAreArray;
 using testing::IsEmpty;
 using testing::make_tuple;
-using webrtc::rtcp::RawPacket;
 using webrtc::rtcp::Remb;
 using webrtc::RTCPUtility::RtcpCommonHeader;
 using webrtc::RTCPUtility::RtcpParseCommonHeader;
 
 namespace webrtc {
 namespace {
 
 const uint32_t kSenderSsrc = 0x12345678;
 const uint32_t kRemoteSsrcs[] = {0x23456789, 0x2345678a, 0x2345678b};
 const uint32_t kBitrateBps = 0x3fb93 * 2;  // 522022;
@@ skipping 11 matching lines @@
 }
 
 TEST(RtcpPacketRembTest, Create) {
   Remb remb;
   remb.From(kSenderSsrc);
   remb.AppliesTo(kRemoteSsrcs[0]);
   remb.AppliesTo(kRemoteSsrcs[1]);
   remb.AppliesTo(kRemoteSsrcs[2]);
   remb.WithBitrateBps(kBitrateBps);
 
-  rtc::scoped_ptr<RawPacket> packet(remb.Build());
+  rtc::Buffer packet = remb.Build();
 
-  EXPECT_THAT(make_tuple(packet->Buffer(), packet->Length()),
+  EXPECT_THAT(make_tuple(packet.data(), packet.size()),
               ElementsAreArray(kPacket));
 }
 
 TEST(RtcpPacketRembTest, Parse) {
   Remb remb;
   EXPECT_TRUE(ParseRemb(kPacket, kPacketLength, &remb));
   const Remb& parsed = remb;
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_EQ(kBitrateBps, parsed.bitrate_bps());
   EXPECT_THAT(parsed.ssrcs(), ElementsAreArray(kRemoteSsrcs));
 }
 
 TEST(RtcpPacketRembTest, CreateAndParseWithoutSsrcs) {
   Remb remb;
   remb.From(kSenderSsrc);
   remb.WithBitrateBps(kBitrateBps);
-  rtc::scoped_ptr<RawPacket> packet(remb.Build());
+  rtc::Buffer packet = remb.Build();
 
   Remb parsed;
-  EXPECT_TRUE(ParseRemb(packet->Buffer(), packet->Length(), &parsed));
+  EXPECT_TRUE(ParseRemb(packet.data(), packet.size(), &parsed));
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_EQ(kBitrateBps, parsed.bitrate_bps());
   EXPECT_THAT(parsed.ssrcs(), IsEmpty());
 }
 
 TEST(RtcpPacketRembTest, ParseFailsOnTooSmallPacketToBeRemb) {
   uint8_t packet[kPacketLength];
   memcpy(packet, kPacket, kPacketLength);
   packet[3] = 3;  // Make it too small.
 
@@ skipping 37 matching lines @@
   EXPECT_TRUE(remb.AppliesToMany(kAllButOneSsrc));
   // Should be no place for 2 more.
   EXPECT_FALSE(remb.AppliesToMany(kTwoSsrcs));
   // But enough place for 1 more.
   EXPECT_TRUE(remb.AppliesTo(kRemoteSsrc));
   // But not for another one.
   EXPECT_FALSE(remb.AppliesTo(kRemoteSsrc));
 }
 }  // namespace
 }  // namespace webrtc