Landing Recent QUIC changes until Fri Nov 18 23:21:04 2016 +0000

net/quic/core/quic_stream_sequencer_buffer.h

 // Copyright (c) 2015 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_BUFFER_H_
 #define NET_QUIC_QUIC_STREAM_SEQUENCER_BUFFER_H_
 
 // QuicStreamSequencerBuffer implements QuicStreamSequencerBufferInterface.
 // It is a circular stream buffer with random write and
 // in-sequence read. It consists of a vector of pointers pointing
@@ skipping 50 matching lines @@
 //  buffer.MarkConsumed(consumed);
 
 #include <stddef.h>
 
 #include <functional>
 #include <list>
 #include <memory>
 
 #include "base/macros.h"
 #include "net/base/net_export.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 
 namespace net {
 
 namespace test {
 class QuicStreamSequencerBufferPeer;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE QuicStreamSequencerBuffer {
  public:
   // A Gap indicates a missing chunk of bytes between
@@ skipping 169 matching lines @@
   // For debugging use after free, assigned to 123456 in constructor and 654321
   // in destructor. As long as it's not 123456, this means either use after free
   // or memory corruption.
   int32_t destruction_indicator_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicStreamSequencerBuffer);
 };
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_STREAM_SEQUENCER_BUFFER_H_