Land Recent QUIC changes.

net/quic/quic_crypto_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_STREAM_H_
 #define NET_QUIC_QUIC_CRYPTO_STREAM_H_
 
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_utils.h"
 #include "net/quic/quic_config.h"
@@ skipping 28 matching lines @@
   // ReliableQuicStream implementation
   virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE;
 
   // Sends |message| to the peer.
   // TODO(wtc): return a success/failure status.
   void SendHandshakeMessage(const CryptoHandshakeMessage& message);
 
   bool encryption_established() { return encryption_established_; }
   bool handshake_confirmed() { return handshake_confirmed_; }
 
-  const QuicNegotiatedParameters& negotiated_params() const;
   const QuicCryptoNegotiatedParameters& crypto_negotiated_params() const;
 
  protected:
   // Closes the connection
   void CloseConnection(QuicErrorCode error);
   void CloseConnectionWithDetails(QuicErrorCode error, const string& details);
 
   bool encryption_established_;
   bool handshake_confirmed_;
 
-  QuicNegotiatedParameters negotiated_params_;
   QuicCryptoNegotiatedParameters crypto_negotiated_params_;
 
  private:
   CryptoFramer crypto_framer_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCryptoStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CRYPTO_STREAM_H_