Land Recent QUIC Changes.

net/quic/reliable_quic_stream.h

Index: net/quic/reliable_quic_stream.h
diff --git a/net/quic/reliable_quic_stream.h b/net/quic/reliable_quic_stream.h
index 11a264e5ca134ed900466becb96d2c4eeaeeb5eb..84eedec18a87b487d424c54cffab08e457fe9cdd 100644
--- a/net/quic/reliable_quic_stream.h
+++ b/net/quic/reliable_quic_stream.h
@@ -162,10 +162,15 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
   const QuicStreamSequencer* sequencer() const { return &sequencer_; }
   QuicStreamSequencer* sequencer() { return &sequencer_; }
 
+  // TODO(rjshade): Remove this method when removing QUIC_VERSION_20.
   void DisableFlowControl() {
     flow_controller_.Disable();
   }
 
+  void DisableConnectionFlowControlForThisStream() {
+    stream_contributes_to_connection_flow_control_ = false;
+  }
+
  private:
   friend class test::ReliableQuicStreamPeer;
   friend class QuicStreamUtils;
@@ -235,6 +240,11 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
   // The connection level flow controller. Not owned.
   QuicFlowController* connection_flow_controller_;
 
+  // Special streams, such as the crypto and headers streams, do not respect
+  // connection level flow control limits (but are stream level flow control
+  // limited).
+  bool stream_contributes_to_connection_flow_control_;
+
   DISALLOW_COPY_AND_ASSIGN(ReliableQuicStream);
 };