Rollback of internal changelist 128865569.

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 <string>
 
 #include "net/quic/core/quic_flags.h"
 
 using std::min;
 
 namespace net {
-namespace {
 
-// The estimated system alarm granularity.
-static const QuicTime::Delta kAlarmGranularity =
-    QuicTime::Delta::FromMilliseconds(1);
-
-// Configured maximum size of the burst coming out of quiescence.  The burst
-// is never larger than the current CWND in packets.
-static const uint32_t kInitialUnpacedBurst = 10;
-
-}  // namespace
-
-PacingSender::PacingSender()
-    : sender_(nullptr),
+PacingSender::PacingSender(SendAlgorithmInterface* sender,
+                           QuicTime::Delta alarm_granularity,
+                           uint32_t initial_packet_burst)
+    : sender_(sender),
+      alarm_granularity_(alarm_granularity),
+      initial_packet_burst_(initial_packet_burst),
       max_pacing_rate_(QuicBandwidth::Zero()),
-      burst_tokens_(kInitialUnpacedBurst),
+      burst_tokens_(initial_packet_burst),
       last_delayed_packet_sent_time_(QuicTime::Zero()),
       ideal_next_packet_send_time_(QuicTime::Zero()),
-      was_last_send_delayed_(false),
-      owns_sender_(false) {}
+      was_last_send_delayed_(false) {}
 
-PacingSender::~PacingSender() {
-  if (owns_sender_) {
-    delete sender_;
-  }
-}
+PacingSender::~PacingSender() {}
 
 void PacingSender::SetFromConfig(const QuicConfig& config,
                                  Perspective perspective) {
   sender_->SetFromConfig(config, perspective);
 }
 
 void PacingSender::ResumeConnectionState(
     const CachedNetworkParameters& cached_network_params,
     bool max_bandwidth_resumption) {
   sender_->ResumeConnectionState(cached_network_params,
                                  max_bandwidth_resumption);
 }
 
 void PacingSender::SetNumEmulatedConnections(int num_connections) {
   sender_->SetNumEmulatedConnections(num_connections);
 }
 
 void PacingSender::SetMaxPacingRate(QuicBandwidth max_pacing_rate) {
   max_pacing_rate_ = max_pacing_rate;
 }
 
-void PacingSender::SetSender(SendAlgorithmInterface* sender, bool owns_sender) {
-  if (owns_sender_) {
-    delete sender_;
-  }
-  sender_ = sender;
-  owns_sender_ = owns_sender;
-}
-
 void PacingSender::OnCongestionEvent(bool rtt_updated,
                                      QuicByteCount bytes_in_flight,
                                      const CongestionVector& acked_packets,
                                      const CongestionVector& lost_packets) {
   if (!lost_packets.empty()) {
     // Clear any burst tokens when entering recovery.
     burst_tokens_ = 0;
   }
   sender_->OnCongestionEvent(rtt_updated, bytes_in_flight, acked_packets,
                              lost_packets);
@@ skipping 10 matching lines @@
                             has_retransmittable_data);
   if (has_retransmittable_data != HAS_RETRANSMITTABLE_DATA) {
     return in_flight;
   }
   // If in recovery, the connection is not coming out of quiescence.
   if (bytes_in_flight == 0 && !sender_->InRecovery()) {
     // Add more burst tokens anytime the connection is leaving quiescence, but
     // limit it to the equivalent of a single bulk write, not exceeding the
     // current CWND in packets.
     burst_tokens_ = min(
-        kInitialUnpacedBurst,
+        initial_packet_burst_,
         static_cast<uint32_t>(sender_->GetCongestionWindow() / kDefaultTCPMSS));
   }
   if (burst_tokens_ > 0) {
     --burst_tokens_;
     was_last_send_delayed_ = false;
     last_delayed_packet_sent_time_ = QuicTime::Zero();
     ideal_next_packet_send_time_ = QuicTime::Zero();
     return in_flight;
   }
   // The next packet should be sent as soon as the current packet has been
@@ skipping 45 matching lines @@
     return time_until_send;
   }
 
   if (!time_until_send.IsZero()) {
     DCHECK(time_until_send.IsInfinite());
     // The underlying sender prevents sending.
     return time_until_send;
   }
 
   // If the next send time is within the alarm granularity, send immediately.
-  if (ideal_next_packet_send_time_ > now + kAlarmGranularity) {
+  if (ideal_next_packet_send_time_ > now + alarm_granularity_) {
     DVLOG(1) << "Delaying packet: "
              << (ideal_next_packet_send_time_ - now).ToMicroseconds();
     was_last_send_delayed_ = true;
     return ideal_next_packet_send_time_ - now;
   }
 
   DVLOG(1) << "Sending packet now";
   return QuicTime::Delta::Zero();
 }
 
@@ skipping 32 matching lines @@
 
 CongestionControlType PacingSender::GetCongestionControlType() const {
   return sender_->GetCongestionControlType();
 }
 
 std::string PacingSender::GetDebugState() const {
   return sender_->GetDebugState();
 }
 
 }  // namespace net