Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/profile_resetter/profile_resetter.h

 // Copyright (c) 2013 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_PROFILE_RESETTER_PROFILE_RESETTER_H_
 #define CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "chrome/browser/search_engines/template_url_service.h"
 
 class Profile;
 class TemplateURLService;

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

no longer needed since you are including template_url_service.h

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

Done.

 
 // This class allows resetting certain aspects of a profile to default values.
 // It is used in case the profile has been damaged due to malware or bad user
 // settings.
 class ProfileResetter : public base::NonThreadSafe,
-                        public content::NotificationObserver,
                         public BrowsingDataRemover::Observer {
  public:
   // Flags indicating what aspects of a profile shall be reset.
   enum Resettable {
     DEFAULT_SEARCH_ENGINE = 1 << 0,
     HOMEPAGE = 1 << 1,
     CONTENT_SETTINGS = 1 << 2,
     COOKIES_AND_SITE_DATA = 1 << 3,
     EXTENSIONS = 1 << 4,
     STARTUP_PAGES = 1 << 5,
@@ skipping 28 matching lines @@
   void MarkAsDone(Resettable resettable);
 
   void ResetDefaultSearchEngine();
   void ResetHomepage();
   void ResetContentSettings();
   void ResetCookiesAndSiteData();
   void ResetExtensions();
   void ResetStartupPages();
   void ResetPinnedTabs();
 
-  // content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // BrowsingDataRemover::Observer:
   virtual void OnBrowsingDataRemoverDone() OVERRIDE;
 
+  // Callback for when TemplateURLService has loaded.
+  void OnTemplateURLServiceLoaded();
+
   Profile* const profile_;
   scoped_ptr<BrandcodedDefaultSettings> master_settings_;
   TemplateURLService* template_url_service_;
 
   // Flags of a Resetable indicating which reset operations we are still waiting
   // for.
   ResettableFlags pending_reset_flags_;
 
   // Called on UI thread when reset has been completed.
   base::Closure callback_;
 
-  content::NotificationRegistrar registrar_;
-
   // If non-null it means removal is in progress. BrowsingDataRemover takes care
   // of deleting itself when done.
   BrowsingDataRemover* cookies_remover_;
 
+  scoped_ptr<TemplateURLService::Subscription> template_url_service_sub_;
+
   DISALLOW_COPY_AND_ASSIGN(ProfileResetter);
 };
 
 #endif  // CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_