Delete cookies for site when deleting locally stored data.

chrome/browser/browsing_data/cookies_tree_model.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/cookies_tree_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <vector>
@@ skipping 892 matching lines @@
 
 CookieTreeNode::DetailedInfo CookieTreeFlashLSONode::GetDetailedInfo() const {
   return DetailedInfo().InitFlashLSO(domain_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ScopedBatchUpdateNotifier
 CookiesTreeModel::ScopedBatchUpdateNotifier::ScopedBatchUpdateNotifier(
   CookiesTreeModel* model, CookieTreeNode* node)
       : model_(model), node_(node), batch_in_progress_(false) {
+  model_->RecordBatchSeen();
 }
 
 CookiesTreeModel::ScopedBatchUpdateNotifier::~ScopedBatchUpdateNotifier() {
   if (batch_in_progress_) {
     model_->NotifyObserverTreeNodeChanged(node_);
     model_->NotifyObserverEndBatch();
+  } else {
+    // If no batch started, and this is the last batch, give the model a chance
+    // to send out a final notification.
+    model_->MaybeNotifyBatchesEnded();
   }
 }
 
 void CookiesTreeModel::ScopedBatchUpdateNotifier::StartBatchUpdate() {
   if (!batch_in_progress_) {
     model_->NotifyObserverBeginBatch();
     batch_in_progress_ = true;
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesTreeModel, public:
 CookiesTreeModel::CookiesTreeModel(
     LocalDataContainer* data_container,
     ExtensionSpecialStoragePolicy* special_storage_policy,
     bool group_by_cookie_source)
     : ui::TreeNodeModel<CookieTreeNode>(new CookieTreeRootNode(this)),
       data_container_(data_container),
 #if defined(ENABLE_EXTENSIONS)
       special_storage_policy_(special_storage_policy),
 #endif
       group_by_cookie_source_(group_by_cookie_source),
-      batch_update_(0) {
+      batches_expected_(0),
+      batches_seen_(0),
+      batches_started_(0),
+      batches_ended_(0) {
   data_container_->Init(this);
 }
 
 CookiesTreeModel::~CookiesTreeModel() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesTreeModel, TreeModel methods (public):
 
 // TreeModel methods:
@@ skipping 58 matching lines @@
     return;
   cookie_node->DeleteStoredObjects();
   CookieTreeNode* parent_node = cookie_node->parent();
   delete Remove(parent_node, cookie_node);
   if (parent_node->empty())
     DeleteCookieNode(parent_node);
 }
 
 void CookiesTreeModel::UpdateSearchResults(const base::string16& filter) {
   CookieTreeNode* root = GetRoot();
+  SetBatchExpectation(1, true);
   ScopedBatchUpdateNotifier notifier(this, root);
   int num_children = root->child_count();
   notifier.StartBatchUpdate();
   for (int i = num_children - 1; i >= 0; --i)
     delete Remove(root, root->GetChild(i));
 
   PopulateCookieInfoWithFilter(data_container(), &notifier, filter);
   PopulateDatabaseInfoWithFilter(data_container(), &notifier, filter);
   PopulateLocalStorageInfoWithFilter(data_container(), &notifier, filter);
   PopulateSessionStorageInfoWithFilter(data_container(), &notifier, filter);
@@ skipping 388 matching lines @@
        it != container->flash_lso_domain_list_.end(); ++it) {
     if (filter_utf8.empty() || it->find(filter_utf8) != std::string::npos) {
       // Create a fake origin for GetOrCreateHostNode().
       GURL origin("http://" + *it);
       CookieTreeHostNode* host_node = root->GetOrCreateHostNode(origin);
       host_node->GetOrCreateFlashLSONode(*it);
     }
   }
 }
 
+void CookiesTreeModel::SetBatchExpectation(int batches_expected, bool reset) {
+  batches_expected_ = batches_expected;
+  if (reset) {
+    batches_seen_ = 0;
+    batches_started_ = 0;
+    batches_ended_ = 0;
+  } else {
+    MaybeNotifyBatchesEnded();
+  }
+}
+
+void CookiesTreeModel::RecordBatchSeen() {
+  batches_seen_++;
+}
+
 void CookiesTreeModel::NotifyObserverBeginBatch() {
   // Only notify the model once if we're batching in a nested manner.
-  if (batch_update_++ == 0) {
+  if (batches_started_++ == 0) {
     FOR_EACH_OBSERVER(Observer,
                       cookies_observer_list_,
                       TreeModelBeginBatch(this));
   }
 }
 
 void CookiesTreeModel::NotifyObserverEndBatch() {
+  batches_ended_++;
+  MaybeNotifyBatchesEnded();
+}
+
+void CookiesTreeModel::MaybeNotifyBatchesEnded() {
   // Only notify the observers if this is the outermost call to EndBatch() if
   // called in a nested manner.
-  if (--batch_update_ == 0) {
+  if (batches_ended_ == batches_started_ &&
+      batches_seen_ == batches_expected_) {
     FOR_EACH_OBSERVER(Observer,
                       cookies_observer_list_,
                       TreeModelEndBatch(this));
   }
 }