Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

components/sync_driver/generic_change_processor_unittest.cc

 // Copyright 2014 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 "components/sync_driver/generic_change_processor.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 67 matching lines @@
   return &attachment_id_lists_;
 }
 
 // MockSyncApiComponentFactory needed to initialize GenericChangeProcessor and
 // pass MockAttachmentService to it.
 class MockSyncApiComponentFactory : public SyncApiComponentFactory {
  public:
   MockSyncApiComponentFactory() {}
 
   // SyncApiComponentFactory implementation.
-  void RegisterDataTypes(
-      const RegisterDataTypesMethod& register_platform_types_method) override {}
+  void RegisterDataTypes(sync_driver::SyncClient* sync_client) override {}
   sync_driver::DataTypeManager* CreateDataTypeManager(
       const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
           debug_info_listener,
       const sync_driver::DataTypeController::TypeMap* controllers,
       const sync_driver::DataTypeEncryptionHandler* encryption_handler,
       browser_sync::SyncBackendHost* backend,
       sync_driver::DataTypeManagerObserver* observer) override{
     return nullptr;
   };
   browser_sync::SyncBackendHost* CreateSyncBackendHost(
       const std::string& name,
+      SyncClient* sync_client,
       invalidation::InvalidationService* invalidator,
       const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
       const base::FilePath& sync_folder) override {
     return nullptr;
   }
   scoped_ptr<sync_driver::LocalDeviceInfoProvider>
       CreateLocalDeviceInfoProvider() override { return nullptr; }
   SyncComponents CreateBookmarkSyncComponents(
       sync_driver::SyncService* sync_service,
       sync_driver::DataTypeErrorHandler* error_handler) override {
@@ skipping 429 matching lines @@
   syncer::SyncDataList sync_data =
       change_processor()->GetAllSyncData(syncer::SESSIONS);
   ASSERT_EQ(sync_data.size(), 1U);
   ASSERT_EQ("session tag 2",
             sync_data[0].GetSpecifics().session().session_tag());
 }
 
 }  // namespace
 
 }  // namespace sync_driver