Land Recent QUIC changes.

net/quic/congestion_control/fix_rate_sender.h

 // 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.
 //
 // Fix rate send side congestion control, used for testing.
 
 #ifndef NET_QUIC_CONGESTION_CONTROL_FIX_RATE_SENDER_H_
 #define NET_QUIC_CONGESTION_CONTROL_FIX_RATE_SENDER_H_
 
 #include "base/basictypes.h"
@@ skipping 26 matching lines @@
                           QuicByteCount bytes,
                           Retransmission is_retransmission) OVERRIDE;
   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:
   QuicByteCount CongestionWindow();
 
   QuicBandwidth bitrate_;
   LeakyBucket fix_rate_leaky_bucket_;
   PacedSender paced_sender_;
   QuicByteCount data_in_flight_;
   QuicTime::Delta latest_rtt_;
 
   DISALLOW_COPY_AND_ASSIGN(FixRateSender);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CONGESTION_CONTROL_FIX_RATE_SENDER_H_