sync/glue: Convert BookmarkDataTypeController to BaseBookmarkModelObserver.

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 4456e399ed453a3bbaddc98b5eace61a96f9d95a..8879da9c6c154658fe9c8b7f9307c459d8b3b204 100644
--- a/chrome/browser/sync/glue/bookmark_data_type_controller.h
+++ b/chrome/browser/sync/glue/bookmark_data_type_controller.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/sync/glue/frontend_data_type_controller.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -16,12 +17,12 @@ namespace browser_sync {
 
 // A class that manages the startup and shutdown of bookmark sync.
 class BookmarkDataTypeController : public FrontendDataTypeController,
-                                   public content::NotificationObserver {
+                                   public content::NotificationObserver,
+                                   public BaseBookmarkModelObserver {
  public:
-  BookmarkDataTypeController(
-      ProfileSyncComponentsFactory* profile_sync_factory,
-      Profile* profile,
-      ProfileSyncService* sync_service);
+  BookmarkDataTypeController(ProfileSyncComponentsFactory* profile_sync_factory,
+                             Profile* profile,
+                             ProfileSyncService* sync_service);
 
   // FrontendDataTypeController interface.
   virtual syncer::ModelType type() const OVERRIDE;
@@ -39,6 +40,10 @@ class BookmarkDataTypeController : public FrontendDataTypeController,
   virtual void CleanUpState() OVERRIDE;
   virtual void CreateSyncComponents() OVERRIDE;
 
+  // BaseBookmarkModelObserver interface.
+  virtual void BookmarkModelChanged() OVERRIDE;
+  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+
   // Helper that returns true iff both the bookmark model and the history
   // service have finished loading.
   bool DependentsLoaded();