Land Recent QUIC Changes until 03/27/2015

net/quic/congestion_control/pacing_sender.h

 // 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.
 //
 // A send algorithm that adds pacing on top of an another send algorithm.
 // It uses the underlying sender's pacing rate to schedule packets.
 // It also takes into consideration the expected granularity of the underlying
 // alarm to ensure that alarms are not set too aggressively, and err towards
 // sending packets too early instead of too late.
 
 #ifndef NET_QUIC_CONGESTION_CONTROL_PACING_SENDER_H_
 #define NET_QUIC_CONGESTION_CONTROL_PACING_SENDER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
-#include "net/quic/crypto/cached_network_parameters.h"
 #include "net/quic/quic_bandwidth.h"
 #include "net/quic/quic_config.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_time.h"
 
 namespace net {
 
 class NET_EXPORT_PRIVATE PacingSender : public SendAlgorithmInterface {
  public:
   // Create a PacingSender to wrap the specified sender.  |alarm_granularity|
   // indicates to the pacer to send that far into the future, since it should
   // not expect a callback before that time delta.  |initial_packet_burst| is
   // the number of packets sent without pacing after quiescence.
   PacingSender(SendAlgorithmInterface* sender,
                QuicTime::Delta alarm_granularity,
                uint32 initial_packet_burst);
   ~PacingSender() override;
 
   // SendAlgorithmInterface methods.
   void SetFromConfig(const QuicConfig& config,
-                     Perspective perspective,
-                     bool using_pacing) override;
+                     Perspective perspective) override;
   bool ResumeConnectionState(
       const CachedNetworkParameters& cached_network_params,
       bool max_bandwidth_resumption) override;
   void SetNumEmulatedConnections(int num_connections) override;
   void SetMaxCongestionWindow(QuicByteCount max_congestion_window) override;
   void OnCongestionEvent(bool rtt_updated,
                          QuicByteCount bytes_in_flight,
                          const CongestionVector& acked_packets,
                          const CongestionVector& lost_packets) override;
   bool OnPacketSent(QuicTime sent_time,
@@ skipping 29 matching lines @@
   QuicTime last_delayed_packet_sent_time_;
   QuicTime ideal_next_packet_send_time_;  // When can the next packet be sent.
   mutable bool was_last_send_delayed_;  // True when the last send was delayed.
 
   DISALLOW_COPY_AND_ASSIGN(PacingSender);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CONGESTION_CONTROL_PACING_SENDER_H_