Reland "Wire up send-side bandwidth estimation."

webrtc/modules/rtp_rtcp/source/rtcp_packet.h

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet.h
index f29540100b54f9eb234a30cab616ba2d2d5fc7e9..3c34957c361bab8f206791dc7670bd59194a3e48 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.h
@@ -91,6 +91,9 @@ class RtcpPacket {
                            size_t max_length,
                            PacketReadyCallback* callback) const;
 
+  // Size of this packet in bytes (including headers, excluding nested packets).
+  virtual size_t BlockLength() const = 0;
+
  protected:
   RtcpPacket() {}
 
@@ -109,7 +112,6 @@ class RtcpPacket {
                     size_t* index,
                     RtcpPacket::PacketReadyCallback* callback) const;
 
-  virtual size_t BlockLength() const = 0;
   size_t HeaderLength() const;
 
   static const size_t kHeaderLength = 4;