Land Recent QUIC Changes until 03/15/2015.

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 757934b479b2f176e6b1e9bca1d693f217ba3743..3667f675d61cf6418132c314f4fe4b06cb953ac2 100644
--- a/net/quic/congestion_control/tcp_cubic_sender.h
+++ b/net/quic/congestion_control/tcp_cubic_sender.h
@@ -30,10 +30,12 @@ class TcpCubicSenderPeer;
 
 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,
                  QuicPacketCount initial_tcp_congestion_window,
+                 QuicPacketCount max_tcp_congestion_window,
                  QuicConnectionStats* stats);
   ~TcpCubicSender() override;
 
@@ -99,7 +101,7 @@ class NET_EXPORT_PRIVATE TcpCubicSender : public SendAlgorithmInterface {
   uint32 num_connections_;
 
   // ACK counter for the Reno implementation.
-  uint64 num_acked_packets_;
+  uint64 congestion_window_count_;
 
   // Track the largest packet that has been sent.
   QuicPacketSequenceNumber largest_sent_sequence_number_;
@@ -123,6 +125,9 @@ class NET_EXPORT_PRIVATE TcpCubicSender : public SendAlgorithmInterface {
   // Used for stats collection of slowstart_packets_lost
   bool last_cutback_exited_slowstart_;
 
+  // Maximum number of outstanding packets for tcp.
+  QuicPacketCount max_tcp_congestion_window_;
+
   const QuicClock* clock_;
 
   DISALLOW_COPY_AND_ASSIGN(TcpCubicSender);