Land Recent QUIC Changes

net/quic/quic_session.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/quic_session.h"
 
 #include "base/stl_util.h"
 #include "net/quic/quic_connection.h"
 
 using base::StringPiece;
@@ skipping 166 matching lines @@
 }
 
 void QuicSession::CloseStream(QuicStreamId stream_id) {
   DLOG(INFO) << "Closing stream " << stream_id;
 
   ReliableStreamMap::iterator it = stream_map_.find(stream_id);
   if (it == stream_map_.end()) {
     DLOG(INFO) << "Stream is already closed: " << stream_id;
     return;
   }
-  it->second->OnClose();
+  ReliableQuicStream* stream = it->second;
   closed_streams_.push_back(it->second);
   stream_map_.erase(it);
+  stream->OnClose();
 }
 
 bool QuicSession::IsCryptoHandshakeComplete() {
   return GetCryptoStream()->handshake_complete();
 }
 
 void QuicSession::OnCryptoHandshakeComplete(QuicErrorCode error) {
   // TODO(rch): tear down the connection if error != QUIC_NO_ERROR.
 }
 
@@ skipping 97 matching lines @@
 void QuicSession::MarkWriteBlocked(QuicStreamId id) {
   write_blocked_streams_.AddBlockedObject(id);
 }
 
 void QuicSession::PostProcessAfterData() {
   STLDeleteElements(&closed_streams_);
   closed_streams_.clear();
 }
 
 }  // namespace net