Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/quic_spdy_stream.h

 // Copyright 2013 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.
 //
 // The base class for streams which deliver data to/from an application.
 // In each direction, the data on such a stream first contains compressed
 // headers then body data.
 
 #ifndef NET_QUIC_CORE_QUIC_SPDY_STREAM_H_
 #define NET_QUIC_CORE_QUIC_SPDY_STREAM_H_
 
 #include <sys/types.h>
 
 #include <cstddef>
 #include <list>
 #include <string>
 
 #include "base/macros.h"
 #include "net/base/iovec.h"
-#include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_header_list.h"
 #include "net/quic/core/quic_packets.h"
 #include "net/quic/core/quic_stream.h"
 #include "net/quic/core/quic_stream_sequencer.h"
 #include "net/quic/platform/api/quic_export.h"
+#include "net/quic/platform/api/quic_flags.h"
 #include "net/quic/platform/api/quic_socket_address.h"
 #include "net/spdy/spdy_framer.h"
 
 namespace net {
 
 namespace test {
 class QuicSpdyStreamPeer;
 class QuicStreamPeer;
 }  // namespace test
 
@@ skipping 195 matching lines @@
   bool trailers_consumed_;
   // The parsed trailers received from the peer.
   SpdyHeaderBlock received_trailers_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSpdyStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CORE_QUIC_SPDY_STREAM_H_