Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/sync/glue/search_engine_data_type_controller.h

Index: chrome/browser/sync/glue/search_engine_data_type_controller.h
diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller.h b/chrome/browser/sync/glue/search_engine_data_type_controller.h
index 739af36cfd37f951aaf1d4c10c84399a5e68d358..4e21fd8811e5f0b9a782120a692cbba591b82be8 100644
--- a/chrome/browser/sync/glue/search_engine_data_type_controller.h
+++ b/chrome/browser/sync/glue/search_engine_data_type_controller.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/sync/glue/generic_change_processor.h"
 #include "chrome/browser/sync/glue/ui_data_type_controller.h"
 #include "content/public/browser/notification_observer.h"
@@ -15,27 +16,22 @@
 
 namespace browser_sync {
 
-class SearchEngineDataTypeController : public UIDataTypeController,
-                                       public content::NotificationObserver {
+class SearchEngineDataTypeController : public UIDataTypeController {
  public:
   SearchEngineDataTypeController(
       ProfileSyncComponentsFactory* profile_sync_factory,
       Profile* profile,
       ProfileSyncService* sync_service);
 
-  // content::NotificationObserver interface.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
  private:
   virtual ~SearchEngineDataTypeController();
 
   // FrontendDataTypeController implementations.
   virtual bool StartModels() OVERRIDE;
-  virtual void StopModels() OVERRIDE;
 
-  content::NotificationRegistrar registrar_;
+  void OnTemplateURLServiceLoaded();
+
+  scoped_ptr<TemplateURLService::Subscription> template_url_subscription_;

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

include scoped_ptr.h

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

Done.

 
   DISALLOW_COPY_AND_ASSIGN(SearchEngineDataTypeController);
 };