Landing Recent QUIC changes until 8/4/2015 20:30 UTC.

net/quic/quic_connection.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/quic_connection.h"
 
 #include <string.h>
 #include <sys/types.h>
 
 #include <algorithm>
@@ skipping 347 matching lines @@
   }
 
   sent_packet_manager_.SetFromConfig(config);
   if (config.HasReceivedBytesForConnectionId() &&
       can_truncate_connection_ids_) {
     packet_generator_.SetConnectionIdLength(
         config.ReceivedBytesForConnectionId());
   }
   max_undecryptable_packets_ = config.max_undecryptable_packets();
 
-  if (FLAGS_quic_send_fec_packet_only_on_fec_alarm &&
-      config.HasClientSentConnectionOption(kFSPA, perspective_)) {
+  if (config.HasClientSentConnectionOption(kFSPA, perspective_)) {
     packet_generator_.set_fec_send_policy(FecSendPolicy::FEC_ALARM_TRIGGER);
   }
 
   if (config.HasClientSentConnectionOption(kMTUH, perspective_)) {
     mtu_discovery_target_ = kMtuDiscoveryTargetPacketSizeHigh;
   }
   if (config.HasClientSentConnectionOption(kMTUL, perspective_)) {
     mtu_discovery_target_ = kMtuDiscoveryTargetPacketSizeLow;
   }
 }
@@ skipping 1999 matching lines @@
       sequence_number_of_last_sent_packet_ + packets_between_mtu_probes_ + 1;
   ++mtu_probe_count_;
 
   DVLOG(2) << "Sending a path MTU discovery packet #" << mtu_probe_count_;
   SendMtuDiscoveryPacket(mtu_discovery_target_);
 
   DCHECK(!mtu_discovery_alarm_->IsSet());
 }
 
 }  // namespace net