Land Recent QUIC changes.

net/quic/quic_stream_sequencer.h

Index: net/quic/quic_stream_sequencer.h
diff --git a/net/quic/quic_stream_sequencer.h b/net/quic/quic_stream_sequencer.h
index 249838de233fd9ab52a765605801b7cd63ec52c2..bb5b29e562e06ea2d5702c667776f39c96034091 100644
--- a/net/quic/quic_stream_sequencer.h
+++ b/net/quic/quic_stream_sequencer.h
@@ -50,9 +50,7 @@ class NET_EXPORT_PRIVATE QuicStreamSequencer {
   bool OnStreamFrame(const QuicStreamFrame& frame);
 
   // Wait until we've seen 'offset' bytes, and then terminate the stream.
-  // TODO(ianswett): Simplify this method by removing half_close, now that
-  // the sequencer is bypassed for stream resets and half_close is always true.
-  void CloseStreamAtOffset(QuicStreamOffset offset, bool half_close);
+  void CloseStreamAtOffset(QuicStreamOffset offset);
 
   // Once data is buffered, it's up to the stream to read it when the stream
   // can handle more data.  The following three functions make that possible.
@@ -75,9 +73,6 @@ class NET_EXPORT_PRIVATE QuicStreamSequencer {
   // Returns true if the sequencer has delivered a half close.
   bool IsHalfClosed() const;
 
-  // Returns true if the sequencer has delivered a full close.
-  bool IsClosed() const;
-
   // Returns true if the sequencer has received this frame before.
   bool IsDuplicate(const QuicStreamFrame& frame) const;
 
@@ -97,13 +92,9 @@ class NET_EXPORT_PRIVATE QuicStreamSequencer {
   QuicStreamOffset num_bytes_consumed_;  // The last data consumed by the stream
   FrameMap frames_;  // sequence number -> frame
   size_t max_frame_memory_;  //  the maximum memory the sequencer can buffer.
-  // The offset, if any, we got a stream cancelation for.  When this many bytes
-  // have been processed, the stream will be half or full closed depending on
-  // the half_close_ bool.
+  // The offset, if any, we got a stream termination for.  When this many bytes
+  // have been processed, the stream will be half closed.
   QuicStreamOffset close_offset_;
-  // Only valid if close_offset_ is set.  Indicates if it's a half or a full
-  // close.
-  bool half_close_;
 };
 
 }  // namespace net