Land Recent QUIC changes.

net/quic/congestion_control/quic_congestion_manager.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This is the interface from the QuicConnection into the QUIC
 // congestion control code.  It wraps the SendAlgorithmInterface and
@@ skipping 84 matching lines @@
   QuicBandwidth BandwidthEstimate();
 
  private:
   friend class test::QuicConnectionPeer;
   friend class test::QuicCongestionManagerPeer;
   typedef std::map<QuicPacketSequenceNumber, size_t> PendingPacketsMap;
 
   // Get the current(last) rtt. Infinite is returned if invalid.
   const QuicTime::Delta rtt();
 
-  QuicBandwidth SentBandwidth(QuicTime feedback_receive_time) const;
   void CleanupPacketHistory();
 
   const QuicClock* clock_;
   scoped_ptr<ReceiveAlgorithmInterface> receive_algorithm_;
   scoped_ptr<SendAlgorithmInterface> send_algorithm_;
   SendAlgorithmInterface::SentPacketsMap packet_history_map_;
   PendingPacketsMap pending_packets_;
   QuicPacketSequenceNumber largest_missing_;
   QuicTime::Delta current_rtt_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCongestionManager);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CONGESTION_CONTROL_QUIC_CONGESTION_MANAGER_H_