Land Recent QUIC changes.

net/quic/quic_crypto_server_stream.h

Index: net/quic/quic_crypto_server_stream.h
diff --git a/net/quic/quic_crypto_server_stream.h b/net/quic/quic_crypto_server_stream.h
index 47c147818ce1592c916f33c397378fbfc238dbbb..1c7ac06b314afa3b0e00f188ee27c7409e89b294 100644
--- a/net/quic/quic_crypto_server_stream.h
+++ b/net/quic/quic_crypto_server_stream.h
@@ -15,7 +15,6 @@ namespace net {
 
 class CryptoHandshakeMessage;
 class QuicCryptoServerConfig;
-class QuicNegotiatedParameters;
 class QuicSession;
 
 namespace test {
@@ -24,8 +23,7 @@ class CryptoTestUtils;
 
 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();
@@ -37,9 +35,6 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream : public QuicCryptoStream {
  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_;
 };