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

chrome/browser/browsing_data/browsing_data_remover.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 881 matching lines @@
 
   while (rv != net::ERR_IO_PENDING && next_cache_state_ != STATE_NONE) {
     switch (next_cache_state_) {
       case STATE_CREATE_MAIN:
       case STATE_CREATE_MEDIA: {
         // Get a pointer to the cache.
         net::URLRequestContextGetter* getter =
             (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)));
         break;
       }
       case STATE_DELETE_MAIN:
       case STATE_DELETE_MEDIA: {
         next_cache_state_ = (next_cache_state_ == STATE_DELETE_MAIN) ?
                                 STATE_CREATE_MEDIA : STATE_DONE;
 
@@ skipping 198 matching lines @@
   NotifyAndDeleteIfDone();
 }
 
 #if defined(ENABLE_WEBRTC)
 void BrowsingDataRemover::OnClearedWebRtcLogs() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_webrtc_logs_ = false;
   NotifyAndDeleteIfDone();
 }
 #endif