Index: net/quic/crypto/quic_crypto_client_config.cc |
diff --git a/net/quic/crypto/quic_crypto_client_config.cc b/net/quic/crypto/quic_crypto_client_config.cc |
index 84dfee02b5e9b7875df6e4b7a8a0c1d222626377..f7482d4e5afc78e516c4223b1455fb147bce6d09 100644 |
--- a/net/quic/crypto/quic_crypto_client_config.cc |
+++ b/net/quic/crypto/quic_crypto_client_config.cc |
@@ -29,13 +29,12 @@ using std::vector; |
namespace net { |
-QuicCryptoClientConfig::QuicCryptoClientConfig() |
- : quic_server_info_factory_(NULL) { |
+QuicCryptoClientConfig::QuicCryptoClientConfig() { |
} |
QuicCryptoClientConfig::QuicCryptoClientConfig( |
- QuicServerInfoFactory* quic_server_info_factory) |
- : quic_server_info_factory_(quic_server_info_factory) { |
+ scoped_ptr<QuicServerInfo> quic_server_info) |
+ : quic_server_info_(quic_server_info.Pass()) { |
} |
QuicCryptoClientConfig::~QuicCryptoClientConfig() { |
@@ -46,17 +45,13 @@ QuicCryptoClientConfig::CachedState::CachedState() |
: server_config_valid_(false), |
generation_counter_(0) {} |
-QuicCryptoClientConfig::CachedState::~CachedState() {} |
- |
-void QuicCryptoClientConfig::CachedState::LoadFromDiskCache( |
- QuicServerInfoFactory* quic_server_info_factory, |
- const string& server_hostname) { |
- DCHECK(quic_server_info_factory); |
- quic_server_info_.reset( |
- quic_server_info_factory->GetForHost(server_hostname)); |
+QuicCryptoClientConfig::CachedState::CachedState( |
+ scoped_ptr<QuicServerInfo> quic_server_info) |
+ : server_config_valid_(false), |
+ generation_counter_(0), |
+ quic_server_info_(quic_server_info.Pass()) {} |
- // TODO(rtenneti): Need to flesh out reading data from disk cache. |
-} |
+QuicCryptoClientConfig::CachedState::~CachedState() {} |
bool QuicCryptoClientConfig::CachedState::IsComplete(QuicWallTime now) const { |
if (server_config_.empty() || !server_config_valid_) { |
@@ -247,10 +242,7 @@ QuicCryptoClientConfig::CachedState* QuicCryptoClientConfig::LookupOrCreate( |
return it->second; |
} |
- CachedState* cached = new CachedState; |
- if (quic_server_info_factory_) { |
- cached->LoadFromDiskCache(quic_server_info_factory_, server_hostname); |
- } |
+ CachedState* cached = new CachedState(quic_server_info_.Pass()); |
cached_states_.insert(make_pair(server_hostname, cached)); |
return cached; |
} |