Land Recent QUIC changes.

net/quic/congestion_control/inter_arrival_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/inter_arrival_sender.h"
 
 namespace net {
 
 namespace {
 const int64 kProbeBitrateKBytesPerSecond = 1200;  // 9.6 Mbit/s
@@ skipping 217 matching lines @@
   if (!probing_) {
     if (!state_machine_->PacketLossEvent()) {
       // Less than one RTT since last PacketLossEvent.
       return;
     }
     // Calculate new pace rate.
     EstimateBandwidthAfterLossEvent(ack_receive_time);
   }
 }
 
-void InterArrivalSender::SentPacket(QuicTime sent_time,
-                                    QuicPacketSequenceNumber sequence_number,
-                                    QuicByteCount bytes,
-                                    Retransmission /*retransmit*/) {
+bool InterArrivalSender::SentPacket(
+    QuicTime sent_time,
+    QuicPacketSequenceNumber sequence_number,
+    QuicByteCount bytes,
+    Retransmission /*is_retransmit*/,
+    HasRetransmittableData /*has_retransmittable_data*/) {
   if (probing_) {
     probe_->OnSentPacket(bytes);
   }
   paced_sender_->SentPacket(sent_time, bytes);
+  return true;
 }
 
 void InterArrivalSender::AbandoningPacket(
     QuicPacketSequenceNumber /*sequence_number*/,
     QuicByteCount abandoned_bytes) {
   // TODO(pwestin): use for out outer_congestion_window_ logic.
   if (probing_) {
     probe_->OnAcknowledgedPacket(abandoned_bytes);
   }
 }
@@ skipping 240 matching lines @@
   bitrate_ramp_up_->Reset(new_rate, current_bandwidth_, channel_estimate);
   if (new_rate != current_bandwidth_) {
     current_bandwidth_ = new_rate;
     paced_sender_->UpdateBandwidthEstimate(feedback_receive_time,
                                            current_bandwidth_);
     state_machine_->DecreaseBitrateDecision();
   }
 }
 
 }  // namespace net