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 49 matching lines @@
     // a bottleneck.
     const float kPacingAggression = 2;
     QuicTime::Delta delay =
         BandwidthEstimate().Scale(kPacingAggression).TransferTime(bytes);
     next_packet_send_time_ = next_packet_send_time_.Add(delay);
   }
   return sender_->OnPacketSent(sent_time, sequence_number, bytes,
                                transmission_type, has_retransmittable_data);
 }
 
-void PacingSender::OnRetransmissionTimeout() {
-  sender_->OnRetransmissionTimeout();
+void PacingSender::OnRetransmissionTimeout(bool packets_retransmitted) {
+  sender_->OnRetransmissionTimeout(packets_retransmitted);
 }
 
 void PacingSender::OnPacketAbandoned(QuicPacketSequenceNumber sequence_number,
                                      QuicByteCount abandoned_bytes) {
   sender_->OnPacketAbandoned(sequence_number, abandoned_bytes);
 }
 
 QuicTime::Delta PacingSender::TimeUntilSend(
       QuicTime now,
       TransmissionType transmission_type,
@@ skipping 47 matching lines @@
 
 QuicTime::Delta PacingSender::RetransmissionDelay() const {
   return sender_->RetransmissionDelay();
 }
 
 QuicByteCount PacingSender::GetCongestionWindow() const {
   return sender_->GetCongestionWindow();
 }
 
 }  // namespace net