Land Recent QUIC changes.

net/quic/congestion_control/inter_arrival_sender.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.
 
 #ifndef NET_QUIC_CONGESTION_CONTROL_INTER_ARRIVAL_SENDER_H_
 #define NET_QUIC_CONGESTION_CONTROL_INTER_ARRIVAL_SENDER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
 #include "net/quic/congestion_control/channel_estimator.h"
 #include "net/quic/congestion_control/inter_arrival_bitrate_ramp_up.h"
 #include "net/quic/congestion_control/inter_arrival_overuse_detector.h"
 #include "net/quic/congestion_control/inter_arrival_probe.h"
 #include "net/quic/congestion_control/inter_arrival_state_machine.h"
 #include "net/quic/congestion_control/paced_sender.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
 #include "net/quic/quic_bandwidth.h"
 #include "net/quic/quic_clock.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_time.h"
 
 namespace net {
 
 class NET_EXPORT_PRIVATE InterArrivalSender : public SendAlgorithmInterface {
  public:
   explicit InterArrivalSender(const QuicClock* clock);
   virtual ~InterArrivalSender();
 
+  static QuicBandwidth CalculateSentBandwidth(
+      const SendAlgorithmInterface::SentPacketsMap& sent_packets_map,
+      QuicTime feedback_receive_time);
+
   // Start implementation of SendAlgorithmInterface.
   virtual void OnIncomingQuicCongestionFeedbackFrame(
       const QuicCongestionFeedbackFrame& feedback,
       QuicTime feedback_receive_time,
-      QuicBandwidth sent_bandwidth,
       const SentPacketsMap& sent_packets) OVERRIDE;
 
   virtual void OnIncomingAck(QuicPacketSequenceNumber acked_sequence_number,
                              QuicByteCount acked_bytes,
                              QuicTime::Delta rtt) OVERRIDE;
 
   virtual void OnIncomingLoss(QuicTime ack_receive_time) OVERRIDE;
 
   virtual void SentPacket(QuicTime sent_time,
                           QuicPacketSequenceNumber sequence_number,
@@ skipping 41 matching lines @@
   BandwidthUsage bandwidth_usage_state_;
   QuicTime back_down_time_;  // Time when we decided to back down.
   QuicBandwidth back_down_bandwidth_;  // Bandwidth before backing down.
   QuicTime::Delta back_down_congestion_delay_;  // Delay when backing down.
 
   DISALLOW_COPY_AND_ASSIGN(InterArrivalSender);
 };
 
 }  // namespace net
 #endif  // NET_QUIC_CONGESTION_CONTROL_INTER_ARRIVAL_SENDER_H_