Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/quic_header_list.cc

 // Copyright (c) 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/core/quic_header_list.h"
 
-#include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_packets.h"
+#include "net/quic/platform/api/quic_flags.h"
 
 using std::string;
 
 namespace net {
 
 QuicHeaderList::QuicHeaderList()
     : max_uncompressed_header_bytes_(kDefaultMaxUncompressedHeaderSize),
       uncompressed_header_bytes_(0) {}
 
 QuicHeaderList::QuicHeaderList(QuicHeaderList&& other) = default;
@@ skipping 41 matching lines @@
 string QuicHeaderList::DebugString() const {
   string s = "{ ";
   for (const auto& p : *this) {
     s.append(p.first + "=" + p.second + ", ");
   }
   s.append("}");
   return s;
 }
 
 }  // namespace net