Land recent QUIC changes.

net/quic/reliable_quic_stream.h

Index: net/quic/reliable_quic_stream.h
diff --git a/net/quic/reliable_quic_stream.h b/net/quic/reliable_quic_stream.h
index 50ed951e6d7cd31b9eb9605c4bb1728267022f77..1c35cf0234673b21c9fc9fa4cf25c2afe3b04bda 100644
--- a/net/quic/reliable_quic_stream.h
+++ b/net/quic/reliable_quic_stream.h
@@ -54,9 +54,7 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
   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,
@@ -126,7 +124,6 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
 
   QuicStreamSequencer sequencer_;
   QuicStreamId id_;
-  QuicStreamOffset offset_;
   QuicSession* session_;
   // Optional visitor of this stream to be notified when the stream is closed.
   Visitor* visitor_;