Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/browsing_data/browsing_data_remover.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
 #include <set>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/waitable_event_watcher.h"
 #include "base/time/time.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
+#include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/cancelable_task_tracker.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "url/gurl.h"
 #include "webkit/common/quota/quota_types.h"
 
 class ExtensionSpecialStoragePolicy;
 class IOThread;
 class Profile;
 
 namespace content {
 class PluginDataRemover;
 }
@@ skipping 12 matching lines @@
 
 namespace content {
 class DOMStorageContext;
 struct LocalStorageUsageInfo;
 struct SessionStorageUsageInfo;
 }
 
 // BrowsingDataRemover is responsible for removing data related to browsing:
 // visits in url database, downloads, cookies ...
 
-class BrowsingDataRemover : public content::NotificationObserver
+class BrowsingDataRemover
 #if defined(ENABLE_PLUGINS)
-                            , public PepperFlashSettingsManager::Client
+    : public PepperFlashSettingsManager::Client
 #endif
-                            {
+    {
  public:
   // Time period ranges available when doing browsing data removals.
   enum TimePeriod {
     LAST_HOUR = 0,
     LAST_DAY,
     LAST_WEEK,
     FOUR_WEEKS,
     EVERYTHING
   };
 
@@ skipping 139 matching lines @@
   BrowsingDataRemover(Profile* profile,
                       base::Time delete_begin,
                       base::Time delete_end);
 
   // BrowsingDataRemover deletes itself (using DeleteHelper) and is not supposed
   // to be deleted by other objects so make destructor private and DeleteHelper
   // a friend.
   friend class base::DeleteHelper<BrowsingDataRemover>;
   virtual ~BrowsingDataRemover();
 
-  // content::NotificationObserver method. Callback when TemplateURLService has
-  // finished loading. Deletes the entries from the model, and if we're not
-  // waiting on anything else notifies observers and deletes this
-  // BrowsingDataRemover.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // Callback when TemplateURLService has finished loading.

[Avi (use Gerrit), 2013/10/02 22:27:52]

"Callback for when..."?

[Cait (Slow), 2013/10/03 15:36:45]

Done.

+  void OnKeywordsLoaded();
 
   // Called when plug-in data has been cleared. Invokes NotifyAndDeleteIfDone.
   void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
 
 #if defined(ENABLE_PLUGINS)
   // PepperFlashSettingsManager::Client implementation.
   virtual void OnDeauthorizeContentLicensesCompleted(uint32 request_id,
                                                      bool success) OVERRIDE;
 #endif
 
@@ skipping 136 matching lines @@
 
   // Invoked on the IO thread to delete from the shader cache.
   void ClearShaderCacheOnUIThread();
 
   // Callback on UI thread when the WebRTC identities are cleared.
   void OnClearWebRTCIdentityStore();
 
   // Returns true if we're all done.
   bool AllDone();
 
-  content::NotificationRegistrar registrar_;
-
   // Profile we're to remove from.
   Profile* profile_;
 
   // The QuotaManager is owned by the profile; we can use a raw pointer here,
   // and rely on the profile to destroy the object whenever it's reasonable.
   quota::QuotaManager* quota_manager_;
 
   // The DOMStorageContext is owned by the profile; we'll store a raw pointer.
   content::DOMStorageContext* dom_storage_context_;
 
@@ skipping 41 matching lines @@
   bool waiting_for_clear_nacl_cache_;
   bool waiting_for_clear_network_predictor_;
   bool waiting_for_clear_networking_history_;
   bool waiting_for_clear_plugin_data_;
   bool waiting_for_clear_pnacl_cache_;
   bool waiting_for_clear_quota_managed_data_;
   bool waiting_for_clear_server_bound_certs_;
   bool waiting_for_clear_session_storage_;
   bool waiting_for_clear_shader_cache_;
   bool waiting_for_clear_webrtc_identity_store_;
+  bool waiting_for_clear_keyword_data_;
 
   // Tracking how many origins need to be deleted, and whether we're finished
   // gathering origins.
   int quota_managed_origins_to_delete_count_;
   int quota_managed_storage_types_to_delete_count_;
 
   // The removal mask for the current removal operation.
   int remove_mask_;
 
   // The origin for the current removal operation.
   GURL remove_origin_;
 
   // From which types of origins should we remove data?
   int origin_set_mask_;
 
   ObserverList<Observer> observer_list_;
 
   // Used if we need to clear history.
   CancelableTaskTracker history_task_tracker_;
 
+  scoped_ptr<TemplateURLService::Subscription> template_url_sub_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_