Refactor preference syncing.

chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
index af20af5d8a1d294ce0a6894b328730687b7fc568..d69eb5809a6dd67fbe210b6c382c016508273abc 100644
--- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
@@ -25,7 +25,7 @@
 using browser_sync::BookmarkDataTypeController;
 using browser_sync::ChangeProcessorMock;
 using browser_sync::DataTypeController;
-using browser_sync::ModelAssociatorMock;
+using browser_sync::NewModelAssociatorMock;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
@@ -50,7 +50,7 @@ class BookmarkDataTypeControllerTest : public testing::Test {
       : ui_thread_(BrowserThread::UI, &message_loop_) {}
 
   virtual void SetUp() {
-    model_associator_ = new ModelAssociatorMock();
+    model_associator_ = new NewModelAssociatorMock();
     change_processor_ = new ChangeProcessorMock();
     profile_sync_factory_.reset(
         new ProfileSyncFactoryMock(model_associator_,
@@ -91,7 +91,7 @@ class BookmarkDataTypeControllerTest : public testing::Test {
   ProfileMock profile_;
   BookmarkModelMock bookmark_model_;
   ProfileSyncServiceMock service_;
-  ModelAssociatorMock* model_associator_;
+  NewModelAssociatorMock* model_associator_;
   ChangeProcessorMock* change_processor_;
   StartCallback start_callback_;
 };