Land Recent QUIC Changes.

net/quic/quic_stream_sequencer.cc

Index: net/quic/quic_stream_sequencer.cc
diff --git a/net/quic/quic_stream_sequencer.cc b/net/quic/quic_stream_sequencer.cc
index 055ed970f56d718bbee7e368a894f154a03b6483..a9b2e977b962ccbea1a114932468fc7cf60e53c8 100644
--- a/net/quic/quic_stream_sequencer.cc
+++ b/net/quic/quic_stream_sequencer.cc
@@ -119,6 +119,7 @@ bool QuicStreamSequencer::OnStreamFrame(const QuicStreamFrame& frame) {
           data.iovec()[i].iov_len);
     }
     num_bytes_consumed_ += bytes_consumed;
+    stream_->flow_controller()->AddBytesConsumed(bytes_consumed);
     stream_->MaybeSendWindowUpdate();
 
     if (MaybeCloseStream()) {
@@ -146,6 +147,7 @@ bool QuicStreamSequencer::OnStreamFrame(const QuicStreamFrame& frame) {
         byte_offset, string(static_cast<char*>(iov.iov_base), iov.iov_len)));
     byte_offset += iov.iov_len;
     num_bytes_buffered_ += iov.iov_len;
+    stream_->flow_controller()->AddBytesBuffered(iov.iov_len);
   }
   return true;
 }
@@ -297,6 +299,8 @@ void QuicStreamSequencer::RecordBytesConsumed(size_t bytes_consumed) {
   num_bytes_consumed_ += bytes_consumed;
   num_bytes_buffered_ -= bytes_consumed;
 
+  stream_->flow_controller()->AddBytesConsumed(bytes_consumed);
+  stream_->flow_controller()->RemoveBytesBuffered(bytes_consumed);
   stream_->MaybeSendWindowUpdate();
 }