Land Recent QUIC Changes.

net/quic/congestion_control/tcp_cubic_sender.h

Index: net/quic/congestion_control/tcp_cubic_sender.h
diff --git a/net/quic/congestion_control/tcp_cubic_sender.h b/net/quic/congestion_control/tcp_cubic_sender.h
index 21a0256446ca3454a1a2f0f458d7ed1986b7f785..89e9bd63ab876164e43dd4f08c5d77623ecd8376 100644
--- a/net/quic/congestion_control/tcp_cubic_sender.h
+++ b/net/quic/congestion_control/tcp_cubic_sender.h
@@ -24,6 +24,8 @@ namespace net {
 // Default maximum packet size used in Linux TCP implementations.
 const QuicByteCount kDefaultTCPMSS = 1460;
 
+class RttStats;
+
 namespace test {
 class TcpCubicSenderPeer;
 }  // namespace test
@@ -32,6 +34,7 @@ class NET_EXPORT_PRIVATE TcpCubicSender : public SendAlgorithmInterface {
  public:
   // Reno option and max_tcp_congestion_window are provided for testing.
   TcpCubicSender(const QuicClock* clock,
+                 const RttStats* rtt_stats,
                  bool reno,
                  QuicTcpCongestionWindow max_tcp_congestion_window,
                  QuicConnectionStats* stats);
@@ -61,7 +64,6 @@ class NET_EXPORT_PRIVATE TcpCubicSender : public SendAlgorithmInterface {
       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.
@@ -71,14 +73,13 @@ class NET_EXPORT_PRIVATE TcpCubicSender : public SendAlgorithmInterface {
 
   QuicByteCount AvailableSendWindow();
   QuicByteCount SendWindow();
-  void Reset();
   void MaybeIncreaseCwnd(QuicPacketSequenceNumber acked_sequence_number);
   bool IsCwndLimited() const;
   bool InRecovery() const;
-  void OnTimeOut();
 
   HybridSlowStart hybrid_slow_start_;
   Cubic cubic_;
+  const RttStats* rtt_stats_;
 
   // Reno provided for testing.
   const bool reno_;
@@ -122,17 +123,6 @@ class NET_EXPORT_PRIVATE TcpCubicSender : public SendAlgorithmInterface {
   // Maximum number of outstanding packets for tcp.
   QuicTcpCongestionWindow max_tcp_congestion_window_;
 
-  // Min RTT during this session.
-  QuicTime::Delta delay_min_;
-
-  // Smoothed RTT during this session.
-  QuicTime::Delta smoothed_rtt_;
-
-  // Mean RTT deviation during this session.
-  // Approximation of standard deviation, the error is roughly 1.25 times
-  // larger than the standard deviation, for a normally distributed signal.
-  QuicTime::Delta mean_deviation_;
-
   DISALLOW_COPY_AND_ASSIGN(TcpCubicSender);
 };