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

net/quic/core/congestion_control/cubic_bytes_test.cc

Index: net/quic/core/congestion_control/cubic_bytes_test.cc
diff --git a/net/quic/core/congestion_control/cubic_bytes_test.cc b/net/quic/core/congestion_control/cubic_bytes_test.cc
index a0641ee5ce98830ba44addd707bd10b527b443b9..b009b1d258dee4e6bdd42280963f34b968e43edd 100644
--- a/net/quic/core/congestion_control/cubic_bytes_test.cc
+++ b/net/quic/core/congestion_control/cubic_bytes_test.cc
@@ -64,22 +64,6 @@ std::vector<TestParams> GetTestParams() {
     for (bool fix_cubic_quantization : {true, false}) {
       for (bool fix_beta_last_max : {true, false}) {
         for (bool allow_per_ack_updates : {true, false}) {
-          if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode &&
-              fix_convex_mode) {
-            continue;
-          }
-          if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization &&
-              fix_cubic_quantization) {
-            continue;
-          }
-          if (!FLAGS_quic_reloadable_flag_quic_fix_beta_last_max &&
-              fix_beta_last_max) {
-            continue;
-          }
-          if (!FLAGS_quic_reloadable_flag_quic_enable_cubic_per_ack_updates &&
-              allow_per_ack_updates) {
-            continue;
-          }
           TestParams param(fix_convex_mode, fix_cubic_quantization,
                            fix_beta_last_max, allow_per_ack_updates);
           params.push_back(param);