More NotificationRegistrar conversions.

BUG=2381
Review URL: http://codereview.chromium.org/115674

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16699 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 13 deletions

diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 0929238..5b3bc70 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -40,7 +40,6 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
     : profile_(profile),
       delete_begin_(delete_begin),
       delete_end_(delete_end),
-      waiting_for_keywords_(false),
       waiting_for_clear_history_(false),
       waiting_for_clear_cache_(false) {
   DCHECK(profile);
@@ -80,10 +79,8 @@ void BrowsingDataRemover::Remove(int remove_mask) {
     // As part of history deletion we also delete the auto-generated keywords.
     TemplateURLModel* keywords_model = profile_->GetTemplateURLModel();
     if (keywords_model && !keywords_model->loaded()) {
-      waiting_for_keywords_ = true;
-      NotificationService::current()->AddObserver(
-          this, NotificationType::TEMPLATE_URL_MODEL_LOADED,
-          Source<TemplateURLModel>(keywords_model));
+      registrar_.Add(this, NotificationType::TEMPLATE_URL_MODEL_LOADED,
+                     Source<TemplateURLModel>(keywords_model));
       keywords_model->Load();
     } else if (keywords_model) {
       keywords_model->RemoveAutoGeneratedBetween(delete_begin_, delete_end_);
@@ -198,15 +195,8 @@ void BrowsingDataRemover::Observe(NotificationType type,
   DCHECK(type == NotificationType::TEMPLATE_URL_MODEL_LOADED);
   TemplateURLModel* model = Source<TemplateURLModel>(source).ptr();
   if (model->profile() == profile_->GetOriginalProfile()) {
-    NotificationService::current()->RemoveObserver(
-        this,
-        NotificationType::TEMPLATE_URL_MODEL_LOADED,
-        Source<TemplateURLModel>(model));
-
+    registrar_.RemoveAll();
     model->RemoveAutoGeneratedBetween(delete_begin_, delete_end_);
-
-    waiting_for_keywords_ = false;
-
     NotifyAndDeleteIfDone();
   }
 }