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"
@@ skipping 40 matching lines @@
   virtual void AbandoningPacket(QuicPacketSequenceNumber sequence_number,
                                 QuicByteCount abandoned_bytes) OVERRIDE;
 
   virtual QuicTime::Delta TimeUntilSend(
       QuicTime now,
       Retransmission is_retransmission,
       HasRetransmittableData has_retransmittable_data) OVERRIDE;
 
   virtual QuicBandwidth BandwidthEstimate() OVERRIDE;
   virtual QuicTime::Delta SmoothedRtt() OVERRIDE;
+  virtual QuicTime::Delta RetransmissionDelay() OVERRIDE;
   // End implementation of SendAlgorithmInterface.
 
  private:
   void EstimateDelayBandwidth(QuicTime feedback_receive_time,
                               QuicBandwidth sent_bandwidth);
   void EstimateNewBandwidth(QuicTime feedback_receive_time,
                             QuicBandwidth sent_bandwidth);
   void EstimateNewBandwidthAfterDraining(
       QuicTime feedback_receive_time,
       QuicTime::Delta estimated_congestion_delay);
@@ skipping 18 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_