Land Recent QUIC Changes.

net/quic/quic_config.h

 // Copyright (c) 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.
 
 #ifndef NET_QUIC_QUIC_CONFIG_H_
 #define NET_QUIC_QUIC_CONFIG_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 245 matching lines @@
 class NET_EXPORT_PRIVATE QuicConfig {
  public:
   QuicConfig();
   ~QuicConfig();
 
   void set_congestion_feedback(const QuicTagVector& congestion_feedback,
                                QuicTag default_congestion_feedback);
 
   QuicTag congestion_feedback() const;
 
-  void SetCongestionOptionsToSend(const QuicTagVector& congestion_options);
+  void SetConnectionOptionsToSend(const QuicTagVector& connection_options);
 
-  bool HasReceivedCongestionOptions() const;
+  bool HasReceivedConnectionOptions() const;
 
-  QuicTagVector ReceivedCongestionOptions() const;
+  QuicTagVector ReceivedConnectionOptions() const;
 
   void SetLossDetectionToSend(QuicTag loss_detection);
 
   bool HasReceivedLossDetection() const;
 
   QuicTag ReceivedLossDetection() const;
 
   void set_idle_connection_state_lifetime(
       QuicTime::Delta max_idle_connection_state_lifetime,
       QuicTime::Delta default_idle_conection_state_lifetime);
@@ skipping 72 matching lines @@
   QuicErrorCode ProcessPeerHello(const CryptoHandshakeMessage& peer_hello,
                                  HelloType hello_type,
                                  std::string* error_details);
 
  private:
   friend class test::QuicConfigPeer;
 
   // Congestion control feedback type.
   QuicNegotiableTag congestion_feedback_;
   // Congestion control option.
-  QuicFixedTagVector congestion_options_;
+  QuicFixedTagVector connection_options_;
   // Loss detection feedback type.
   QuicFixedTag loss_detection_;
   // Idle connection state lifetime
   QuicNegotiableUint32 idle_connection_state_lifetime_seconds_;
   // Keepalive timeout, or 0 to turn off keepalive probes
   QuicNegotiableUint32 keepalive_timeout_seconds_;
   // Maximum number of streams that the connection can support.
   QuicNegotiableUint32 max_streams_per_connection_;
   // Maximum time till the session can be alive before crypto handshake is
   // finished. (Not negotiated).
   QuicTime::Delta max_time_before_crypto_handshake_;
   // Initial congestion window in packets.
   QuicFixedUint32 initial_congestion_window_;
   // Initial round trip time estimate in microseconds.
   QuicFixedUint32 initial_round_trip_time_us_;
 
   // TODO(rjshade): Remove when removing QUIC_VERSION_19.
   // Initial flow control receive window in bytes.
   QuicFixedUint32 initial_flow_control_window_bytes_;
 
   // Initial stream flow control receive window in bytes.
   QuicFixedUint32 initial_stream_flow_control_window_bytes_;
   // Initial session flow control receive window in bytes.
   QuicFixedUint32 initial_session_flow_control_window_bytes_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CONFIG_H_