Add foundation for trimming the AffiliationDatabase.

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 <string>
 
@@ skipping 196 matching lines @@
       waiting_for_clear_content_licenses_(false),
       waiting_for_clear_cookies_count_(0),
       waiting_for_clear_domain_reliability_monitor_(false),
       waiting_for_clear_form_(false),
       waiting_for_clear_history_(false),
       waiting_for_clear_hostname_resolution_cache_(false),
       waiting_for_clear_keyword_data_(false),
       waiting_for_clear_nacl_cache_(false),
       waiting_for_clear_network_predictor_(false),
       waiting_for_clear_networking_history_(false),
+      waiting_for_clear_passwords_(false),
       waiting_for_clear_platform_keys_(false),
       waiting_for_clear_plugin_data_(false),
       waiting_for_clear_pnacl_cache_(false),
       waiting_for_clear_storage_partition_data_(false),
 #if defined(ENABLE_WEBRTC)
       waiting_for_clear_webrtc_logs_(false),
 #endif
       remove_mask_(0),
       remove_origin_(GURL()),
       origin_set_mask_(0),
@@ skipping 328 matching lines @@
         CONTENT_SETTINGS_TYPE_APP_BANNER);
   }
 #endif
 
   if (remove_mask & REMOVE_PASSWORDS) {
     content::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords"));
     password_manager::PasswordStore* password_store =
         PasswordStoreFactory::GetForProfile(
             profile_, ServiceAccessType::EXPLICIT_ACCESS).get();
 
-    if (password_store)
-      password_store->RemoveLoginsCreatedBetween(delete_begin_, delete_end_);
+    if (password_store) {
+      // TrimAffiliationCache() will be called in OnClearedPasswords(), so that
+      // affiliation data corresponding to just deleted passwords can also be
+      // removed.
+      waiting_for_clear_passwords_ = true;
+      password_store->RemoveLoginsCreatedBetween(
+          delete_begin_, delete_end_,
+          base::Bind(&BrowsingDataRemover::OnClearedPasswords,
+                     base::Unretained(this)));
+    }
+  } else if (remove_mask & REMOVE_CACHE) {
+    TrimAffiliationCache();
   }
 
   if (remove_mask & REMOVE_FORM_DATA) {
     content::RecordAction(UserMetricsAction("ClearBrowsingData_Autofill"));
     scoped_refptr<autofill::AutofillWebDataService> web_data_service =
         WebDataServiceFactory::GetAutofillWebDataForProfile(
             profile_, ServiceAccessType::EXPLICIT_ACCESS);
 
     if (web_data_service.get()) {
       waiting_for_clear_form_ = true;
@@ skipping 220 matching lines @@
          !waiting_for_clear_channel_ids_ &&
          !waiting_for_clear_cookies_count_ &&
          !waiting_for_clear_domain_reliability_monitor_ &&
          !waiting_for_clear_form_ &&
          !waiting_for_clear_history_ &&
          !waiting_for_clear_hostname_resolution_cache_ &&
          !waiting_for_clear_keyword_data_ &&
          !waiting_for_clear_nacl_cache_ &&
          !waiting_for_clear_network_predictor_ &&
          !waiting_for_clear_networking_history_ &&
+         !waiting_for_clear_passwords_ &&
          !waiting_for_clear_platform_keys_ &&
          !waiting_for_clear_plugin_data_ &&
          !waiting_for_clear_pnacl_cache_ &&
 #if defined(ENABLE_WEBRTC)
          !waiting_for_clear_webrtc_logs_ &&
 #endif
          !waiting_for_clear_storage_partition_data_;
 }
 
 void BrowsingDataRemover::OnKeywordsLoaded() {
@@ skipping 179 matching lines @@
     bool result) {
   DCHECK(waiting_for_clear_platform_keys_);
   if (call_status != chromeos::DBUS_METHOD_CALL_SUCCESS || !result) {
     LOG(ERROR) << "Failed to clear platform keys.";
   }
   waiting_for_clear_platform_keys_ = false;
   NotifyAndDeleteIfDone();
 }
 #endif
 
+
+void BrowsingDataRemover::OnClearedPasswords() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  waiting_for_clear_passwords_ = false;
+  TrimAffiliationCache();

[Mike West, 2015/05/13 15:20:06]

Ideally, we'd wait on this as well.

+  NotifyAndDeleteIfDone();
+}
+
+void BrowsingDataRemover::TrimAffiliationCache() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  PasswordStoreFactory::TrimOrDeleteAffiliationCache(profile_);

[Mike West, 2015/05/13 15:20:06]

Ideally, we'd have tests showing that this method is called if REMOVE_CACHE or
REMOVE_PASSWORDS is set.

+}
+
 void BrowsingDataRemover::OnClearedCookies(int num_deleted) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&BrowsingDataRemover::OnClearedCookies,
                    base::Unretained(this), num_deleted));
     return;
   }
 
   DCHECK_GT(waiting_for_clear_cookies_count_, 0);
@@ skipping 74 matching lines @@
   waiting_for_clear_domain_reliability_monitor_ = false;
   NotifyAndDeleteIfDone();
 }
 
 // static
 BrowsingDataRemover::CallbackSubscription
     BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback(
         const BrowsingDataRemover::Callback& callback) {
   return GetOnBrowsingDataRemovedCallbacks()->Add(callback);
 }