Revert of Wire up send-side bandwidth estimation.

webrtc/modules/rtp_rtcp/source/rtcp_packet.h

 /*
  *  Copyright (c) 2014 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.
  *
  */
@@ skipping 73 matching lines @@
   // Returns true if all calls to Create succeeded. A buffer of size
   // IP_PACKET_SIZE will be allocated and reused between calls to callback.
   bool Build(PacketReadyCallback* callback) const;
 
   // Returns true if all calls to Create succeeded. Provided buffer reference
   // will be used for all calls to callback.
   bool BuildExternalBuffer(uint8_t* buffer,
                            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() {}
 
   virtual bool Create(uint8_t* packet,
                       size_t* index,
                       size_t max_length,
                       PacketReadyCallback* callback) const = 0;
 
   static void CreateHeader(uint8_t count_or_format,
                            uint8_t packet_type,
                            size_t block_length,  // Size in 32bit words - 1.
                            uint8_t* buffer,
                            size_t* pos);
 
   bool OnBufferFull(uint8_t* packet,
                     size_t* index,
                     RtcpPacket::PacketReadyCallback* callback) const;
 
+  virtual size_t BlockLength() const = 0;
   size_t HeaderLength() const;
 
   static const size_t kHeaderLength = 4;
 
  private:
   bool CreateAndAddAppended(uint8_t* packet,
                             size_t* index,
                             size_t max_length,
                             PacketReadyCallback* callback) const;
 
@@ skipping 1032 matching lines @@
 
  private:
   const size_t buffer_length_;
   size_t length_;
   rtc::scoped_ptr<uint8_t[]> buffer_;
 };
 
 }  // namespace rtcp
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_RTCP_PACKET_H_