Implement new SyncAPI and convert Preferences to it.

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 42d563adf11807f9adf357a67d7bd22416a60554..ba436d9680c8359dfa6170ce66cd803c1fb6a1a8 100644
--- a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
@@ -11,15 +11,16 @@
 #include "base/tracked_objects.h"
 #include "chrome/browser/sync/glue/preference_data_type_controller.h"
 #include "chrome/browser/sync/glue/change_processor_mock.h"
+#include "chrome/browser/sync/glue/model_associator_mock.h"
 #include "chrome/browser/sync/profile_sync_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
-#include "chrome/browser/sync/syncable_service_mock.h"
 #include "chrome/test/profile_mock.h"
 #include "content/browser/browser_thread.h"
 
-using browser_sync::PreferenceDataTypeController;
 using browser_sync::ChangeProcessorMock;
 using browser_sync::DataTypeController;
+using browser_sync::ModelAssociatorMock;
+using browser_sync::PreferenceDataTypeController;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
@@ -47,13 +48,12 @@ class PreferenceDataTypeControllerTest : public testing::Test {
 
  protected:
   void SetStartExpectations() {
-    model_associator_.reset(new SyncableServiceMock());
+    model_associator_ = new ModelAssociatorMock();
     change_processor_ = new ChangeProcessorMock();
     EXPECT_CALL(*profile_sync_factory_, CreatePreferenceSyncComponents(_, _)).
         WillOnce(Return(
-            ProfileSyncFactory::SyncComponents(model_associator_.get(),
+            ProfileSyncFactory::SyncComponents(model_associator_,
                                                change_processor_)));
-    EXPECT_CALL(*model_associator_, SetupSync(_,_)).Times(1);
   }
 
   void SetAssociateExpectations() {
@@ -80,7 +80,7 @@ class PreferenceDataTypeControllerTest : public testing::Test {
   scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_;
   ProfileMock profile_;
   ProfileSyncServiceMock service_;
-  scoped_ptr<SyncableServiceMock> model_associator_;
+  ModelAssociatorMock* model_associator_;
   ChangeProcessorMock* change_processor_;
   StartCallback start_callback_;
 };