Land Recent QUIC Changes until 03/27/2015

net/quic/congestion_control/tcp_cubic_bytes_sender.h

 // Copyright (c) 2015 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.
 
 // TCP cubic send side congestion algorithm, emulates the behavior of TCP cubic.
 
 #ifndef NET_QUIC_CONGESTION_CONTROL_TCP_CUBIC_BYTES_SENDER_H_
 #define NET_QUIC_CONGESTION_CONTROL_TCP_CUBIC_BYTES_SENDER_H_
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
   TcpCubicBytesSender(const QuicClock* clock,
                       const RttStats* rtt_stats,
                       bool reno,
                       QuicPacketCount initial_tcp_congestion_window,
                       QuicPacketCount max_congestion_window,
                       QuicConnectionStats* stats);
   ~TcpCubicBytesSender() override;
 
   // Start implementation of SendAlgorithmInterface.
   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 76 matching lines @@
   bool last_cutback_exited_slowstart_;
 
   const QuicClock* clock_;
 
   DISALLOW_COPY_AND_ASSIGN(TcpCubicBytesSender);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CONGESTION_CONTROL_TCP_CUBIC_BYTES_SENDER_H_