Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/test_tools/quic_stream_sequencer_buffer_peer.cc

 // Copyright 2016 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/test_tools/quic_stream_sequencer_buffer_peer.h"
 
-#include "net/quic/core/quic_flags.h"
+#include "net/quic/platform/api/quic_flags.h"
 #include "net/quic/platform/api/quic_logging.h"
 #include "net/test/gtest_util.h"
 
 typedef net::QuicStreamSequencerBuffer::BufferBlock BufferBlock;
 typedef net::QuicStreamSequencerBuffer::FrameInfo FrameInfo;
 typedef net::QuicStreamSequencerBuffer::Gap Gap;
 
 static const size_t kBlockSizeBytes =
     net::QuicStreamSequencerBuffer::kBlockSizeBytes;
 
@@ skipping 115 matching lines @@
 void QuicStreamSequencerBufferPeer::set_gaps(const std::list<Gap>& gaps) {
   buffer_->gaps_ = gaps;
 }
 
 bool QuicStreamSequencerBufferPeer::IsBufferAllocated() {
   return buffer_->blocks_ != nullptr;
 }
 
 }  // namespace test
 }  // namespace net