sync/glue: Convert BookmarkDataTypeController to BaseBookmarkModelObserver.

chrome/browser/bookmarks/bookmark_model.h

Index: chrome/browser/bookmarks/bookmark_model.h
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 3012847228a4d6d3c0e68a646bf613c957a5f731..8c174783423754b61615ea6cdf0dfae940737e02 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -234,14 +234,17 @@ class BookmarkModel : public content::NotificationObserver,
   // Invoked prior to destruction to release any necessary resources.
   virtual void Shutdown() OVERRIDE;
 
-  // Loads the bookmarks. This is called upon creation of the
-  // BookmarkModel. You need not invoke this directly.
+  // Loads the bookmarks. This is called upon creation of the BookmarkModel.
+  // You need not invoke this directly.
   void Load();
 
   // Returns true if the model finished loading.
   // This is virtual so it can be mocked.
   virtual bool IsLoaded() const;
 
+  virtual void AddObserver(BookmarkModelObserver* observer);
+  virtual void RemoveObserver(BookmarkModelObserver* observer);
+
   // Returns the root node. The 'bookmark bar' node and 'other' node are
   // children of the root node.
   const BookmarkNode* root_node() { return &root_; }
@@ -272,9 +275,6 @@ class BookmarkModel : public content::NotificationObserver,
   // (as long as the model is loaded).
   const BookmarkNode* GetParentForNewNodes();
 
-  void AddObserver(BookmarkModelObserver* observer);
-  void RemoveObserver(BookmarkModelObserver* observer);
-
   // Notifies the observers that an extensive set of changes is about to happen,
   // such as during import or sync, so they can delay any expensive UI updates
   // until it's finished.