Land Recent QUIC changes.

net/quic/quic_crypto_client_stream.h

 // 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.
 
 #ifndef NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_
 #define NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_
 
 #include <string>
 
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/quic_config.h"
 #include "net/quic/quic_crypto_stream.h"
 
 namespace net {
 
-class QuicConfig;
 class QuicSession;
 
 namespace test {
 class CryptoTestUtils;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
  public:
   QuicCryptoClientStream(const string& server_hostname,
-                         const QuicConfig& config,
                          QuicSession* session,
                          QuicCryptoClientConfig* crypto_config);
   virtual ~QuicCryptoClientStream();
 
   // CryptoFramerVisitorInterface implementation
   virtual void OnHandshakeMessage(
       const CryptoHandshakeMessage& message) OVERRIDE;
 
   // Performs a crypto handshake with the server. Returns true if the crypto
   // handshake is started successfully.
@@ skipping 17 matching lines @@
 
   // DoHandshakeLoop performs a step of the handshake state machine. Note that
   // |in| is NULL for the first call.
   void DoHandshakeLoop(const CryptoHandshakeMessage* in);
 
   State next_state_;
   // num_client_hellos_ contains the number of client hello messages that this
   // connection has sent.
   int num_client_hellos_;
 
-  const QuicConfig& config_;
   QuicCryptoClientConfig* const crypto_config_;
 
   // Client's connection nonce (4-byte timestamp + 28 random bytes)
   std::string nonce_;
   // Server's hostname
   std::string server_hostname_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCryptoClientStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_