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

net/quic/core/congestion_control/tcp_cubic_sender_bytes.cc

Index: net/quic/core/congestion_control/tcp_cubic_sender_bytes.cc
diff --git a/net/quic/core/congestion_control/tcp_cubic_sender_bytes.cc b/net/quic/core/congestion_control/tcp_cubic_sender_bytes.cc
index f22bdd020887118b15235ad247ca30075cbac220..60063a4fcdad50c54ebfa11c151e1887cbfc688f 100644
--- a/net/quic/core/congestion_control/tcp_cubic_sender_bytes.cc
+++ b/net/quic/core/congestion_control/tcp_cubic_sender_bytes.cc
@@ -48,23 +48,19 @@ TcpCubicSenderBytes::~TcpCubicSenderBytes() {}
 void TcpCubicSenderBytes::SetFromConfig(const QuicConfig& config,
                                         Perspective perspective) {
   TcpCubicSenderBase::SetFromConfig(config, perspective);
-  if (FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode &&
-      config.HasReceivedConnectionOptions() &&
+  if (config.HasReceivedConnectionOptions() &&
       ContainsQuicTag(config.ReceivedConnectionOptions(), kCCVX)) {
     cubic_.SetFixConvexMode(true);
   }
-  if (FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization &&
-      config.HasReceivedConnectionOptions() &&
+  if (config.HasReceivedConnectionOptions() &&
       ContainsQuicTag(config.ReceivedConnectionOptions(), kCBQT)) {
     cubic_.SetFixCubicQuantization(true);
   }
-  if (FLAGS_quic_reloadable_flag_quic_fix_beta_last_max &&
-      config.HasReceivedConnectionOptions() &&
+  if (config.HasReceivedConnectionOptions() &&
       ContainsQuicTag(config.ReceivedConnectionOptions(), kBLMX)) {
     cubic_.SetFixBetaLastMax(true);
   }
-  if (FLAGS_quic_reloadable_flag_quic_enable_cubic_per_ack_updates &&
-      config.HasReceivedConnectionOptions() &&
+  if (config.HasReceivedConnectionOptions() &&
       ContainsQuicTag(config.ReceivedConnectionOptions(), kCPAU)) {
     cubic_.SetAllowPerAckUpdates(true);
   }