Land Recent QUIC Changes.

net/quic/congestion_control/pacing_sender.cc

 // 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.
 
 #include "net/quic/congestion_control/pacing_sender.h"
 
 namespace net {
 
 PacingSender::PacingSender(SendAlgorithmInterface* sender,
                            QuicTime::Delta alarm_granularity)
@@ skipping 18 matching lines @@
 void PacingSender::OnIncomingQuicCongestionFeedbackFrame(
       const QuicCongestionFeedbackFrame& feedback,
       QuicTime feedback_receive_time,
       const SendAlgorithmInterface::SentPacketsMap& sent_packets) {
   sender_->OnIncomingQuicCongestionFeedbackFrame(
       feedback, feedback_receive_time, sent_packets);
 }
 
 void PacingSender::OnPacketAcked(
     QuicPacketSequenceNumber acked_sequence_number,
-    QuicByteCount acked_bytes,
-    QuicTime::Delta rtt) {
-  sender_->OnPacketAcked(acked_sequence_number, acked_bytes, rtt);
+    QuicByteCount acked_bytes) {
+  sender_->OnPacketAcked(acked_sequence_number, acked_bytes);
 }
 
 void PacingSender::OnPacketLost(QuicPacketSequenceNumber sequence_number,
                                 QuicTime ack_receive_time) {
   sender_->OnPacketLost(sequence_number, ack_receive_time);
 }
 
 bool PacingSender::OnPacketSent(
     QuicTime sent_time,
     QuicPacketSequenceNumber sequence_number,
@@ skipping 64 matching lines @@
   // Sent it immediately.  The epoch end will be adjusted in OnPacketSent.
   was_last_send_delayed_ = false;
   DVLOG(1) << "Sending packet now";
   return QuicTime::Delta::Zero();
 }
 
 QuicBandwidth PacingSender::BandwidthEstimate() const {
   return sender_->BandwidthEstimate();
 }
 
+void PacingSender::UpdateRtt(QuicTime::Delta rtt_sample) {
+  sender_->UpdateRtt(rtt_sample);
+}
+
 QuicTime::Delta PacingSender::SmoothedRtt() const {
   return sender_->SmoothedRtt();
 }
 
 QuicTime::Delta PacingSender::RetransmissionDelay() const {
   return sender_->RetransmissionDelay();
 }
 
 QuicByteCount PacingSender::GetCongestionWindow() const {
   return sender_->GetCongestionWindow();
 }
 
 }  // namespace net