Land Recent QUIC Changes until 03/22/2015.

net/quic/quic_server_session.cc

 // Copyright 2014 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_server_session.h"
 
 #include "base/logging.h"
 #include "net/quic/crypto/cached_network_parameters.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_flags.h"
@@ skipping 29 matching lines @@
 
   if (!config()->HasReceivedConnectionOptions()) {
     return;
   }
 
   // If the client has provided a bandwidth estimate from the same serving
   // region, then pass it to the sent packet manager in preparation for possible
   // bandwidth resumption.
   const CachedNetworkParameters* cached_network_params =
       crypto_stream_->previous_cached_network_params();
-  if (FLAGS_quic_enable_bandwidth_resumption_experiment &&
-      cached_network_params != nullptr &&
-      ContainsQuicTag(config()->ReceivedConnectionOptions(), kBWRE) &&
+  const bool max_bandwidth_resumption =
+      ContainsQuicTag(config()->ReceivedConnectionOptions(), kBWMX);
+  if (cached_network_params != nullptr &&
+      (ContainsQuicTag(config()->ReceivedConnectionOptions(), kBWRE) ||
+       max_bandwidth_resumption) &&
       cached_network_params->serving_region() == serving_region_) {
-    connection()->ResumeConnectionState(*cached_network_params);
+    connection()->ResumeConnectionState(*cached_network_params,
+                                        max_bandwidth_resumption);
   }
 
   if (FLAGS_enable_quic_fec &&
       ContainsQuicTag(config()->ReceivedConnectionOptions(), kFHDR)) {
     // kFHDR config maps to FEC protection always for headers stream.
     // TODO(jri): Add crypto stream in addition to headers for kHDR.
     headers_stream_->set_fec_policy(FEC_PROTECT_ALWAYS);
   }
 }
 
@@ skipping 126 matching lines @@
 QuicDataStream* QuicServerSession::CreateOutgoingDataStream() {
   DLOG(ERROR) << "Server push not yet supported";
   return nullptr;
 }
 
 QuicCryptoServerStream* QuicServerSession::GetCryptoStream() {
   return crypto_stream_.get();
 }
 
 }  // namespace net