Index: net/quic/crypto/quic_crypto_client_config.h |
diff --git a/net/quic/crypto/quic_crypto_client_config.h b/net/quic/crypto/quic_crypto_client_config.h |
index a7c58804c128e2f70a465446e469465770b91d69..5e08aeb455a5e5a6c65adeaea173e37fcd0b492c 100644 |
--- a/net/quic/crypto/quic_crypto_client_config.h |
+++ b/net/quic/crypto/quic_crypto_client_config.h |
@@ -31,6 +31,7 @@ class NET_EXPORT_PRIVATE QuicCryptoClientConfig : public QuicCryptoConfig { |
class NET_EXPORT_PRIVATE CachedState { |
public: |
CachedState(); |
+ CachedState(scoped_ptr<QuicServerInfo> quic_server_info); |
wtc
2014/01/30 20:14:26
Please add "explicit" because this constructor tak
ramant (doing other things)
2014/02/02 19:35:10
Done.
|
~CachedState(); |
// IsComplete returns true if this object contains enough information to |
@@ -89,11 +90,6 @@ class NET_EXPORT_PRIVATE QuicCryptoClientConfig : public QuicCryptoConfig { |
// unchanged. |
void InitializeFrom(const CachedState& other); |
- // TODO(rtenneti): Need to flesh out the details of this method. A temporary |
- // place holder to load CachedState from disk cache. |
- void LoadFromDiskCache(QuicServerInfoFactory* quic_server_info_factory, |
- const std::string& server_hostname); |
- |
private: |
std::string server_config_id_; // An opaque id from the server. |
std::string server_config_; // A serialized handshake message. |
@@ -120,8 +116,7 @@ class NET_EXPORT_PRIVATE QuicCryptoClientConfig : public QuicCryptoConfig { |
}; |
QuicCryptoClientConfig(); |
- explicit QuicCryptoClientConfig( |
- QuicServerInfoFactory* quic_server_info_factory); |
+ explicit QuicCryptoClientConfig(scoped_ptr<QuicServerInfo> quic_server_info); |
wtc
2014/01/30 20:14:26
Just to make sure I understand correctly: this cha
ramant (doing other things)
2014/02/02 19:35:10
Thanks for the catch. Deleted this member.
|
~QuicCryptoClientConfig(); |
// Sets the members to reasonable, default values. |
@@ -219,7 +214,7 @@ class NET_EXPORT_PRIVATE QuicCryptoClientConfig : public QuicCryptoConfig { |
// about that server. |
std::map<std::string, CachedState*> cached_states_; |
- QuicServerInfoFactory* quic_server_info_factory_; |
+ scoped_ptr<QuicServerInfo> quic_server_info_; |
scoped_ptr<ProofVerifier> proof_verifier_; |
scoped_ptr<ChannelIDSigner> channel_id_signer_; |