QUIC - Minor clean up of QUIC Server Info memory cache.

R=wtc@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266684 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/browsing_data/browsing_data_remover.cc

@@ -899,16 +899,16 @@ void BrowsingDataRemover::DoClearCache(int rv) {
             (next_cache_state_ == STATE_CREATE_MAIN)
                 ? main_context_getter_.get()
                 : media_context_getter_.get();
-        net::HttpTransactionFactory* factory =
-            getter->GetURLRequestContext()->http_transaction_factory();
-
-        // Clear QUIC server information from memory.
-        net::HttpCache* http_cache = factory->GetCache();
-        http_cache->GetSession()->quic_stream_factory()->ClearCachedStates();
+        net::HttpCache* http_cache =
+            getter->GetURLRequestContext()->http_transaction_factory()->
+                GetCache();
 
         next_cache_state_ = (next_cache_state_ == STATE_CREATE_MAIN) ?
                                 STATE_DELETE_MAIN : STATE_DELETE_MEDIA;
 
+        // Clear QUIC server information from memory and the disk cache.
+        http_cache->GetSession()->quic_stream_factory()->
+            ClearCachedStatesInCryptoConfig();
         rv = http_cache->GetBackend(
             &cache_, base::Bind(&BrowsingDataRemover::DoClearCache,
                                 base::Unretained(this)));

net/quic/crypto/quic_crypto_client_config.cc

@@ -149,6 +149,17 @@ void QuicCryptoClientConfig::CachedState::SetProof(const vector<string>& certs,
   server_config_sig_ = signature.as_string();
 }
 
+void QuicCryptoClientConfig::CachedState::Clear() {
+  server_config_.clear();
+  source_address_token_.clear();
+  certs_.clear();
+  server_config_sig_.clear();
+  server_config_valid_ = false;
+  proof_verify_details_.reset();
+  scfg_.reset();
+  ++generation_counter_;
+}
+
 void QuicCryptoClientConfig::CachedState::ClearProof() {
   SetProofInvalid();
   certs_.clear();
@@ -274,9 +285,7 @@ QuicCryptoClientConfig::CachedState* QuicCryptoClientConfig::LookupOrCreate(
 void QuicCryptoClientConfig::ClearCachedStates() {
   for (CachedStateMap::const_iterator it = cached_states_.begin();
        it != cached_states_.end(); ++it) {
-    CachedState* cached = it->second;
-    cached->ClearProof();
-    cached->InvalidateServerConfig();
+    it->second->Clear();
   }
 }
 

net/quic/crypto/quic_crypto_client_config.h

@@ -64,6 +64,9 @@ class NET_EXPORT_PRIVATE QuicCryptoClientConfig : public QuicCryptoConfig {
     void SetProof(const std::vector<std::string>& certs,
                   base::StringPiece signature);
 
+    // Clears all the data.
+    void Clear();
+
     // Clears the certificate chain and signature and invalidates the proof.
     void ClearProof();
 

net/quic/crypto/quic_crypto_client_config_test.cc

@@ -229,43 +229,35 @@ TEST(QuicCryptoClientConfigTest, CanonicalNotUsedIfNotValid) {
 
 TEST(QuicCryptoClientConfigTest, ClearCachedStates) {
   QuicCryptoClientConfig config;
-  QuicServerId canonical_server_id("www.google.com", 80, false,
-                                   PRIVACY_MODE_DISABLED);
-  QuicCryptoClientConfig::CachedState* state =
-      config.LookupOrCreate(canonical_server_id);
+  QuicServerId server_id("www.google.com", 80, false, PRIVACY_MODE_DISABLED);
+  QuicCryptoClientConfig::CachedState* state = config.LookupOrCreate(server_id);
   // TODO(rch): Populate other fields of |state|.
   vector<string> certs(1);
   certs[0] = "Hello Cert";
   state->SetProof(certs, "signature");
   state->set_source_address_token("TOKEN");
   state->SetProofValid();
+  EXPECT_EQ(1u, state->generation_counter());
 
   // Verify LookupOrCreate returns the same data.
-  QuicServerId other_server_id("www.google.com", 80, false,
-                               PRIVACY_MODE_DISABLED);
+  QuicCryptoClientConfig::CachedState* other = config.LookupOrCreate(server_id);
 
-  QuicCryptoClientConfig::CachedState* other =
-      config.LookupOrCreate(other_server_id);
-
-  EXPECT_TRUE(other->proof_valid());
-  EXPECT_EQ(state->server_config(), other->server_config());
-  EXPECT_EQ(state->signature(), other->signature());
-  EXPECT_EQ(state->certs(), other->certs());
-  EXPECT_EQ(state->source_address_token(), other->source_address_token());
+  EXPECT_EQ(state, other);
   EXPECT_EQ(1u, other->generation_counter());
 
-  // Clear the cached state.
+  // Clear the cached states.
   config.ClearCachedStates();
 
   // Verify LookupOrCreate doesn't have any data.
   QuicCryptoClientConfig::CachedState* cleared_cache =
-      config.LookupOrCreate(other_server_id);
+      config.LookupOrCreate(server_id);
 
+  EXPECT_EQ(state, cleared_cache);
   EXPECT_FALSE(cleared_cache->proof_valid());
   EXPECT_TRUE(cleared_cache->server_config().empty());
   EXPECT_TRUE(cleared_cache->certs().empty());
   EXPECT_TRUE(cleared_cache->signature().empty());
-  EXPECT_LT(1u, cleared_cache->generation_counter());
+  EXPECT_EQ(2u, cleared_cache->generation_counter());
 }
 
 }  // namespace test

net/quic/quic_stream_factory.cc

@@ -648,7 +648,7 @@ base::Value* QuicStreamFactory::QuicStreamFactoryInfoToValue() const {
   return list;
 }
 
-void QuicStreamFactory::ClearCachedStates() {
+void QuicStreamFactory::ClearCachedStatesInCryptoConfig() {
   crypto_config_.ClearCachedStates();
 }
 
@@ -754,7 +754,7 @@ int QuicStreamFactory::CreateSession(
   writer->SetConnection(connection);
   connection->options()->max_packet_length = max_packet_length_;
 
-  InitializeCachedState(server_id, server_info);
+  InitializeCachedStateInCryptoConfig(server_id, server_info);
 
   QuicConfig config = config_;
   if (http_server_properties_) {
@@ -790,7 +790,7 @@ void QuicStreamFactory::ActivateSession(
   ip_aliases_[ip_alias_key].insert(session);
 }
 
-void QuicStreamFactory::InitializeCachedState(
+void QuicStreamFactory::InitializeCachedStateInCryptoConfig(
     const QuicServerId& server_id,
     const scoped_ptr<QuicServerInfo>& server_info) {
   if (!server_info)

net/quic/quic_stream_factory.h

@@ -133,7 +133,7 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
   base::Value* QuicStreamFactoryInfoToValue() const;
 
   // Delete all cached state objects in |crypto_config_|.
-  void ClearCachedStates();
+  void ClearCachedStatesInCryptoConfig();
 
   // NetworkChangeNotifier::IPAddressObserver methods:
 
@@ -215,8 +215,9 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
 
   // Initializes the cached state associated with |server_id| in
   // |crypto_config_| with the information in |server_info|.
-  void InitializeCachedState(const QuicServerId& server_id,
-                             const scoped_ptr<QuicServerInfo>& server_info);
+  void InitializeCachedStateInCryptoConfig(
+      const QuicServerId& server_id,
+      const scoped_ptr<QuicServerInfo>& server_info);
 
   bool require_confirmation_;
   HostResolver* host_resolver_;