Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/congestion_control/general_loss_algorithm_test.cc

 // Copyright 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/general_loss_algorithm.h"
 
 #include <algorithm>
 #include <cstdint>
 
 #include "base/stl_util.h"
 #include "net/quic/core/congestion_control/rtt_stats.h"
-#include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_unacked_packet_map.h"
+#include "net/quic/platform/api/quic_flags.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test {
 namespace {
 
 // Default packet length.
 const uint32_t kDefaultLength = 1000;
@@ skipping 409 matching lines @@
   // Detect another spurious retransmit and ensure the threshold doesn't
   // increase again.
   loss_algorithm_.SpuriousRetransmitDetected(unacked_packets_, clock_.Now(),
                                              rtt_stats_, 12);
   EXPECT_EQ(1, loss_algorithm_.reordering_shift());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net