Refactor preference syncing.

chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
index 4df8b3f28c5479d14fa6570db4c1aa00d116cba9..9b14d661e0df6573df19cdcea7e2544f3397a55f 100644
--- a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
@@ -20,7 +20,7 @@
 using browser_sync::PreferenceDataTypeController;
 using browser_sync::ChangeProcessorMock;
 using browser_sync::DataTypeController;
-using browser_sync::ModelAssociatorMock;
+using browser_sync::NewModelAssociatorMock;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
@@ -44,15 +44,15 @@ class PreferenceDataTypeControllerTest : public testing::Test {
         new PreferenceDataTypeController(profile_sync_factory_.get(),
                                          &profile_,
                                          &service_);
+    model_associator_ = new NewModelAssociatorMock();
+    preference_dtc_->set_model_associator(model_associator_);
   }
 
  protected:
   void SetStartExpectations() {
-    model_associator_ = new ModelAssociatorMock();
     change_processor_ = new ChangeProcessorMock();
-    EXPECT_CALL(*profile_sync_factory_, CreatePreferenceSyncComponents(_, _)).
-        WillOnce(Return(ProfileSyncFactory::SyncComponents(model_associator_,
-                                                           change_processor_)));
+    EXPECT_CALL(*model_associator_, change_processor()).
+        WillOnce(Return(change_processor_));
   }
 
   void SetAssociateExpectations() {
@@ -79,7 +79,7 @@ class PreferenceDataTypeControllerTest : public testing::Test {
   scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_;
   ProfileMock profile_;
   ProfileSyncServiceMock service_;
-  ModelAssociatorMock* model_associator_;
+  NewModelAssociatorMock* model_associator_;
   ChangeProcessorMock* change_processor_;
   StartCallback start_callback_;
 };