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 42 matching lines @@
   if (rtt.IsInfinite()) {
     return;
   }
   latest_rtt_ = rtt;
 }
 
 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) {
+bool FixRateSender::SentPacket(
+    QuicTime sent_time,
+    QuicPacketSequenceNumber /*sequence_number*/,
+    QuicByteCount bytes,
+    Retransmission is_retransmission,
+    HasRetransmittableData /*has_retransmittable_data*/) {
   fix_rate_leaky_bucket_.Add(sent_time, bytes);
   paced_sender_.SentPacket(sent_time, bytes);
   if (is_retransmission == NOT_RETRANSMISSION) {
     data_in_flight_ += bytes;
   }
+  return true;
 }
 
 void FixRateSender::AbandoningPacket(
     QuicPacketSequenceNumber /*sequence_number*/,
     QuicByteCount /*abandoned_bytes*/) {
 }
 
 QuicTime::Delta FixRateSender::TimeUntilSend(
     QuicTime now,
     Retransmission /*is_retransmission*/,
@@ skipping 30 matching lines @@
   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