Land Recent QUIC Changes.

net/quic/congestion_control/fix_rate_sender.cc

 // 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.
 
 #include "net/quic/congestion_control/fix_rate_sender.h"
 
 #include <math.h>
 
 #include <algorithm>
 
@@ skipping 47 matching lines @@
     QuicTime sent_time,
     QuicByteCount /*bytes_in_flight*/,
     QuicPacketSequenceNumber /*sequence_number*/,
     QuicByteCount bytes,
     HasRetransmittableData /*has_retransmittable_data*/) {
   fix_rate_leaky_bucket_.Add(sent_time, bytes);
 
   return true;
 }
 
-void FixRateSender::OnRetransmissionTimeout(bool packets_retransmitted) { }
+void FixRateSender::OnRetransmissionTimeout(bool packets_retransmitted) {}
+
+void FixRateSender::RevertRetransmissionTimeout() {}
 
 QuicTime::Delta FixRateSender::TimeUntilSend(
     QuicTime now,
     QuicByteCount /*bytes_in_flight*/,
     HasRetransmittableData /*has_retransmittable_data*/) const {
   return fix_rate_leaky_bucket_.TimeRemaining(now);
 }
 
 QuicByteCount FixRateSender::CongestionWindow() const {
   QuicByteCount window_size_bytes = bitrate_.ToBytesPerPeriod(
@@ skipping 11 matching lines @@
   // TODO(pwestin): Calculate and return retransmission delay.
   // Use 2 * the latest RTT for now.
   return latest_rtt_.Add(latest_rtt_);
 }
 
 QuicByteCount FixRateSender::GetCongestionWindow() const {
   return 0;
 }
 
 }  // namespace net