Introduces QuicStreamSequencerBufferInterface with one implementation. Refactor, no behavior change.

net/quic/quic_stream_sequencer.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.
 
 #ifndef NET_QUIC_QUIC_STREAM_SEQUENCER_H_
 #define NET_QUIC_QUIC_STREAM_SEQUENCER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 60 matching lines @@
   void SetUnblocked();
 
   // Blocks processing of frames until |SetUnblocked| is called.
   void SetBlockedUntilFlush();
 
   // Sets the sequencer to discard all incoming data itself and not call
   // |stream_->OnDataAvailable()|.  |stream_->OnFinRead()| will be called
   // automatically when the FIN is consumed (which may be immediately).
   void StopReading();
 
-  size_t num_bytes_buffered() const { return num_bytes_buffered_; }
-  QuicStreamOffset num_bytes_consumed() const { return num_bytes_consumed_; }
+  // Number of bytes in the buffer right now.
+  size_t NumBytesBuffered() const;
+
+  // Number of bytes has been consumed.
+  QuicStreamOffset NumBytesConsumed() const;
 
   int num_frames_received() const { return num_frames_received_; }
 
   int num_duplicate_frames_received() const {
     return num_duplicate_frames_received_;
   }
 
   int num_early_frames_received() const { return num_early_frames_received_; }
 
   bool ignore_read_data() const { return ignore_read_data_; }
 
  private:
   friend class test::QuicStreamSequencerPeer;
 
   // Deletes and records as consumed any buffered data that is now in-sequence.
   // (To be called only after StopReading has been called.)
   void FlushBufferedFrames();
 
   // Wait until we've seen 'offset' bytes, and then terminate the stream.
   void CloseStreamAtOffset(QuicStreamOffset offset);
 
   // If we've received a FIN and have processed all remaining data, then inform
   // the stream of FIN, and clear buffers.
   bool MaybeCloseStream();
 
-  // Called whenever bytes are consumed by the stream. Updates
-  // num_bytes_consumed_ and num_bytes_buffered_.
-  void RecordBytesConsumed(size_t bytes_consumed);
-
   // The stream which owns this sequencer.
   ReliableQuicStream* stream_;
 
-  // The last data consumed by the stream.
-  QuicStreamOffset num_bytes_consumed_;
-
-  // Stores buffered frames in offset order.
-  QuicFrameList buffered_frames_;
+  // Stores received data in offset order.
+  std::unique_ptr<QuicStreamSequencerBufferInterface> buffered_frames_;

[Ryan Hamilton, 2015/10/21 16:44:52]

use scoped_ptr instead of std::unique_ptr or this won't build on OS X.

We should improve the merge scripts to do s/std::unique_ptr/scoped_ptr/

 
   // The offset, if any, we got a stream termination for.  When this many bytes
   // have been processed, the sequencer will be closed.
   QuicStreamOffset close_offset_;
 
   // If true, the sequencer is blocked from passing data to the stream and will
   // buffer all new incoming data until FlushBufferedFrames is called.
   bool blocked_;
 
-  // Tracks how many bytes the sequencer has buffered.
-  size_t num_bytes_buffered_;
-
   // Count of the number of frames received.
   int num_frames_received_;
 
   // Count of the number of duplicate frames received.
   int num_duplicate_frames_received_;
 
   // Count of the number of frames received before all previous frames were
   // received.
   int num_early_frames_received_;
 
   // Not owned.
   const QuicClock* clock_;
 
   // If true, all incoming data will be discarded.
   bool ignore_read_data_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicStreamSequencer);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_STREAM_SEQUENCER_H_