[rtp_rtcp] Append functionality moved from base RtcpPacket class to CompoundPacket

webrtc/modules/rtp_rtcp/source/rtcp_packet.cc

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
index b69f50712760d9f2384265eba2d235942b06baa2..87b086de9dd4172d087b06b1442dbc16b8fa82bc 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
@@ -26,11 +26,6 @@ void AssignUWord16(uint8_t* buffer, size_t* offset, uint16_t value) {
 }
 }  // namespace
 
-void RtcpPacket::Append(RtcpPacket* packet) {
-  assert(packet);
-  appended_packets_.push_back(packet);
-}
-
 rtc::Buffer RtcpPacket::Build() const {
   size_t length = 0;
   rtc::Buffer packet(IP_PACKET_SIZE);
@@ -50,7 +45,7 @@ rtc::Buffer RtcpPacket::Build() const {
     bool called_;
     rtc::Buffer* const packet_;
   } verifier(&packet);
-  CreateAndAddAppended(packet.data(), &length, packet.capacity(), &verifier);
+  Create(packet.data(), &length, packet.capacity(), &verifier);
   OnBufferFull(packet.data(), &length, &verifier);
   return packet;
 }
@@ -64,24 +59,11 @@ bool RtcpPacket::BuildExternalBuffer(uint8_t* buffer,
                                      size_t max_length,
                                      PacketReadyCallback* callback) const {
   size_t index = 0;
-  if (!CreateAndAddAppended(buffer, &index, max_length, callback))
+  if (!Create(buffer, &index, max_length, callback))
     return false;
   return OnBufferFull(buffer, &index, callback);
 }
 
-bool RtcpPacket::CreateAndAddAppended(uint8_t* packet,
-                                      size_t* index,
-                                      size_t max_length,
-                                      PacketReadyCallback* callback) const {
-  if (!Create(packet, index, max_length, callback))
-    return false;
-  for (RtcpPacket* appended : appended_packets_) {
-    if (!appended->CreateAndAddAppended(packet, index, max_length, callback))
-      return false;
-  }
-  return true;
-}
-
 bool RtcpPacket::OnBufferFull(uint8_t* packet,
                               size_t* index,
                               RtcpPacket::PacketReadyCallback* callback) const {