Eliminate NOTIFICATION_HISTORY_LOADED notification

chrome/browser/sync/glue/bookmark_data_type_controller.h

Index: chrome/browser/sync/glue/bookmark_data_type_controller.h
diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller.h b/chrome/browser/sync/glue/bookmark_data_type_controller.h
index 2d4677f5d6024fc1f6d5c5d28ab4d4b85b99b800..da2abd8a00ce60cc1d3fd539752f78aa9e1bbd27 100644
--- a/chrome/browser/sync/glue/bookmark_data_type_controller.h
+++ b/chrome/browser/sync/glue/bookmark_data_type_controller.h
@@ -10,6 +10,7 @@
 #include "base/compiler_specific.h"
 #include "chrome/browser/sync/glue/frontend_data_type_controller.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "content/public/browser/notification_observer.h"

[sdefresne, 2014/09/23 08:45:09]

Remove those two includes, they should no longer be required since you remove
last usage of content::Notification* classes.

[nshaik, 2014/10/29 08:43:39]

Done.

 #include "content/public/browser/notification_registrar.h"
 
@@ -17,8 +18,8 @@ namespace browser_sync {
 
 // A class that manages the startup and shutdown of bookmark sync.
 class BookmarkDataTypeController : public FrontendDataTypeController,
-                                   public content::NotificationObserver,
-                                   public BaseBookmarkModelObserver {
+                                   public BaseBookmarkModelObserver,
+                                   public history::HistoryServiceObserver {
  public:
   BookmarkDataTypeController(ProfileSyncComponentsFactory* profile_sync_factory,
                              Profile* profile,
@@ -27,10 +28,8 @@ class BookmarkDataTypeController : public FrontendDataTypeController,
   // FrontendDataTypeController interface.
   virtual syncer::ModelType type() const OVERRIDE;
 
-  // content::NotificationObserver interface.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // Is called when |service| is loaded.

[sdefresne, 2014/10/20 13:15:42]

// history::HistoryServiceObserver:

+  virtual void HistoryServiceLoaded(HistoryService* service) OVERRIDE;

[sdefresne, 2014/10/20 13:15:42]

OVERRIDE -> override

 
  private:
   virtual ~BookmarkDataTypeController();
@@ -50,8 +49,6 @@ class BookmarkDataTypeController : public FrontendDataTypeController,
   // service have finished loading.
   bool DependentsLoaded();
 
-  content::NotificationRegistrar registrar_;
-
   BookmarkModel* bookmark_model_;
 
   // Have we installed ourselves as a BookmarkModel observer?