[Sync] Remove SyncableServiceAdapter.

chrome/browser/sync/profile_sync_service_preference_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/location.h"
 #include "base/stl_util.h"
 #include "base/string_piece.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service.h"
 #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"
 #include "chrome/browser/sync/internal_api/read_transaction.h"
 #include "chrome/browser/sync/internal_api/write_node.h"
 #include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 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;
 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.
 class ProfileSyncServicePreferenceTest
     : public AbstractProfileSyncServiceTest {
  public:
   int64 SetSyncedValue(const std::string& name, const Value& value) {
     sync_api::WriteTransaction trans(FROM_HERE, service_->GetUserShare());
     sync_api::ReadNode root(&trans);
     if (!root.InitByTagLookup(
@@ skipping 51 matching lines @@
         factory,
         profile_.get(),
         signin,
         ProfileSyncService::AUTO_START,
         false,
         callback));
     pref_sync_service_ = reinterpret_cast<PrefModelAssociator*>(
         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");
 
     service_->Initialize();
     MessageLoop::current()->Run();
     return true;
   }
 
   const Value& GetPreferenceValue(const std::string& name) {
@@ skipping 37 matching lines @@
   std::string ValueString(const Value& value) {
     std::string serialized;
     JSONStringValueSerializer json(&serialized);
     json.Serialize(value);
     return serialized;
   }
 
   scoped_ptr<TestingProfile> profile_;
   TestingPrefService* prefs_;
 
-  PreferenceDataTypeController* dtc_;
+  UIDataTypeController* dtc_;
   PrefModelAssociator* pref_sync_service_;
-  SyncableServiceAdapter* model_associator_;
   GenericChangeProcessor* change_processor_;
 
   std::string example_url0_;
   std::string example_url1_;
   std::string example_url2_;
   std::string not_synced_preference_name_;
   std::string not_synced_preference_default_value_;
   std::string non_default_charset_value_;
 };
 
@@ skipping 360 matching lines @@
   EXPECT_FALSE(pref->IsDefaultValue());
   // There should be no synced value.
   EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
   // Switch kHomePage back to unmanaged.
   profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);
   // The original value should be picked up.
   EXPECT_TRUE(pref->IsDefaultValue());
   // There should still be no synced value.
   EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
 }