Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

net/quic/core/quic_stream_sequencer.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/core/quic_stream_sequencer.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <utility>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "net/quic/core/quic_bug_tracker.h"
 #include "net/quic/core/quic_clock.h"
 #include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_stream.h"
 #include "net/quic/core/quic_stream_sequencer_buffer.h"
 #include "net/quic/core/quic_utils.h"
-#include "net/quic/core/reliable_quic_stream.h"
 
 using base::IntToString;
 using base::StringPiece;
 using base::StringPrintf;
 using std::min;
 using std::string;
 
 namespace net {
 
-QuicStreamSequencer::QuicStreamSequencer(ReliableQuicStream* quic_stream,
+QuicStreamSequencer::QuicStreamSequencer(QuicStream* quic_stream,
                                          const QuicClock* clock)
     : stream_(quic_stream),
       buffered_frames_(kStreamReceiveWindowLimit),
       close_offset_(std::numeric_limits<QuicStreamOffset>::max()),
       blocked_(false),
       num_frames_received_(0),
       num_duplicate_frames_received_(0),
       clock_(clock),
       ignore_read_data_(false) {}
 
@@ skipping 184 matching lines @@
          "\n  bytes buffered: " + IntToString(NumBytesBuffered()) +
          "\n  bytes consumed: " + IntToString( NumBytesConsumed()) +
          "\n  has bytes to read: " +  (HasBytesToRead() ? "true" : "false") +
          "\n  frames received: " + IntToString(num_frames_received()) +
          "\n  close offset bytes: " + IntToString( close_offset_) +
          "\n  is closed: " + (IsClosed() ? "true" : "false");
   // clang-format on
 }
 
 }  // namespace net