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 3e4264a6fca36db69634080e051aaa5f01a8a1f6..47c147818ce1592c916f33c397378fbfc238dbbb 100644
--- a/net/quic/quic_crypto_server_stream.h
+++ b/net/quic/quic_crypto_server_stream.h
@@ -34,9 +34,6 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream : public QuicCryptoStream {
   virtual void OnHandshakeMessage(
       const CryptoHandshakeMessage& message) OVERRIDE;
 
-  const QuicNegotiatedParameters& negotiated_params() const;
-  const QuicCryptoNegotiatedParameters& crypto_negotiated_params() const;
-
  private:
   friend class test::CryptoTestUtils;
 
@@ -45,9 +42,6 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream : public QuicCryptoStream {
   const QuicConfig& config_;
   // crypto_config_ contains crypto parameters for the handshake.
   const QuicCryptoServerConfig& crypto_config_;
-
-  QuicNegotiatedParameters negotiated_params_;
-  QuicCryptoNegotiatedParameters crypto_negotiated_params_;
 };
 
 }  // namespace net