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/quic_session.h"
 #include "net/quic/quic_spdy_decompressor.h"
 #include "net/quic/quic_write_blocked_list.h"
@@ skipping 54 matching lines @@
     return true;
   }
   // Note: This count include duplicate data received.
   stream_bytes_read_ += frame.data.TotalBufferSize();
 
   bool accepted = sequencer_.OnStreamFrame(frame);
 
   return accepted;
 }
 
-void ReliableQuicStream::OnStreamReset(QuicRstStreamErrorCode error) {
-  stream_error_ = error;
+void ReliableQuicStream::OnStreamReset(const QuicRstStreamFrame& frame) {
+  stream_error_ = frame.error_code;
   CloseWriteSide();
   CloseReadSide();
 }
 
 void ReliableQuicStream::OnConnectionClosed(QuicErrorCode error,
                                             bool from_peer) {
   if (read_side_closed_ && write_side_closed_) {
     return;
   }
   if (error != QUIC_NO_ERROR) {
@@ skipping 137 matching lines @@
 bool ReliableQuicStream::HasBufferedData() {
   return !queued_data_.empty();
 }
 
 void ReliableQuicStream::OnClose() {
   CloseReadSide();
   CloseWriteSide();
 }
 
 }  // namespace net