More NotificationRegistrar conversions.

chrome/browser/browsing_data_remover.cc

 // Copyright (c) 2006-2008 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_remover.h"
 
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/history/history.h"
@@ skipping 23 matching lines @@
     BrowsingDataRemover* remover) {
 }
 
 bool BrowsingDataRemover::removing_ = false;
 
 BrowsingDataRemover::BrowsingDataRemover(Profile* profile, Time delete_begin,
                                          Time delete_end)
     : 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);
 }
 
 BrowsingDataRemover::~BrowsingDataRemover() {
   DCHECK(all_done());
 }
 
 void BrowsingDataRemover::Remove(int remove_mask) {
   DCHECK(!removing_);
   removing_ = true;
 
   if (remove_mask & REMOVE_HISTORY) {
     HistoryService* history_service =
         profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
     if (history_service) {
       UserMetrics::RecordAction(L"ClearBrowsingData_History", profile_);
       waiting_for_clear_history_ = true;
       history_service->ExpireHistoryBetween(delete_begin_, delete_end_,
           &request_consumer_,
           NewCallback(this, &BrowsingDataRemover::OnHistoryDeletionDone));
     }
 
     // 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_);
     }
 
     // We also delete the list of recently closed tabs. Since these expire,
     // they can't be more than a day old, so we can simply clear them all.
     TabRestoreService* tab_service = profile_->GetTabRestoreService();
     if (tab_service) {
       tab_service->ClearEntries();
@@ skipping 70 matching lines @@
 
 void BrowsingDataRemover::Observe(NotificationType type,
                                   const NotificationSource& source,
                                   const 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 == 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();
   }
 }
 
 void BrowsingDataRemover::NotifyAndDeleteIfDone() {
   // TODO(brettw) bug 1139736: see TODO in Observe() above.
   if (!all_done())
     return;
 
   removing_ = false;
@@ skipping 28 matching lines @@
     if (delete_begin.is_null())
       cache->DoomAllEntries();
     else
       cache->DoomEntriesBetween(delete_begin, delete_end);
   }
 
   // Notify the UI thread that we are done.
   ui_loop->PostTask(FROM_HERE, NewRunnableMethod(
       this, &BrowsingDataRemover::ClearedCache));
 }