Landing Recent QUIC changes until Sun Apr 9 16:12:55

net/quic/core/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/core/congestion_control/pacing_sender.h"
 
 #include "net/quic/platform/api/quic_logging.h"
 
 namespace net {
 namespace {
@@ skipping 91 matching lines @@
       was_last_send_delayed_ = false;
       last_delayed_packet_sent_time_ = QuicTime::Zero();
     }
   } else {
     ideal_next_packet_send_time_ =
         std::max(ideal_next_packet_send_time_ + delay, sent_time + delay);
   }
   return in_flight;
 }
 
-QuicTime::Delta PacingSender::TimeUntilSend(
-    QuicTime now,
-    QuicByteCount bytes_in_flight) const {
+QuicTime::Delta PacingSender::TimeUntilSend(QuicTime now,
+                                            QuicByteCount bytes_in_flight) {
   DCHECK(sender_ != nullptr);
   QuicTime::Delta time_until_send =
       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;
   }
 
   if (!time_until_send.IsZero()) {
     DCHECK(time_until_send.IsInfinite());
@@ skipping 17 matching lines @@
   DCHECK(sender_ != nullptr);
   if (!max_pacing_rate_.IsZero()) {
     return QuicBandwidth::FromBitsPerSecond(
         std::min(max_pacing_rate_.ToBitsPerSecond(),
                  sender_->PacingRate(bytes_in_flight).ToBitsPerSecond()));
   }
   return sender_->PacingRate(bytes_in_flight);
 }
 
 }  // namespace net