Refactor preference syncing.

chrome/browser/sync/profile_sync_factory_mock.cc

Index: chrome/browser/sync/profile_sync_factory_mock.cc
diff --git a/chrome/browser/sync/profile_sync_factory_mock.cc b/chrome/browser/sync/profile_sync_factory_mock.cc
index 2d9210015909d24b8c0544956af8580816b7ef6c..8d53aa3702aea7abd59d39e5948e268e8191b9ad 100644
--- a/chrome/browser/sync/profile_sync_factory_mock.cc
+++ b/chrome/browser/sync/profile_sync_factory_mock.cc
@@ -6,7 +6,7 @@
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/profile_sync_factory_mock.h"
 
-using browser_sync::AssociatorInterface;
+using browser_sync::NewAssociatorInterface;
 using browser_sync::ChangeProcessor;
 using testing::_;
 using testing::InvokeWithoutArgs;
@@ -14,7 +14,7 @@ using testing::InvokeWithoutArgs;
 ProfileSyncFactoryMock::ProfileSyncFactoryMock() {}
 
 ProfileSyncFactoryMock::ProfileSyncFactoryMock(
-    AssociatorInterface* bookmark_model_associator,
+    NewAssociatorInterface* bookmark_model_associator,
     ChangeProcessor* bookmark_change_processor)
     : bookmark_model_associator_(bookmark_model_associator),
       bookmark_change_processor_(bookmark_change_processor) {
@@ -29,6 +29,6 @@ ProfileSyncFactoryMock::~ProfileSyncFactoryMock() {}
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryMock::MakeBookmarkSyncComponents() {
-  return SyncComponents(bookmark_model_associator_.release(),
+  return SyncComponents(bookmark_model_associator_,
                         bookmark_change_processor_.release());
 }