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 136 matching lines @@
 
   QuicTime::Delta idle_connection_state_lifetime() const;
 
   QuicTime::Delta keepalive_timeout() const;
 
   void set_max_streams_per_connection(size_t max_streams,
                                       size_t default_streams);
 
   uint32 max_streams_per_connection() const;
 
+  void set_max_time_before_crypto_handshake(
+      QuicTime::Delta max_time_before_crypto_handshake);
+
+  QuicTime::Delta max_time_before_crypto_handshake() const;
+
   bool negotiated();
 
   // SetDefaults sets the members to sensible, default values.
   void SetDefaults();
 
   // ToHandshakeMessage serializes the settings in this object as a series of
   // tags /value pairs and adds them to |out|.
   void ToHandshakeMessage(CryptoHandshakeMessage* out) const;
 
   // Calls ProcessClientHello on each negotiable parameter. On failure returns
   // the corresponding QuicErrorCode and sets detailed error in |error_details|.
   QuicErrorCode ProcessClientHello(const CryptoHandshakeMessage& client_hello,
                                    std::string* error_details);
 
   // Calls ProcessServerHello on each negotiable parameter. On failure returns
   // the corresponding QuicErrorCode and sets detailed error in |error_details|.
   QuicErrorCode ProcessServerHello(const CryptoHandshakeMessage& server_hello,
                                    std::string* error_details);
 
  private:
   // Congestion control feedback type.
   QuicNegotiableTag congestion_control_;
   // 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_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CONFIG_H_