More NotificationRegistrar conversions.

chrome/browser/browsing_data_remover.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
 
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "chrome/browser/cancelable_request.h"
-#include "chrome/common/notification_observer.h"
+#include "chrome/common/notification_registrar.h"
 
 class MessageLoop;
 class Profile;
 
 // BrowsingDataRemover is responsible for removing data related to browsing:
 // visits in url database, downloads, cookies ...
 
 class BrowsingDataRemover : public NotificationObserver {
  public:
   // Mask used for Remove.
@@ skipping 45 matching lines @@
   // Callback when the cache has been deleted. Invokes NotifyAndDeleteIfDone.
   void ClearedCache();
 
   // Invoked on the IO thread to delete from the cache.
   void ClearCacheOnIOThread(base::Time delete_begin,
                             base::Time delete_end,
                             MessageLoop* ui_loop);
 
   // Returns true if we're all done.
   bool all_done() {
-    return !waiting_for_keywords_ && !waiting_for_clear_cache_ &&
+    return registrar_.IsEmpty() && !waiting_for_clear_cache_ &&
            !waiting_for_clear_history_;
   }
 
+  NotificationRegistrar registrar_;
+
   // Profile we're to remove from.
   Profile* profile_;
 
   // Start time to delete from.
   const base::Time delete_begin_;
 
   // End time to delete to.
   const base::Time delete_end_;
 
   // True if Remove has been invoked.
   static bool removing_;
 
-  // True if we're waiting for the TemplateURLModel to finish loading.
-  bool waiting_for_keywords_;
-
   // True if we're waiting for the history to be deleted.
   bool waiting_for_clear_history_;
 
   // True if we're waiting for the cache to be cleared.
   bool waiting_for_clear_cache_;
 
   ObserverList<Observer> observer_list_;
 
   // Used if we need to clear history.
   CancelableRequestConsumer request_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_REMOVER_H_