Refactor preference syncing.

chrome/browser/sync/glue/bookmark_model_associator.h

Index: chrome/browser/sync/glue/bookmark_model_associator.h
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h
index ac0da1c5409fab0702a13ee872c0e4a90de2ead5..3d7342449d36e84f4256bbdeb465361370537df2 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.h
+++ b/chrome/browser/sync/glue/bookmark_model_associator.h
@@ -34,14 +34,12 @@ class BookmarkChangeProcessor;
 // * Methods to get a bookmark node for a given sync node and vice versa.
 // * Persisting model associations and loading them back.
 class BookmarkModelAssociator
-    : public PerDataTypeAssociatorInterface<BookmarkNode, int64> {
+    : public NewAssociatorInterface {
  public:
-  static syncable::ModelType model_type() { return syncable::BOOKMARKS; }
   BookmarkModelAssociator(
       BookmarkModel* bookmark_model,
       sync_api::UserShare* user_share,
       UnrecoverableErrorHandler* unrecoverable_error_handler);
-  virtual ~BookmarkModelAssociator();
 
   // AssociatorInterface implementation.
   //
@@ -88,7 +86,10 @@ class BookmarkModelAssociator
   // See ModelAssociator interface.
   virtual bool CryptoReadyIfNecessary();
 
+  virtual syncable::ModelType model_type() const { return syncable::BOOKMARKS; }
  protected:
+  virtual ~BookmarkModelAssociator();
+
   // Stores the id of the node with the given tag in |sync_id|.
   // Returns of that node was found successfully.
   // Tests override this.