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

chrome/browser/browsing_data_local_storage_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_local_storage_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 38 matching lines @@
     : profile_(profile),
       completion_callback_(NULL),
       is_fetching_(false) {
   DCHECK(profile_);
 }
 
 BrowsingDataLocalStorageHelper::~BrowsingDataLocalStorageHelper() {
 }
 
 void BrowsingDataLocalStorageHelper::StartFetching(
-    Callback1<const std::vector<LocalStorageInfo>& >::Type* callback) {
+    Callback1<const std::list<LocalStorageInfo>& >::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,
           &BrowsingDataLocalStorageHelper::
@@ skipping 104 matching lines @@
   local_storage_info_.clear();
   pending_local_storage_info_.clear();
 }
 
 bool CannedBrowsingDataLocalStorageHelper::empty() const {
   base::AutoLock auto_lock(lock_);
   return local_storage_info_.empty() && pending_local_storage_info_.empty();
 }
 
 void CannedBrowsingDataLocalStorageHelper::StartFetching(
-    Callback1<const std::vector<LocalStorageInfo>& >::Type* callback) {
+    Callback1<const std::list<LocalStorageInfo>& >::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,
           &CannedBrowsingDataLocalStorageHelper::
               ConvertPendingInfoInWebKitThread));
 }
 
 CannedBrowsingDataLocalStorageHelper::~CannedBrowsingDataLocalStorageHelper() {}
 
 void CannedBrowsingDataLocalStorageHelper::ConvertPendingInfoInWebKitThread() {
   base::AutoLock auto_lock(lock_);
   for (std::set<GURL>::iterator info = pending_local_storage_info_.begin();
        info != pending_local_storage_info_.end(); ++info) {
     WebSecurityOrigin web_security_origin =
         WebSecurityOrigin::createFromString(
             UTF8ToUTF16(info->spec()));
     std::string security_origin(web_security_origin.toString().utf8());
 
     bool duplicate = false;
-    for (std::vector<LocalStorageInfo>::iterator
+    for (std::list<LocalStorageInfo>::iterator
          local_storage = local_storage_info_.begin();
          local_storage != local_storage_info_.end(); ++local_storage) {
       if (local_storage->origin == security_origin) {
         duplicate = true;
         break;
       }
     }
     if (duplicate)
       continue;
 
     local_storage_info_.push_back(LocalStorageInfo(
         web_security_origin.protocol().utf8(),
         web_security_origin.host().utf8(),
         web_security_origin.port(),
         web_security_origin.databaseIdentifier().utf8(),
         security_origin,
         profile_->GetWebKitContext()->dom_storage_context()->
             GetLocalStorageFilePath(web_security_origin.databaseIdentifier()),
         0,
         base::Time()));
   }
   pending_local_storage_info_.clear();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &CannedBrowsingDataLocalStorageHelper::NotifyInUIThread));
 }