Landing Recent QUIC changes until 2016-03-15 16:26 UTC

net/quic/congestion_control/pacing_sender.cc

Index: net/quic/congestion_control/pacing_sender.cc
diff --git a/net/quic/congestion_control/pacing_sender.cc b/net/quic/congestion_control/pacing_sender.cc
index 9789da1b72b34171a26f2c6e7259a63da35b9c1a..8b1e5354bbd138d2f544f5bfd839ebf239c60482 100644
--- a/net/quic/congestion_control/pacing_sender.cc
+++ b/net/quic/congestion_control/pacing_sender.cc
@@ -117,10 +117,9 @@ void PacingSender::OnConnectionMigration() {
 
 QuicTime::Delta PacingSender::TimeUntilSend(
     QuicTime now,
-    QuicByteCount bytes_in_flight,
-    HasRetransmittableData has_retransmittable_data) const {
+    QuicByteCount bytes_in_flight) const {
   QuicTime::Delta time_until_send =
-      sender_->TimeUntilSend(now, bytes_in_flight, has_retransmittable_data);
+      sender_->TimeUntilSend(now, bytes_in_flight);
   if (burst_tokens_ > 0 || bytes_in_flight == 0) {
     // Don't pace if we have burst tokens available or leaving quiescence.
     return time_until_send;
@@ -132,12 +131,6 @@ QuicTime::Delta PacingSender::TimeUntilSend(
     return time_until_send;
   }
 
-  if (has_retransmittable_data == NO_RETRANSMITTABLE_DATA) {
-    // Don't pace ACK packets, since they do not count against CWND and do not
-    // cause CWND to grow.
-    return QuicTime::Delta::Zero();
-  }
-
   // If the next send time is within the alarm granularity, send immediately.
   if (ideal_next_packet_send_time_ > now.Add(alarm_granularity_)) {
     DVLOG(1) << "Delaying packet: "