Refactor preference syncing.

chrome/browser/sync/glue/extension_model_associator.h

Index: chrome/browser/sync/glue/extension_model_associator.h
diff --git a/chrome/browser/sync/glue/extension_model_associator.h b/chrome/browser/sync/glue/extension_model_associator.h
index ab4eb9cf39ee81067a5d8c083d6df7bd8922639d..9f1c946091ae0b5f2ebc5e644a529752296db48c 100644
--- a/chrome/browser/sync/glue/extension_model_associator.h
+++ b/chrome/browser/sync/glue/extension_model_associator.h
@@ -21,16 +21,15 @@ namespace browser_sync {
 
 // Contains all logic for associating the Chrome extensions model and
 // the sync extensions model.
-class ExtensionModelAssociator : public AssociatorInterface {
+class ExtensionModelAssociator
+    : public NewAssociatorInterface {
  public:
   // Does not take ownership of sync_service.
   ExtensionModelAssociator(const ExtensionSyncTraits& traits,
                            ExtensionServiceInterface* extension_service,
                            sync_api::UserShare* user_share);
-  virtual ~ExtensionModelAssociator();
 
   // Used by profile_sync_test_util.h.
-  static syncable::ModelType model_type() { return syncable::EXTENSIONS; }
 
   // AssociatorInterface implementation.
   virtual bool AssociateModels();
@@ -42,6 +41,8 @@ class ExtensionModelAssociator : public AssociatorInterface {
   }
   virtual bool CryptoReadyIfNecessary();
  private:
+  virtual ~ExtensionModelAssociator();
+
   const ExtensionSyncTraits traits_;
   ExtensionServiceInterface* const extension_service_;
   sync_api::UserShare* const user_share_;