Refactor preference syncing.

chrome/browser/sync/glue/theme_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
index 4d2a1ad23c32519b4a5407fbf7b7a848487bd0ed..e91d1d020aeed3c96ef230f594aab5e82aa758cf 100644
--- a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
@@ -19,7 +19,7 @@
 using browser_sync::ThemeDataTypeController;
 using browser_sync::ChangeProcessorMock;
 using browser_sync::DataTypeController;
-using browser_sync::ModelAssociatorMock;
+using browser_sync::NewModelAssociatorMock;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
@@ -46,7 +46,7 @@ class ThemeDataTypeControllerTest : public testing::Test {
 
  protected:
   void SetStartExpectations() {
-    model_associator_ = new ModelAssociatorMock();
+    model_associator_ = new NewModelAssociatorMock();
     change_processor_ = new ChangeProcessorMock();
     EXPECT_CALL(*profile_sync_factory_, CreateThemeSyncComponents(_, _)).
         WillOnce(Return(ProfileSyncFactory::SyncComponents(model_associator_,
@@ -77,7 +77,7 @@ class ThemeDataTypeControllerTest : 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_;
 };