When deleting storage through the cookies tree model, also update its cache

chrome/browser/browsing_data_database_helper.cc

 // Copyright (c) 2011 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_database_helper.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 38 matching lines @@
 BrowsingDataDatabaseHelper::BrowsingDataDatabaseHelper(Profile* profile)
     : completion_callback_(NULL),
       is_fetching_(false),
       tracker_(profile->GetDatabaseTracker()) {
 }
 
 BrowsingDataDatabaseHelper::~BrowsingDataDatabaseHelper() {
 }
 
 void BrowsingDataDatabaseHelper::StartFetching(
-    Callback1<const std::vector<DatabaseInfo>& >::Type* callback) {
+    Callback1<const std::list<DatabaseInfo>& >::Type* callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!is_fetching_);
   DCHECK(callback);
   is_fetching_ = true;
   database_info_.clear();
   completion_callback_.reset(callback);
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod(
       this, &BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread));
 }
 
@@ skipping 116 matching lines @@
   database_info_.clear();
   pending_database_info_.clear();
 }
 
 bool CannedBrowsingDataDatabaseHelper::empty() const {
   base::AutoLock auto_lock(lock_);
   return database_info_.empty() && pending_database_info_.empty();
 }
 
 void CannedBrowsingDataDatabaseHelper::StartFetching(
-    Callback1<const std::vector<DatabaseInfo>& >::Type* callback) {
+    Callback1<const std::list<DatabaseInfo>& >::Type* callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!is_fetching_);
   DCHECK(callback);
   is_fetching_ = true;
   completion_callback_.reset(callback);
   BrowserThread::PostTask(BrowserThread::WEBKIT, FROM_HERE, NewRunnableMethod(
       this, &CannedBrowsingDataDatabaseHelper::ConvertInfoInWebKitThread));
 }
 
 CannedBrowsingDataDatabaseHelper::~CannedBrowsingDataDatabaseHelper() {}
 
 void CannedBrowsingDataDatabaseHelper::ConvertInfoInWebKitThread() {
   base::AutoLock auto_lock(lock_);
-  for (std::vector<PendingDatabaseInfo>::const_iterator
+  for (std::list<PendingDatabaseInfo>::const_iterator
        info = pending_database_info_.begin();
        info != pending_database_info_.end(); ++info) {
     WebSecurityOrigin web_security_origin =
         WebSecurityOrigin::createFromString(
             UTF8ToUTF16(info->origin.spec()));
     std::string origin_identifier =
         web_security_origin.databaseIdentifier().utf8();
 
     bool duplicate = false;
-    for (std::vector<DatabaseInfo>::iterator database = database_info_.begin();
+    for (std::list<DatabaseInfo>::iterator database = database_info_.begin();
          database != database_info_.end(); ++database) {
       if (database->origin_identifier == origin_identifier &&
           database->database_name == info->name) {
         duplicate = true;
         break;
       }
     }
     if (duplicate)
       continue;
 
     database_info_.push_back(DatabaseInfo(
         web_security_origin.host().utf8(),
         info->name,
         origin_identifier,
         info->description,
         web_security_origin.toString().utf8(),
         0,
         base::Time()));
   }
   pending_database_info_.clear();
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(
       this, &CannedBrowsingDataDatabaseHelper::NotifyInUIThread));
 }