4 files changed, 3 insertions, 9 deletions
diff --git a/net/quic/crypto/quic_crypto_client_config.h b/net/quic/crypto/quic_crypto_client_config.h
index b11c197fa..eed288c 100644
--- a/net/quic/crypto/quic_crypto_client_config.h
+++ b/net/quic/crypto/quic_crypto_client_config.h
@@ -96,7 +96,6 @@ class NET_EXPORT_PRIVATE QuicCryptoClientConfig : public QuicCryptoConfig {
     void InitializeFrom(const CachedState& other);
 
    private:
-    std::string server_config_id_;      // An opaque id from the server.
     std::string server_config_;         // A serialized handshake message.
     std::string source_address_token_;  // An opaque proof of IP ownership.
     std::vector<std::string> certs_;    // A list of certificates in leaf-first
diff --git a/net/quic/quic_connection.h b/net/quic/quic_connection.h
index 2f15e43..a2cab70 100644
--- a/net/quic/quic_connection.h
+++ b/net/quic/quic_connection.h
@@ -83,9 +83,6 @@ class NET_EXPORT_PRIVATE QuicConnectionVisitorInterface {
   // Called once a specific QUIC version is agreed by both endpoints.
   virtual void OnSuccessfulVersionNegotiation(const QuicVersion& version) = 0;
 
-  // Indicates a new QuicConfig has been negotiated.
-  virtual void OnConfigNegotiated() = 0;
-
   // Called when a blocked socket becomes writable.  If all pending bytes for
   // this visitor are consumed by the connection successfully this should
   // return true, otherwise it should return false.
diff --git a/net/quic/quic_session.cc b/net/quic/quic_session.cc
index 3b1f419..35495df 100644
--- a/net/quic/quic_session.cc
+++ b/net/quic/quic_session.cc
@@ -60,10 +60,6 @@ class VisitorShim : public QuicConnectionVisitorInterface {
     session_->OnSuccessfulVersionNegotiation(version);
   }
 
-  virtual void OnConfigNegotiated() OVERRIDE {
-    session_->OnConfigNegotiated();
-  }
-
   virtual void OnConnectionClosed(
       QuicErrorCode error, bool from_peer) OVERRIDE {
     session_->OnConnectionClosed(error, from_peer);
diff --git a/net/quic/quic_session.h b/net/quic/quic_session.h
index b5b1bbd..7deb189 100644
--- a/net/quic/quic_session.h
+++ b/net/quic/quic_session.h
@@ -68,7 +68,6 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
   virtual void OnWriteBlocked() OVERRIDE {}
   virtual void OnSuccessfulVersionNegotiation(
       const QuicVersion& version) OVERRIDE {}
-  virtual void OnConfigNegotiated() OVERRIDE;
   virtual bool OnCanWrite() OVERRIDE;
   virtual bool HasPendingHandshake() const OVERRIDE;
 
@@ -128,6 +127,9 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
   // a server, returns true if a full, valid client hello has been received.
   virtual bool IsCryptoHandshakeConfirmed();
 
+  // Called by the QuicCryptoStream when a new QuicConfig has been negotiated.
+  virtual void OnConfigNegotiated();
+
   // Called by the QuicCryptoStream when the handshake enters a new state.
   //
   // Clients will call this function in the order: