Land Recent QUIC changes.

net/quic/quic_crypto_server_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_SERVER_STREAM_H_
 #define NET_QUIC_QUIC_CRYPTO_SERVER_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 CryptoHandshakeMessage;
 class QuicCryptoServerConfig;
-class QuicNegotiatedParameters;
 class QuicSession;
 
 namespace test {
 class CryptoTestUtils;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE QuicCryptoServerStream : public QuicCryptoStream {
  public:
-  QuicCryptoServerStream(const QuicConfig& config,
-                         const QuicCryptoServerConfig& crypto_config,
+  QuicCryptoServerStream(const QuicCryptoServerConfig& crypto_config,
                          QuicSession* session);
   explicit QuicCryptoServerStream(QuicSession* session);
   virtual ~QuicCryptoServerStream();
 
   // CryptoFramerVisitorInterface implementation
   virtual void OnHandshakeMessage(
       const CryptoHandshakeMessage& message) OVERRIDE;
 
  private:
   friend class test::CryptoTestUtils;
 
-  // config_ contains non-crypto parameters that are negotiated in the crypto
-  // handshake.
-  const QuicConfig& config_;
   // crypto_config_ contains crypto parameters for the handshake.
   const QuicCryptoServerConfig& crypto_config_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CRYPTO_SERVER_STREAM_H_