Refactor preference syncing.

chrome/browser/sync/glue/theme_model_associator.h

Index: chrome/browser/sync/glue/theme_model_associator.h
diff --git a/chrome/browser/sync/glue/theme_model_associator.h b/chrome/browser/sync/glue/theme_model_associator.h
index e76b5bd482e50d61ee320e92ccace27f3fd26cce..19e096d977a38aabafec72107b9a0521da301500 100644
--- a/chrome/browser/sync/glue/theme_model_associator.h
+++ b/chrome/browser/sync/glue/theme_model_associator.h
@@ -18,13 +18,10 @@ class UnrecoverableErrorHandler;
 
 // Contains all logic for associating the Chrome themes model and the
 // sync themes model.
-class ThemeModelAssociator : public AssociatorInterface {
+class ThemeModelAssociator
+    : public NewAssociatorInterface {
  public:
   explicit ThemeModelAssociator(ProfileSyncService* sync_service);
-  virtual ~ThemeModelAssociator();
-
-  // Used by profile_sync_test_util.h.
-  static syncable::ModelType model_type() { return syncable::THEMES; }
 
   // AssociatorInterface implementation.
   virtual bool AssociateModels();
@@ -36,6 +33,9 @@ class ThemeModelAssociator : public AssociatorInterface {
   }
   virtual bool CryptoReadyIfNecessary();
 
+ protected:
+  virtual ~ThemeModelAssociator();
+
  private:
   ProfileSyncService* sync_service_;