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

net/quic/core/congestion_control/cubic_test.cc

 // Copyright (c) 2012 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.h"
 
 #include <cstdint>
 
 #include "net/quic/platform/api/quic_flags.h"
 #include "net/quic/platform/api/quic_str_cat.h"
@@ skipping 40 matching lines @@
                     "beta_last_max_", params.param.fix_beta_last_max, "_",
                     "allow_per_ack_updates_",
                     params.param.allow_per_ack_updates);
 }
 
 std::vector<TestParams> GetTestParams() {
   std::vector<TestParams> params;
   for (bool fix_convex_mode : {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_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_beta_last_max,
                          allow_per_ack_updates);
         params.push_back(param);
       }
     }
   }
   return params;
 }
 
 }  // namespace
@@ skipping 287 matching lines @@
     clock_.AdvanceTime(hundred_ms_);
     current_cwnd = cubic_.CongestionWindowAfterAck(current_cwnd, rtt_min,
                                                    clock_.ApproximateNow());
   }
   expected_cwnd = 399;
   EXPECT_EQ(expected_cwnd, current_cwnd);
 }
 
 }  // namespace test
 }  // namespace net