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 "base/logging.h"
 #include "net/quic/quic_protocol.h"
@@ skipping 28 matching lines @@
     fix_rate_leaky_bucket_.SetDrainingRate(feedback_receive_time, bitrate_);
     paced_sender_.UpdateBandwidthEstimate(feedback_receive_time, bitrate_);
   }
   // Silently ignore invalid messages in release mode.
 }
 
 void FixRateSender::OnIncomingAck(
     QuicPacketSequenceNumber /*acked_sequence_number*/,
     QuicByteCount bytes_acked,
     QuicTime::Delta rtt) {
+  // RTT can't be negative.
+  DCHECK_LE(0, rtt.ToMicroseconds());
+
+  data_in_flight_ -= bytes_acked;
+  if (rtt.IsInfinite()) {
+    return;
+  }
   latest_rtt_ = rtt;
-  data_in_flight_ -= bytes_acked;
 }
 
 void FixRateSender::OnIncomingLoss(QuicTime /*ack_receive_time*/) {
   // Ignore losses for fix rate sender.
 }
 
 void FixRateSender::SentPacket(QuicTime sent_time,
                                QuicPacketSequenceNumber /*sequence_number*/,
                                QuicByteCount bytes,
                                Retransmission is_retransmission) {
@@ skipping 37 matching lines @@
 
 QuicBandwidth FixRateSender::BandwidthEstimate() {
   return bitrate_;
 }
 
 QuicTime::Delta FixRateSender::SmoothedRtt() {
   // TODO(satyamshekhar): Calculate and return smoothed rtt.
   return latest_rtt_;
 }
 
+QuicTime::Delta FixRateSender::RetransmissionDelay() {
+  // TODO(pwestin): Calculate and return retransmission delay.
+  // Use 2 * the latest RTT for now.
+  return latest_rtt_.Add(latest_rtt_);
+}
+
 }  // namespace net