Land Recent QUIC Changes.

net/quic/reliable_quic_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/reliable_quic_stream.h"
 
 #include "base/logging.h"
 #include "net/quic/iovector.h"
 #include "net/quic/quic_flow_controller.h"
 #include "net/quic/quic_session.h"
@@ skipping 216 matching lines @@
     stream_error_ = QUIC_STREAM_CONNECTION_ERROR;
     connection_error_ = error;
   }
 
   CloseWriteSide();
   CloseReadSide();
 }
 
 void ReliableQuicStream::OnFinRead() {
   DCHECK(sequencer_.IsClosed());
+  fin_received_ = true;
   CloseReadSide();
 }
 
 void ReliableQuicStream::Reset(QuicRstStreamErrorCode error) {
   DCHECK_NE(QUIC_STREAM_NO_ERROR, error);
   stream_error_ = error;
   // Sending a RstStream results in calling CloseStream.
   session()->SendRstStream(id(), error, stream_bytes_written_);
   rst_sent_ = true;
 }
@@ skipping 287 matching lines @@
 
 bool ReliableQuicStream::IsFlowControlBlocked() {
   if (flow_controller_.IsBlocked()) {
     return true;
   }
   return stream_contributes_to_connection_flow_control_ &&
       connection_flow_controller_->IsBlocked();
 }
 
 }  // namespace net