Land Recent QUIC Changes.

net/quic/quic_headers_stream.cc

Index: net/quic/quic_headers_stream.cc
diff --git a/net/quic/quic_headers_stream.cc b/net/quic/quic_headers_stream.cc
index bd07772d5d6bae8451abe3dfe2af28a26f2f388b..aab8571553d2bf4ea5525fb8465723de28907260 100644
--- a/net/quic/quic_headers_stream.cc
+++ b/net/quic/quic_headers_stream.cc
@@ -174,6 +174,7 @@ QuicHeadersStream::QuicHeadersStream(QuicSession* session)
       spdy_framer_visitor_(new SpdyFramerVisitor(this)) {
   spdy_framer_.set_visitor(spdy_framer_visitor_.get());
   spdy_framer_.set_debug_visitor(spdy_framer_visitor_.get());
+  DisableFlowControl();
 }
 
 QuicHeadersStream::~QuicHeadersStream() {}
@@ -207,10 +208,6 @@ uint32 QuicHeadersStream::ProcessRawData(const char* data,
 
 QuicPriority QuicHeadersStream::EffectivePriority() const { return 0; }
 
-bool QuicHeadersStream::IsFlowControlEnabled() const {
-  return false;
-}
-
 void QuicHeadersStream::OnSynStream(SpdyStreamId stream_id,
                                     SpdyPriority priority,
                                     bool fin) {