Land recent QUIC changes.

net/quic/reliable_quic_stream.h

 // 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.
 //
 // The base class for client/server reliable streams.
 
 #ifndef NET_QUIC_RELIABLE_QUIC_STREAM_H_
 #define NET_QUIC_RELIABLE_QUIC_STREAM_H_
 
 #include <sys/types.h>
@@ skipping 36 matching lines @@
 
   bool WillAcceptStreamFrame(const QuicStreamFrame& frame) const;
   virtual bool OnStreamFrame(const QuicStreamFrame& frame);
 
   virtual void OnCanWrite();
 
   // Called by the session just before the stream is deleted.
   virtual void OnClose();
 
   // Called when we get a stream reset from the client.
-  // The rst will be passed through the sequencer, which will call
-  // TerminateFromPeer when 'offset' bytes have been processed.
-  void OnStreamReset(QuicErrorCode error, QuicStreamOffset ofset);
+  void OnStreamReset(QuicErrorCode error);
 
   // Called when we get or send a connection close, and should immediately
   // close the stream.  This is not passed through the sequencer,
   // but is handled immediately.
   virtual void ConnectionClose(QuicErrorCode error, bool from_peer);
 
   // Called by the sequencer, when we should process a stream termination or
   // stream close from the peer.
   virtual void TerminateFromPeer(bool half_close);
 
@@ skipping 49 matching lines @@
   QuicConsumedData WriteDataInternal(base::StringPiece data, bool fin);
 
  private:
   friend class test::ReliableQuicStreamPeer;
   friend class QuicStreamUtils;
 
   std::list<string> queued_data_;
 
   QuicStreamSequencer sequencer_;
   QuicStreamId id_;
-  QuicStreamOffset offset_;
   QuicSession* session_;
   // Optional visitor of this stream to be notified when the stream is closed.
   Visitor* visitor_;
   // Bytes read and written refer to payload bytes only: they do not include
   // framing, encryption overhead etc.
   uint64 stream_bytes_read_;
   uint64 stream_bytes_written_;
   QuicErrorCode error_;
   // True if the read side is closed and further frames should be rejected.
   bool read_side_closed_;
   // True if the write side is closed, and further writes should fail.
   bool write_side_closed_;
 
   bool fin_buffered_;
   bool fin_sent_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_RELIABLE_QUIC_STREAM_H_