Land Recent QUIC changes.

net/quic/congestion_control/fix_rate_sender.cc

Index: net/quic/congestion_control/fix_rate_sender.cc
diff --git a/net/quic/congestion_control/fix_rate_sender.cc b/net/quic/congestion_control/fix_rate_sender.cc
index 22f759fa0368cd948b58b34e209abe576bf95a89..99aa10fabf8b06b57da8fea2b4de5811cc1b8ca4 100644
--- a/net/quic/congestion_control/fix_rate_sender.cc
+++ b/net/quic/congestion_control/fix_rate_sender.cc
@@ -60,15 +60,18 @@ 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(