Refactor preference syncing.

chrome/browser/sync/glue/model_associator_mock.h

Index: chrome/browser/sync/glue/model_associator_mock.h
diff --git a/chrome/browser/sync/glue/model_associator_mock.h b/chrome/browser/sync/glue/model_associator_mock.h
index 51cb7c4512110f95b599530f8e4c894379e5c041..27cdd230d5bd179f8af49e355d21ade0384d1783 100644
--- a/chrome/browser/sync/glue/model_associator_mock.h
+++ b/chrome/browser/sync/glue/model_associator_mock.h
@@ -23,6 +23,26 @@ class ModelAssociatorMock : public AssociatorInterface {
   MOCK_METHOD0(CryptoReadyIfNecessary, bool());
 };
 
+// Refcounted.
+class NewModelAssociatorMock : public NewAssociatorInterface {
+ public:
+  NewModelAssociatorMock();
+  virtual ~NewModelAssociatorMock();
+
+  MOCK_METHOD0(AssociateModels, bool());
+  MOCK_METHOD0(DisassociateModels, bool());
+  MOCK_METHOD1(SyncModelHasUserCreatedNodes, bool(bool* has_nodes));
+  MOCK_METHOD0(AbortAssociation, void());
+  MOCK_METHOD0(CryptoReadyIfNecessary, bool());
+  MOCK_METHOD0(model_type, syncable::ModelType());
+  MOCK_METHOD1(set_change_processor, void(ChangeProcessor* processor));
+  MOCK_METHOD0(change_processor, ChangeProcessor*());
+  MOCK_METHOD3(ApplyChangesFromSync, void(
+      const sync_api::BaseTransaction* trans,
+      const sync_api::SyncManager::ChangeRecord* changes,
+      int change_count));
+};
+
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_MOCK_H__