Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/congestion_control/cubic_bytes_test.cc

 // 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.
 
 #include "net/quic/core/congestion_control/cubic_bytes.h"
 
 #include <cstdint>
 
-#include "net/quic/core/quic_flags.h"
+#include "net/quic/platform/api/quic_flags.h"
 #include "net/quic/platform/api/quic_str_cat.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::string;
 
 namespace net {
 namespace test {
 namespace {
 
@@ skipping 524 matching lines @@
     clock_.AdvanceTime(hundred_ms_);
     current_cwnd = cubic_.CongestionWindowAfterAck(
         kDefaultTCPMSS, current_cwnd, rtt_min, clock_.ApproximateNow());
   }
   expected_cwnd = 553632;
   EXPECT_EQ(expected_cwnd, current_cwnd);
 }
 
 }  // namespace test
 }  // namespace net