Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/quic_header_list_test.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/platform/api/quic_flags.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::string;
 
 namespace net {
 
 // This test verifies that QuicHeaderList accumulates header pairs in order.
 TEST(QuicHeaderListTest, OnHeader) {
   QuicHeaderList headers;
@@ skipping 33 matching lines @@
   headers.OnHeader("beep", "");
 
   QuicHeaderList headers2(headers);
   QuicHeaderList headers3 = headers;
 
   EXPECT_EQ("{ foo=bar, april=fools, beep=, }", headers2.DebugString());
   EXPECT_EQ("{ foo=bar, april=fools, beep=, }", headers3.DebugString());
 }
 
 }  // namespace net