Landing Recent QUIC changes until Jun 27 19:50:48 2017 +0000

net/quic/core/congestion_control/send_algorithm_test.cc

Index: net/quic/core/congestion_control/send_algorithm_test.cc
diff --git a/net/quic/core/congestion_control/send_algorithm_test.cc b/net/quic/core/congestion_control/send_algorithm_test.cc
index 4eff9d9ff6aa353520c049db4e3a0a7cf41d0edd..5eaad4bc2adad2caa3cf6b6452565d4b1a27e1d4 100644
--- a/net/quic/core/congestion_control/send_algorithm_test.cc
+++ b/net/quic/core/congestion_control/send_algorithm_test.cc
@@ -194,10 +194,6 @@ class SendAlgorithmTest : public QuicTestWithParam<TestParams> {
                   "QUIC sender",
                   Perspective::IS_SERVER,
                   42) {
-    FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode = true;
-    FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization = true;
-    FLAGS_quic_reloadable_flag_quic_fix_beta_last_max = true;
-    FLAGS_quic_reloadable_flag_quic_enable_cubic_per_ack_updates = true;
     rtt_stats_ = quic_sender_.connection()->sent_packet_manager().GetRttStats();
     sender_ = SendAlgorithmInterface::Create(
         simulator_.GetClock(), rtt_stats_,