Land Recent QUIC Changes.

net/quic/quic_stream_factory.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_stream_factory.h"
 
 #include <set>
 
 #include "base/cpu.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 77 matching lines @@
                                 bool enable_time_based_loss_detection,
                                 QuicTagVector connection_options) {
   QuicConfig config;
   config.SetDefaults();
   config.EnablePacing(enable_pacing);
   if (enable_time_based_loss_detection)
     config.SetLossDetectionToSend(kTIME);
   config.set_idle_connection_state_lifetime(
       QuicTime::Delta::FromSeconds(kIdleConnectionTimeoutSeconds),
       QuicTime::Delta::FromSeconds(kIdleConnectionTimeoutSeconds));
-  config.SetCongestionOptionsToSend(connection_options);
+  config.SetConnectionOptionsToSend(connection_options);
   return config;
 }
 
 }  // namespace
 
 QuicStreamFactory::IpAliasKey::IpAliasKey() {}
 
 QuicStreamFactory::IpAliasKey::IpAliasKey(IPEndPoint ip_endpoint,
                                           bool is_https)
     : ip_endpoint(ip_endpoint),
@@ skipping 841 matching lines @@
   http_server_properties_->ClearAlternateProtocol(server);
   http_server_properties_->SetAlternateProtocol(
       server, alternate.port, alternate.protocol);
   DCHECK_EQ(QUIC,
             http_server_properties_->GetAlternateProtocol(server).protocol);
   DCHECK(http_server_properties_->WasAlternateProtocolRecentlyBroken(
       server));
 }
 
 }  // namespace net