Refactor preference syncing.

chrome/browser/sync/glue/bookmark_model_associator.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 16 matching lines @@
 
 namespace browser_sync {
 
 class BookmarkChangeProcessor;
 
 // Contains all model association related logic:
 // * Algorithm to associate bookmark model and sync model.
 // * 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.
   //
   // AssociateModels iterates through both the sync and the browser
   // bookmark model, looking for matched pairs of items.  For any pairs it
   // finds, it will call AssociateSyncID.  For any unmatched items,
   // MergeAndAssociateModels will try to repair the match, e.g. by adding a new
   // node.  After successful completion, the models should be identical and
   // corresponding. Returns true on success.  On failure of this step, we
   // should abort the sync operation and report an error to the user.
@@ skipping 26 matching lines @@
   virtual void Disassociate(int64 sync_id);
 
   virtual void AbortAssociation() {
     // No implementation needed, this associator runs on the main
     // thread.
   }
 
   // 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.
   virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id);
 
  private:
   typedef std::map<int64, int64> BookmarkIdToSyncIdMap;
   typedef std::map<int64, const BookmarkNode*> SyncIdToBookmarkNodeMap;
   typedef std::set<int64> DirtyAssociationsSyncIds;
 
@@ skipping 37 matching lines @@
   ScopedRunnableMethodFactory<BookmarkModelAssociator> persist_associations_;
 
   int number_of_new_sync_nodes_created_at_association_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_