Commit 71726e4e authored by wtc@chromium.org's avatar wtc@chromium.org

Remove OnConfigNegotiated from QuicConnectionVisiterInterface.

QuicConnection never calls visitor_->OnConfigNegotiated.
OnConfigNegotiated is only called by QuicCryptoStream on QuicSession.

Merge internal CL: 61467714

Remove the unused server_config_id_ member from
QuicCryptoClientConfig::CachedState.

Merge internal CL: 61394953

R=rch@chromium.org,rtenneti@chromium.org
BUG=none
TEST=none

Review URL: https://codereview.chromium.org/162493003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251204 0039d316-1c4b-4281-b951-d872f2087c98
parent bb4263e7
...@@ -96,7 +96,6 @@ class NET_EXPORT_PRIVATE QuicCryptoClientConfig : public QuicCryptoConfig { ...@@ -96,7 +96,6 @@ class NET_EXPORT_PRIVATE QuicCryptoClientConfig : public QuicCryptoConfig {
void InitializeFrom(const CachedState& other); void InitializeFrom(const CachedState& other);
private: private:
std::string server_config_id_; // An opaque id from the server.
std::string server_config_; // A serialized handshake message. std::string server_config_; // A serialized handshake message.
std::string source_address_token_; // An opaque proof of IP ownership. std::string source_address_token_; // An opaque proof of IP ownership.
std::vector<std::string> certs_; // A list of certificates in leaf-first std::vector<std::string> certs_; // A list of certificates in leaf-first
......
...@@ -83,9 +83,6 @@ class NET_EXPORT_PRIVATE QuicConnectionVisitorInterface { ...@@ -83,9 +83,6 @@ class NET_EXPORT_PRIVATE QuicConnectionVisitorInterface {
// Called once a specific QUIC version is agreed by both endpoints. // Called once a specific QUIC version is agreed by both endpoints.
virtual void OnSuccessfulVersionNegotiation(const QuicVersion& version) = 0; 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 // Called when a blocked socket becomes writable. If all pending bytes for
// this visitor are consumed by the connection successfully this should // this visitor are consumed by the connection successfully this should
// return true, otherwise it should return false. // return true, otherwise it should return false.
......
...@@ -60,10 +60,6 @@ class VisitorShim : public QuicConnectionVisitorInterface { ...@@ -60,10 +60,6 @@ class VisitorShim : public QuicConnectionVisitorInterface {
session_->OnSuccessfulVersionNegotiation(version); session_->OnSuccessfulVersionNegotiation(version);
} }
virtual void OnConfigNegotiated() OVERRIDE {
session_->OnConfigNegotiated();
}
virtual void OnConnectionClosed( virtual void OnConnectionClosed(
QuicErrorCode error, bool from_peer) OVERRIDE { QuicErrorCode error, bool from_peer) OVERRIDE {
session_->OnConnectionClosed(error, from_peer); session_->OnConnectionClosed(error, from_peer);
......
...@@ -68,7 +68,6 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface { ...@@ -68,7 +68,6 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
virtual void OnWriteBlocked() OVERRIDE {} virtual void OnWriteBlocked() OVERRIDE {}
virtual void OnSuccessfulVersionNegotiation( virtual void OnSuccessfulVersionNegotiation(
const QuicVersion& version) OVERRIDE {} const QuicVersion& version) OVERRIDE {}
virtual void OnConfigNegotiated() OVERRIDE;
virtual bool OnCanWrite() OVERRIDE; virtual bool OnCanWrite() OVERRIDE;
virtual bool HasPendingHandshake() const OVERRIDE; virtual bool HasPendingHandshake() const OVERRIDE;
...@@ -128,6 +127,9 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface { ...@@ -128,6 +127,9 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
// a server, returns true if a full, valid client hello has been received. // a server, returns true if a full, valid client hello has been received.
virtual bool IsCryptoHandshakeConfirmed(); 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. // Called by the QuicCryptoStream when the handshake enters a new state.
// //
// Clients will call this function in the order: // Clients will call this function in the order:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment