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

net/quic/core/congestion_control/tcp_cubic_sender_packets.cc

Index: net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
diff --git a/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc b/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
index 74ebb2fc2852bfe9af320bd672552d65aba01d32..7e23060692553a84506a28ac182fcd0d681c7eec 100644
--- a/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
+++ b/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
@@ -45,18 +45,15 @@ TcpCubicSenderPackets::~TcpCubicSenderPackets() {}
 void TcpCubicSenderPackets::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_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);
   }