Land Recent QUIC Changes.

net/quic/quic_config.h

Index: net/quic/quic_config.h
diff --git a/net/quic/quic_config.h b/net/quic/quic_config.h
index ba681fc0f5f6a5ab296541ee0909929a02badadf..8f46917450e31e70bc055e00dec3caa096c609f5 100644
--- a/net/quic/quic_config.h
+++ b/net/quic/quic_config.h
@@ -307,7 +307,9 @@ class NET_EXPORT_PRIVATE QuicConfig {
 
   uint32 ReceivedInitialRoundTripTimeUs() const;
 
-  // Sets an initial flow control window size to transmit to the peer.
+  // TODO(rjshade): Remove all InitialFlowControlWindow methods when removing
+  // QUIC_VERSION_19.
+  // Sets an initial stream flow control window size to transmit to the peer.
   void SetInitialFlowControlWindowToSend(uint32 window_bytes);
 
   uint32 GetInitialFlowControlWindowToSend() const;
@@ -316,6 +318,24 @@ class NET_EXPORT_PRIVATE QuicConfig {
 
   uint32 ReceivedInitialFlowControlWindowBytes() const;
 
+  // Sets an initial stream flow control window size to transmit to the peer.
+  void SetInitialStreamFlowControlWindowToSend(uint32 window_bytes);
+
+  uint32 GetInitialStreamFlowControlWindowToSend() const;
+
+  bool HasReceivedInitialStreamFlowControlWindowBytes() const;
+
+  uint32 ReceivedInitialStreamFlowControlWindowBytes() const;
+
+  // Sets an initial session flow control window size to transmit to the peer.
+  void SetInitialSessionFlowControlWindowToSend(uint32 window_bytes);
+
+  uint32 GetInitialSessionFlowControlWindowToSend() const;
+
+  bool HasReceivedInitialSessionFlowControlWindowBytes() const;
+
+  uint32 ReceivedInitialSessionFlowControlWindowBytes() const;
+
   bool negotiated();
 
   // SetDefaults sets the members to sensible, default values.
@@ -356,8 +376,15 @@ class NET_EXPORT_PRIVATE QuicConfig {
   QuicFixedUint32 initial_congestion_window_;
   // Initial round trip time estimate in microseconds.
   QuicFixedUint32 initial_round_trip_time_us_;
+
+  // TODO(rjshade): Remove when removing QUIC_VERSION_19.
   // Initial flow control receive window in bytes.
   QuicFixedUint32 initial_flow_control_window_bytes_;
+
+  // Initial stream flow control receive window in bytes.
+  QuicFixedUint32 initial_stream_flow_control_window_bytes_;
+  // Initial session flow control receive window in bytes.
+  QuicFixedUint32 initial_session_flow_control_window_bytes_;
 };
 
 }  // namespace net