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 40 matching lines @@
   if (feedback.type == kFixRate) {
     bitrate_ = feedback.fix_rate.bitrate;
     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::OnPacketAcked(
     QuicPacketSequenceNumber /*acked_sequence_number*/,
-    QuicByteCount bytes_acked,
-    QuicTime::Delta rtt) {
-  // RTT can't be negative.
-  DCHECK_LE(0, rtt.ToMicroseconds());
-
+    QuicByteCount bytes_acked) {
   data_in_flight_ -= bytes_acked;
-  if (rtt.IsInfinite()) {
-    return;
-  }
-  latest_rtt_ = rtt;
 }
 
 void FixRateSender::OnPacketLost(QuicPacketSequenceNumber /*sequence_number*/,
                                  QuicTime /*ack_receive_time*/) {
   // Ignore losses for fix rate sender.
 }
 
 bool FixRateSender::OnPacketSent(
     QuicTime sent_time,
     QuicPacketSequenceNumber /*sequence_number*/,
@@ skipping 39 matching lines @@
   QuicByteCount window_size_bytes = bitrate_.ToBytesPerPeriod(
       QuicTime::Delta::FromMicroseconds(kWindowSizeUs));
   // Make sure window size is not less than a packet.
   return max(kDefaultMaxPacketSize, window_size_bytes);
 }
 
 QuicBandwidth FixRateSender::BandwidthEstimate() const {
   return bitrate_;
 }
 
+void FixRateSender::UpdateRtt(QuicTime::Delta rtt_sample) {
+  // RTT can't be negative.
+  DCHECK_LE(0, rtt_sample.ToMicroseconds());
+  if (rtt_sample.IsInfinite()) {
+    return;
+  }
+  latest_rtt_ = rtt_sample;
+}
+
 QuicTime::Delta FixRateSender::SmoothedRtt() const {
   // TODO(satyamshekhar): Calculate and return smoothed rtt.
   return latest_rtt_;
 }
 
 QuicTime::Delta FixRateSender::RetransmissionDelay() const {
   // 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