Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

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 "base/bind.h"
@@ skipping 159 matching lines @@
       waiting_for_clear_nacl_cache_(false),
       waiting_for_clear_network_predictor_(false),
       waiting_for_clear_networking_history_(false),
       waiting_for_clear_plugin_data_(false),
       waiting_for_clear_pnacl_cache_(false),
       waiting_for_clear_quota_managed_data_(false),
       waiting_for_clear_server_bound_certs_(false),
       waiting_for_clear_session_storage_(false),
       waiting_for_clear_shader_cache_(false),
       waiting_for_clear_webrtc_identity_store_(false),
+      waiting_for_clear_keyword_data_(false),
       remove_mask_(0),
       remove_origin_(GURL()),
       origin_set_mask_(0) {
   DCHECK(profile);
   // crbug.com/140910: Many places were calling this with base::Time() as
   // delete_end, even though they should've used base::Time::Max(). Work around
   // it here. New code should use base::Time::Max().
   DCHECK(delete_end_ != base::Time());
   if (delete_end_ == base::Time())
     delete_end_ = base::Time::Max();
@@ skipping 24 matching lines @@
   return quota_client_mask;
 }
 
 void BrowsingDataRemover::Remove(int remove_mask, int origin_set_mask) {
   RemoveImpl(remove_mask, GURL(), origin_set_mask);
 }
 
 void BrowsingDataRemover::RemoveImpl(int remove_mask,
                                      const GURL& origin,
                                      int origin_set_mask) {
+  // TODO(brettw) bug 1139736: This should also observe session
+  // clearing (what about other things such as passwords, etc.?) and wait for
+  // them to complete before continuing.
+
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   set_removing(true);
   remove_mask_ = remove_mask;
   remove_origin_ = origin;
   origin_set_mask_ = origin_set_mask;
 
   PrefService* prefs = profile_->GetPrefs();
   bool may_delete_history = prefs->GetBoolean(
       prefs::kAllowDeletingBrowserHistory);
 
@@ skipping 63 matching lines @@
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(&BrowsingDataRemover::ClearNetworkPredictorOnIOThread,
                      base::Unretained(this)));
     }
 
     // As part of history deletion we also delete the auto-generated keywords.
     TemplateURLService* keywords_model =
         TemplateURLServiceFactory::GetForProfile(profile_);
     if (keywords_model && !keywords_model->loaded()) {
-      registrar_.Add(this, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-                     content::Source<TemplateURLService>(keywords_model));
+      template_url_sub_ = keywords_model->RegisterOnLoadedCallback(
+          base::Bind(&BrowsingDataRemover::OnKeywordsLoaded,
+                     base::Unretained(this)));
       keywords_model->Load();
+      waiting_for_clear_keyword_data_ = true;
     } else if (keywords_model) {
       keywords_model->RemoveAutoGeneratedForOriginBetween(remove_origin_,
           delete_begin_, delete_end_);
     }
 
     // The PrerenderManager keeps history of prerendered pages, so clear that.
     // It also may have a prerendered page. If so, the page could be
     // considered to have a small amount of historical information, so delete
     // it, too.
     prerender::PrerenderManager* prerender_manager =
@@ skipping 316 matching lines @@
       delete_begin_time = base::Time();
       break;
     default:
       NOTREACHED() << L"Missing item";
       break;
   }
   return delete_begin_time - diff;
 }
 
 bool BrowsingDataRemover::AllDone() {
-  return registrar_.IsEmpty() && !waiting_for_clear_autofill_origin_urls_ &&
+  return !waiting_for_clear_keyword_data_ &&
+         !waiting_for_clear_autofill_origin_urls_ &&
          !waiting_for_clear_cache_ && !waiting_for_clear_nacl_cache_ &&
          !waiting_for_clear_cookies_count_ && !waiting_for_clear_history_ &&
          !waiting_for_clear_local_storage_ &&
          !waiting_for_clear_logged_in_predictor_ &&
          !waiting_for_clear_session_storage_ &&
          !waiting_for_clear_networking_history_ &&
          !waiting_for_clear_server_bound_certs_ &&
          !waiting_for_clear_plugin_data_ &&
          !waiting_for_clear_pnacl_cache_ &&
          !waiting_for_clear_quota_managed_data_ &&
          !waiting_for_clear_content_licenses_ && !waiting_for_clear_form_ &&
          !waiting_for_clear_hostname_resolution_cache_ &&
          !waiting_for_clear_network_predictor_ &&
          !waiting_for_clear_shader_cache_ &&
          !waiting_for_clear_webrtc_identity_store_;
 }
 
-void BrowsingDataRemover::Observe(int type,
-                                  const content::NotificationSource& source,
-                                  const content::NotificationDetails& details) {
-  // TODO(brettw) bug 1139736: This should also observe session
-  // clearing (what about other things such as passwords, etc.?) and wait for
-  // them to complete before continuing.
-  DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
-  TemplateURLService* model = content::Source<TemplateURLService>(source).ptr();
-  if (model->profile() == profile_) {
-    registrar_.RemoveAll();
-    model->RemoveAutoGeneratedBetween(delete_begin_, delete_end_);
-    NotifyAndDeleteIfDone();
-  }
+void BrowsingDataRemover::OnKeywordsLoaded() {
+  // Deletes the entries from the model, and if we're not waiting on anything
+  // else notifies observers and deletes this BrowsingDataRemover.
+  TemplateURLService* model =
+      TemplateURLServiceFactory::GetForProfile(profile_);
+  DCHECK(model->profile() == profile_);

[Lei Zhang, 2013/10/08 00:25:20]

DCHECK_EQ() ?

[Cait (Slow), 2013/10/08 15:09:32]

Done.

+  model->RemoveAutoGeneratedBetween(delete_begin_, delete_end_);
+  waiting_for_clear_keyword_data_ = false;
+  template_url_sub_.reset();
+  NotifyAndDeleteIfDone();
 }
 
 void BrowsingDataRemover::NotifyAndDeleteIfDone() {
   // TODO(brettw) bug 1139736: see TODO in Observe() above.
   if (!AllDone())
     return;
 
   set_removing(false);
 
   // Send global notification, then notify any explicit observers.
@@ skipping 489 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_autofill_origin_urls_ = false;
   NotifyAndDeleteIfDone();
 }
 
 void BrowsingDataRemover::OnClearWebRTCIdentityStore() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_webrtc_identity_store_ = false;
   NotifyAndDeleteIfDone();
 }