[Sync] Remove SyncableServiceAdapter.

chrome/browser/sync/profile_sync_service_preference_unittest.cc

Index: chrome/browser/sync/profile_sync_service_preference_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
index 14ee6727355ef5f873e423b64ec0812f918f8669..6e1420310ec3df5326b4cb6b49e2da9e08a7fe9d 100644
--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
@@ -21,8 +21,7 @@
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/api/sync_data.h"
 #include "chrome/browser/sync/glue/generic_change_processor.h"
-#include "chrome/browser/sync/glue/preference_data_type_controller.h"
-#include "chrome/browser/sync/glue/syncable_service_adapter.h"
+#include "chrome/browser/sync/glue/ui_data_type_controller.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/internal_api/change_record.h"
 #include "chrome/browser/sync/internal_api/read_node.h"
@@ -42,9 +41,8 @@
 
 using base::JSONReader;
 using browser_sync::GenericChangeProcessor;
-using browser_sync::PreferenceDataTypeController;
+using browser_sync::UIDataTypeController;
 using browser_sync::SyncBackendHost;
-using browser_sync::SyncableServiceAdapter;
 using sync_api::ChangeRecord;
 using testing::_;
 using testing::Invoke;
@@ -52,19 +50,10 @@ using testing::Return;
 
 typedef std::map<const std::string, const Value*> PreferenceValues;
 
-ACTION_P5(BuildPrefSyncComponents, profile_sync_service, pref_sync_service,
-    data_type_controller, model_associator_ptr, change_processor_ptr) {
-  sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
-  *change_processor_ptr = new GenericChangeProcessor(
-      data_type_controller,
-      pref_sync_service->AsWeakPtr(),
-      user_share);
-  *model_associator_ptr = new browser_sync::SyncableServiceAdapter(
-      syncable::PREFERENCES,
-      pref_sync_service,
-      *change_processor_ptr);
-  return ProfileSyncComponentsFactory::SyncComponents(*model_associator_ptr,
-                                                      *change_processor_ptr);
+ACTION_P(CreateAndSaveChangeProcessor, change_processor) {
+  sync_api::UserShare* user_share = arg0->GetUserShare();
+  *change_processor = new GenericChangeProcessor(arg1, arg2, user_share);
+  return *change_processor;
 }
 
 // TODO(zea): Refactor to remove the ProfileSyncService usage.
@@ -136,22 +125,17 @@ class ProfileSyncServicePreferenceTest
         prefs_->GetSyncableService());
     if (!pref_sync_service_)
       return false;
-
-    dtc_ = new PreferenceDataTypeController(factory,
-                                            profile_.get(),
-                                            service_.get());
-
-    EXPECT_CALL(*factory, CreatePreferenceSyncComponents(_, _)).
-        WillOnce(BuildPrefSyncComponents(service_.get(),
-                                         pref_sync_service_,
-                                         dtc_,
-                                         &model_associator_,
-                                         &change_processor_));
+    EXPECT_CALL(*factory, GetSyncableServiceForType(syncable::PREFERENCES)).
+        WillOnce(Return(pref_sync_service_->AsWeakPtr()));
 
     EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).
         WillOnce(ReturnNewDataTypeManager());
-
-
+    dtc_ = new UIDataTypeController(syncable::PREFERENCES,
+                                    factory,
+                                    profile_.get(),
+                                    service_.get());
+     EXPECT_CALL(*factory, CreateGenericChangeProcessor(_, _, _)).
+         WillOnce(CreateAndSaveChangeProcessor(&change_processor_));
     service_->RegisterDataTypeController(dtc_);
     profile_->GetTokenService()->IssueAuthTokenForTest(
         GaiaConstants::kSyncService, "token");
@@ -209,9 +193,8 @@ class ProfileSyncServicePreferenceTest
   scoped_ptr<TestingProfile> profile_;
   TestingPrefService* prefs_;
 
-  PreferenceDataTypeController* dtc_;
+  UIDataTypeController* dtc_;
   PrefModelAssociator* pref_sync_service_;
-  SyncableServiceAdapter* model_associator_;
   GenericChangeProcessor* change_processor_;
 
   std::string example_url0_;