[Sync] Replace ProfileSyncComponentsFactory with SyncClient

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 7f7f9c1da935f0f4749966ecb286f6f9fee46d56..9abce593825befcaa5a684ee3644f4e57e6aa8e2 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -44,7 +44,6 @@
 #include "chrome/browser/sync/glue/sync_backend_host_impl.h"
 #include "chrome/browser/sync/glue/sync_start_util.h"
 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
-#include "chrome/browser/sync/profile_sync_components_factory_impl.h"
 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
 #include "chrome/browser/sync/sync_type_preference_provider.h"
@@ -73,6 +72,7 @@
 #include "components/sync_driver/device_info.h"
 #include "components/sync_driver/favicon_cache.h"
 #include "components/sync_driver/pref_names.h"
+#include "components/sync_driver/sync_api_component_factory.h"
 #include "components/sync_driver/sync_error_controller.h"
 #include "components/sync_driver/sync_stopped_reporter.h"
 #include "components/sync_driver/system_encryptor.h"
@@ -204,7 +204,7 @@ bool ShouldShowActionOnUI(
 }
 
 ProfileSyncService::ProfileSyncService(
-    scoped_ptr<ProfileSyncComponentsFactory> factory,
+    scoped_ptr<sync_driver::SyncApiComponentFactory> factory,
     Profile* profile,
     scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper,
     ProfileOAuth2TokenService* oauth2_token_service,
@@ -422,7 +422,7 @@ void ProfileSyncService::UnregisterAuthNotifications() {
 }
 
 void ProfileSyncService::RegisterDataTypeController(
-    DataTypeController* data_type_controller) {
+    sync_driver::DataTypeController* data_type_controller) {
   DCHECK_EQ(
       directory_data_type_controllers_.count(data_type_controller->type()),
       0U);
@@ -481,7 +481,7 @@ sync_driver::DeviceInfoTracker* ProfileSyncService::GetDeviceInfoTracker()
 }
 
 sync_driver::LocalDeviceInfoProvider*
-ProfileSyncService::GetLocalDeviceInfoProvider() {
+ProfileSyncService::GetLocalDeviceInfoProvider() const {
   return local_device_.get();
 }
 
@@ -699,7 +699,6 @@ void ProfileSyncService::StartUpSlowBackendComponents(
   backend_.reset(
       factory_->CreateSyncBackendHost(
           profile_->GetDebugName(),
-          profile_,
           invalidator,
           sync_prefs_.AsWeakPtr(),
           sync_folder));