Land Recent QUIC Changes.

net/quic/congestion_control/inter_arrival_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.
 
 #ifndef NET_QUIC_CONGESTION_CONTROL_INTER_ARRIVAL_SENDER_H_
 #define NET_QUIC_CONGESTION_CONTROL_INTER_ARRIVAL_SENDER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
 #include "net/quic/congestion_control/channel_estimator.h"
 #include "net/quic/congestion_control/inter_arrival_bitrate_ramp_up.h"
 #include "net/quic/congestion_control/inter_arrival_overuse_detector.h"
 #include "net/quic/congestion_control/inter_arrival_probe.h"
 #include "net/quic/congestion_control/inter_arrival_state_machine.h"
 #include "net/quic/congestion_control/paced_sender.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
 #include "net/quic/quic_bandwidth.h"
 #include "net/quic/quic_clock.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_time.h"
 
 namespace net {
 
 class NET_EXPORT_PRIVATE InterArrivalSender : public SendAlgorithmInterface {
  public:
-  explicit InterArrivalSender(const QuicClock* clock);
+  InterArrivalSender(const QuicClock* clock, const RttStats* rtt_stats);
   virtual ~InterArrivalSender();
 
   // Start implementation of SendAlgorithmInterface.
   virtual void SetFromConfig(const QuicConfig& config, bool is_server) OVERRIDE;
   virtual void OnIncomingQuicCongestionFeedbackFrame(
       const QuicCongestionFeedbackFrame& feedback,
       QuicTime feedback_receive_time) OVERRIDE;
   virtual void OnPacketAcked(QuicPacketSequenceNumber acked_sequence_number,
                              QuicByteCount acked_bytes) OVERRIDE;
   virtual void OnPacketLost(QuicPacketSequenceNumber sequence_number,
                             QuicTime ack_receive_time) OVERRIDE;
   virtual bool OnPacketSent(
       QuicTime sent_time,
       QuicPacketSequenceNumber sequence_number,
       QuicByteCount bytes,
       TransmissionType transmission_type,
       HasRetransmittableData has_retransmittable_data) OVERRIDE;
   virtual void OnRetransmissionTimeout(bool packets_retransmitted) OVERRIDE;
   virtual void OnPacketAbandoned(QuicPacketSequenceNumber sequence_number,
                                  QuicByteCount abandoned_bytes) OVERRIDE;
   virtual QuicTime::Delta TimeUntilSend(
       QuicTime now,
       TransmissionType transmission_type,
       HasRetransmittableData has_retransmittable_data,
       IsHandshake handshake) OVERRIDE;
   virtual QuicBandwidth BandwidthEstimate() const OVERRIDE;
   virtual void UpdateRtt(QuicTime::Delta rtt_sample) OVERRIDE;
-  virtual QuicTime::Delta SmoothedRtt() const OVERRIDE;
   virtual QuicTime::Delta RetransmissionDelay() const OVERRIDE;
   virtual QuicByteCount GetCongestionWindow() const OVERRIDE;
   // End implementation of SendAlgorithmInterface.
 
  private:
   class SentPacket {
    public:
     SentPacket(QuicByteCount bytes, QuicTime timestamp)
         : bytes_sent_(bytes),
           send_timestamp_(timestamp) { }
@@ skipping 22 matching lines @@
   void ResetCurrentBandwidth(QuicTime feedback_receive_time,
                              QuicBandwidth new_rate);
   bool ProbingPhase(QuicTime feedback_receive_time);
   void CleanupPacketHistory();
 
   // Tracks the send time and size of sent packets.  Packets are
   // removed 5 seconds and they've been added.
   SentPacketsMap packet_history_map_;
 
   const QuicClock* clock_;
+  const RttStats* rtt_stats_;
   bool probing_;  // Are we currently in the probing phase?
   QuicByteCount max_segment_size_;
   QuicBandwidth current_bandwidth_;
   QuicTime::Delta smoothed_rtt_;
   scoped_ptr<ChannelEstimator> channel_estimator_;
   scoped_ptr<InterArrivalBitrateRampUp> bitrate_ramp_up_;
   scoped_ptr<InterArrivalOveruseDetector> overuse_detector_;
   scoped_ptr<InterArrivalProbe> probe_;
   scoped_ptr<InterArrivalStateMachine> state_machine_;
   scoped_ptr<PacedSender> paced_sender_;
   BandwidthUsage bandwidth_usage_state_;
   QuicTime back_down_time_;  // Time when we decided to back down.
   QuicBandwidth back_down_bandwidth_;  // Bandwidth before backing down.
   QuicTime::Delta back_down_congestion_delay_;  // Delay when backing down.
 
   DISALLOW_COPY_AND_ASSIGN(InterArrivalSender);
 };
 
 }  // namespace net
 #endif  // NET_QUIC_CONGESTION_CONTROL_INTER_ARRIVAL_SENDER_H_