Landing Recent QUIC changes until 9:58 AM, Sep 17, 2016 UTC

net/quic/core/congestion_control/cubic_test.cc

Index: net/quic/core/congestion_control/cubic_test.cc
diff --git a/net/quic/core/congestion_control/cubic_test.cc b/net/quic/core/congestion_control/cubic_test.cc
index fec318872c5f10fdcd88d71b47260f0eda5d4c25..ea07888a0eb3d6cfc9d34342f9449585b9196453 100644
--- a/net/quic/core/congestion_control/cubic_test.cc
+++ b/net/quic/core/congestion_control/cubic_test.cc
@@ -5,6 +5,7 @@
 #include "net/quic/core/congestion_control/cubic.h"
 
 #include "base/logging.h"
+#include "net/quic/core/quic_flags.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -105,7 +106,7 @@ TEST_F(CubicTest, BelowOrigin) {
     clock_.AdvanceTime(hundred_ms_);
     current_cwnd = cubic_.CongestionWindowAfterAck(current_cwnd, rtt_min);
   }
-  expected_cwnd = 422;
+  expected_cwnd = FLAGS_quic_limit_cubic_cwnd_increase ? 399 : 422;
   EXPECT_EQ(expected_cwnd, current_cwnd);
 }