Land Recent QUIC changes.

net/quic/test_tools/mock_crypto_client_stream.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_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_H_
 #define NET_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_H_
 
 #include <string>
 
 #include "net/quic/crypto/crypto_handshake.h"
@@ skipping 16 matching lines @@
     // not confirm the handshake.
     ZERO_RTT,
 
     // COLD_START indicates that CryptoConnect will neither establish encryption
     // nor confirm the handshake
     COLD_START,
   };
 
   MockCryptoClientStream(
       const string& server_hostname,
-      const QuicConfig& config,
       QuicSession* session,
       QuicCryptoClientConfig* crypto_config,
       HandshakeMode handshake_mode);
   virtual ~MockCryptoClientStream();
 
   // CryptoFramerVisitorInterface implementation.
   virtual void OnHandshakeMessage(
       const CryptoHandshakeMessage& message) OVERRIDE;
 
   // QuicCryptoClientStream implementation.
   virtual bool CryptoConnect() OVERRIDE;
 
   HandshakeMode handshake_mode_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_H_