Land Recent QUIC Changes.

net/quic/quic_sent_packet_manager.cc

 // Copyright 2013 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_sent_packet_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 67 matching lines @@
 QuicSentPacketManager::~QuicSentPacketManager() {
 }
 
 void QuicSentPacketManager::SetFromConfig(const QuicConfig& config) {
   if (config.HasReceivedInitialRoundTripTimeUs() &&
       config.ReceivedInitialRoundTripTimeUs() > 0) {
     rtt_stats_.set_initial_rtt_us(min(kMaxInitialRoundTripTimeUs,
                                       config.ReceivedInitialRoundTripTimeUs()));
   }
   // TODO(ianswett): BBR is currently a server only feature.
-  if (config.HasReceivedCongestionOptions() &&
-      ContainsQuicTag(config.ReceivedCongestionOptions(), kTBBR)) {
+  if (config.HasReceivedConnectionOptions() &&
+      ContainsQuicTag(config.ReceivedConnectionOptions(), kTBBR)) {
     send_algorithm_.reset(
         SendAlgorithmInterface::Create(clock_, &rtt_stats_, kTCPBBR, stats_));
   }
-  if (config.congestion_feedback() == kPACE) {
+  if (config.congestion_feedback() == kPACE ||
+      (config.HasReceivedConnectionOptions() &&
+       ContainsQuicTag(config.ReceivedConnectionOptions(), kPACE))) {
     MaybeEnablePacing();
   }
-  if (config.HasReceivedLossDetection() &&
-      config.ReceivedLossDetection() == kTIME) {
+  // TODO(ianswett): Remove the "HasReceivedLossDetection" branch once
+  // the ConnectionOptions code is live everywhere.
+  if ((config.HasReceivedLossDetection() &&
+       config.ReceivedLossDetection() == kTIME) ||
+      (config.HasReceivedConnectionOptions() &&
+       ContainsQuicTag(config.ReceivedConnectionOptions(), kTIME))) {
     loss_algorithm_.reset(LossDetectionInterface::Create(kTime));
   }
   send_algorithm_->SetFromConfig(config, is_server_);
 }
 
 // TODO(ianswett): Combine this method with OnPacketSent once packets are always
 // sent in order and the connection tracks RetransmittableFrames for longer.
 void QuicSentPacketManager::OnSerializedPacket(
     const SerializedPacket& serialized_packet) {
   if (serialized_packet.retransmittable_frames) {
@@ skipping 668 matching lines @@
   }
 
   // Set up a pacing sender with a 5 millisecond alarm granularity.
   using_pacing_ = true;
   send_algorithm_.reset(
       new PacingSender(send_algorithm_.release(),
                        QuicTime::Delta::FromMilliseconds(5)));
 }
 
 }  // namespace net