[Sync] Refactor non-frontend DTC to handle new API properly.

chrome/browser/sync/profile_sync_service_autofill_unittest.cc

 // Copyright (c) 2011 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 <set>
 #include <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 161 matching lines @@
     return ProfileSyncFactory::SyncComponents(NULL, NULL);
   AutofillModelAssociator* model_associator =
       new AutofillModelAssociator(service, wd, service->profile());
   AutofillChangeProcessor* change_processor =
       new AutofillChangeProcessor(model_associator, wd,
                                   service->profile(), dtc);
   return ProfileSyncFactory::SyncComponents(model_associator,
                                             change_processor);
 }
 
+ACTION(MakeChangeProcessor) {
+  return new GenericChangeProcessor(arg0);
+}
+
 ACTION_P3(MakeAutofillProfileSyncComponents, service, wd, dtc) {
   EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (!BrowserThread::CurrentlyOn(BrowserThread::DB))
-    return ProfileSyncFactory::SyncComponents(NULL, NULL);
+    return NULL;
   AutofillProfileSyncableService* sync_service =
       new AutofillProfileSyncableService(wd, service->profile());
-  sync_api::UserShare* user_share = service->GetUserShare();
-  GenericChangeProcessor* change_processor =
-      new GenericChangeProcessor(sync_service, dtc, user_share);
-  SyncableServiceAdapter* sync_service_adapter =
-      new SyncableServiceAdapter(syncable::AUTOFILL_PROFILE,
-                                 sync_service,
-                                 change_processor);
-  return ProfileSyncFactory::SyncComponents(sync_service_adapter,
-                                            change_processor);
+  return sync_service;
 }
 
 class AbstractAutofillFactory {
  public:
-  virtual AutofillDataTypeController* CreateDataTypeController(
+  virtual DataTypeController* CreateDataTypeController(
       ProfileSyncFactory* factory,
       ProfileMock* profile,
       ProfileSyncService* service) = 0;
   virtual void SetExpectation(ProfileSyncFactoryMock* factory,
       ProfileSyncService* service,
       WebDatabase* wd,
       DataTypeController* dtc) = 0;
   virtual ~AbstractAutofillFactory() {}
 };
 
 class AutofillEntryFactory : public AbstractAutofillFactory {
  public:
-  browser_sync::AutofillDataTypeController* CreateDataTypeController(
+  browser_sync::DataTypeController* CreateDataTypeController(
       ProfileSyncFactory* factory,
       ProfileMock* profile,
       ProfileSyncService* service) {
-    return new AutofillDataTypeController(factory,
-        profile);
+    return new AutofillDataTypeController(factory, profile);
   }
 
   void SetExpectation(ProfileSyncFactoryMock* factory,
       ProfileSyncService* service,
       WebDatabase* wd,
       DataTypeController* dtc) {
     EXPECT_CALL(*factory, CreateAutofillSyncComponents(_,_,_)).
         WillOnce(MakeAutofillSyncComponents(service, wd, dtc));
   }
 };
 
 class AutofillProfileFactory : public AbstractAutofillFactory {
  public:
-  browser_sync::AutofillDataTypeController* CreateDataTypeController(
+  browser_sync::DataTypeController* CreateDataTypeController(
       ProfileSyncFactory* factory,
       ProfileMock* profile,
       ProfileSyncService* service) {
-    return new AutofillProfileDataTypeController(factory,
-        profile);
+    return new AutofillProfileDataTypeController(factory, profile);
   }
 
   void SetExpectation(ProfileSyncFactoryMock* factory,
       ProfileSyncService* service,
       WebDatabase* wd,
       DataTypeController* dtc) {
-    EXPECT_CALL(*factory, CreateAutofillProfileSyncComponents(_,_,_)).
+    EXPECT_CALL(*factory, CreateChangeProcessor(_)).
+        WillOnce(MakeChangeProcessor());
+    EXPECT_CALL(*factory, CreateAutofillProfileSyncComponents(_,_)).
         WillOnce(MakeAutofillProfileSyncComponents(service, wd, dtc));
   }
 };
 
 class PersonalDataManagerMock: public PersonalDataManager {
  public:
   static ProfileKeyedService* Build(Profile* profile) {
     return new PersonalDataManagerMock;
   }
 
@@ skipping 53 matching lines @@
 
   void StartSyncService(Task* task,
                         bool will_fail_association,
                         syncable::ModelType type) {
     AbstractAutofillFactory* factory = GetFactory(type);
     service_.reset(
         new TestProfileSyncService(&factory_, &profile_, "test_user", false,
                                    task));
     EXPECT_CALL(profile_, GetProfileSyncService()).WillRepeatedly(
         Return(service_.get()));
-    AutofillDataTypeController* data_type_controller =
+    DataTypeController* data_type_controller =
         factory->CreateDataTypeController(&factory_,
             &profile_,
             service_.get());
     SyncBackendHostForProfileSyncTest::
         SetDefaultExpectationsForWorkerCreation(&profile_);
 
     factory->SetExpectation(&factory_,
                             service_.get(),
                             web_database_.get(),
                             data_type_controller);
@@ skipping 763 matching lines @@
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutofillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   EXPECT_EQ(3U, sync_entries.size());
   EXPECT_EQ(0U, sync_profiles.size());
   for (size_t i = 0; i < sync_entries.size(); i++) {
     VLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
             << ", " << sync_entries[i].key().value();
   }
 }