Land Recent QUIC Changes.

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 which adds pacing on top of an another send algorithm.
 // It uses the underlying sender's bandwidth estimate to determine the
 // pacing rate to be used.  It also takes into consideration the expected
 // resolution of the underlying alarm mechanism to ensure that alarms are
 // not set too aggressively, and to smooth out variations.
 
@@ skipping 18 matching lines @@
   // 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);
   virtual ~PacingSender();
 
   // SendAlgorithmInterface methods.
   virtual void SetFromConfig(const QuicConfig& config, bool is_server) OVERRIDE;
+  virtual void SetNumEmulatedConnections(int num_connections) OVERRIDE;
   virtual void OnIncomingQuicCongestionFeedbackFrame(
       const QuicCongestionFeedbackFrame& feedback,
       QuicTime feedback_receive_time) OVERRIDE;
   virtual void OnCongestionEvent(bool rtt_updated,
                                  QuicByteCount bytes_in_flight,
                                  const CongestionVector& acked_packets,
                                  const CongestionVector& lost_packets) OVERRIDE;
   virtual bool OnPacketSent(QuicTime sent_time,
                             QuicByteCount bytes_in_flight,
                             QuicPacketSequenceNumber sequence_number,
@@ skipping 24 matching lines @@
   QuicTime next_packet_send_time_;  // When can the next packet be sent.
   mutable bool was_last_send_delayed_;  // True when the last send was delayed.
   bool has_valid_rtt_;  // True if we have at least one RTT update.
 
   DISALLOW_COPY_AND_ASSIGN(PacingSender);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CONGESTION_CONTROL_PACING_SENDER_H_