Delete cookies for site when deleting locally stored data.

chrome/browser/browsing_data/local_data_container.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/local_data_container.h"
 
 #include "base/bind.h"
 #include "base/memory/linked_ptr.h"
 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
@@ skipping 21 matching lines @@
       database_helper_(database_helper),
       local_storage_helper_(local_storage_helper),
       session_storage_helper_(session_storage_helper),
       indexed_db_helper_(indexed_db_helper),
       file_system_helper_(file_system_helper),
       quota_helper_(quota_helper),
       channel_id_helper_(channel_id_helper),
       service_worker_helper_(service_worker_helper),
       flash_lso_helper_(flash_lso_helper),
       model_(NULL),
+      batches_started_(0),
       weak_ptr_factory_(this) {
 }
 
 LocalDataContainer::~LocalDataContainer() {}
 
 void LocalDataContainer::Init(CookiesTreeModel* model) {
   DCHECK(!model_);
   model_ = model;
 
+  batches_started_ = 1;
   DCHECK(cookie_helper_.get());
   cookie_helper_->StartFetching(
       base::Bind(&LocalDataContainer::OnCookiesModelInfoLoaded,
                  weak_ptr_factory_.GetWeakPtr()));
 
   if (database_helper_.get()) {
+    batches_started_++;
     database_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnDatabaseModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   if (local_storage_helper_.get()) {
+    batches_started_++;
     local_storage_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnLocalStorageModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   if (session_storage_helper_.get()) {
+    batches_started_++;
     session_storage_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnSessionStorageModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   // TODO(michaeln): When all of the UI implementations have been updated, make
   // this a required parameter.
   if (appcache_helper_.get()) {
+    batches_started_++;
     appcache_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnAppCacheModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   if (indexed_db_helper_.get()) {
+    batches_started_++;
     indexed_db_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnIndexedDBModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   if (file_system_helper_.get()) {
+    batches_started_++;
     file_system_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnFileSystemModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   if (quota_helper_.get()) {
+    batches_started_++;
     quota_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnQuotaModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   if (channel_id_helper_.get()) {
+    batches_started_++;
     channel_id_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnChannelIDModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   if (service_worker_helper_.get()) {
+    batches_started_++;
     service_worker_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnServiceWorkerModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   if (flash_lso_helper_.get()) {
+    batches_started_++;
     flash_lso_helper_->StartFetching(
         base::Bind(&LocalDataContainer::OnFlashLSOInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
+
+  model_->SetBatchExpectation(batches_started_, true);
 }
 
 void LocalDataContainer::OnAppCacheModelInfoLoaded() {
   using content::AppCacheInfo;
   using content::AppCacheInfoCollection;
   using content::AppCacheInfoVector;
   typedef std::map<GURL, AppCacheInfoVector> InfoByOrigin;
 
   scoped_refptr<AppCacheInfoCollection> appcache_info =
       appcache_helper_->info_collection();
-  if (!appcache_info.get() || appcache_info->infos_by_origin.empty())
+  if (!appcache_info.get() || appcache_info->infos_by_origin.empty()) {
+    // This batch has been canceled, so let the model know it won't be arriving.
+    model_->SetBatchExpectation(--batches_started_, false);
     return;
+  }
 
   for (InfoByOrigin::const_iterator origin =
            appcache_info->infos_by_origin.begin();
        origin != appcache_info->infos_by_origin.end(); ++origin) {
     std::list<AppCacheInfo>& info_list = appcache_info_[origin->first];
     info_list.insert(
         info_list.begin(), origin->second.begin(), origin->second.end());
   }
 
   model_->PopulateAppCacheInfo(this);
@@ skipping 63 matching lines @@
   DCHECK(model_);
   model_->PopulateServiceWorkerUsageInfo(this);
 }
 
 void LocalDataContainer::OnFlashLSOInfoLoaded(
     const FlashLSODomainList& domains) {
   flash_lso_domain_list_ = domains;
   DCHECK(model_);
   model_->PopulateFlashLSOInfo(this);
 }