[Sync] Replace ProfileSyncComponentsFactory with SyncClient

chrome/browser/sync/glue/frontend_data_type_controller.cc

Index: chrome/browser/sync/glue/frontend_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.cc b/chrome/browser/sync/glue/frontend_data_type_controller.cc
index 1a82bafbc99569d620b309f155c0cc249455b315..e35a19e66a0feedbe913e4bc1ddc7074704f6758 100644
--- a/chrome/browser/sync/glue/frontend_data_type_controller.cc
+++ b/chrome/browser/sync/glue/frontend_data_type_controller.cc
@@ -6,12 +6,11 @@
 
 #include "base/logging.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h"
-#include "chrome/browser/sync/profile_sync_service.h"
 #include "components/sync_driver/change_processor.h"
 #include "components/sync_driver/model_associator.h"
-#include "components/sync_driver/profile_sync_components_factory.h"
+#include "components/sync_driver/sync_client.h"
+#include "components/sync_driver/sync_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/sync_error.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ -21,25 +20,15 @@ using content::BrowserThread;
 
 namespace browser_sync {
 
-// TODO(tim): Legacy controllers are being left behind in componentization
-// effort for now, hence passing null DisableTypeCallback and still having
-// a dependency on ProfileSyncService.  That dep can probably be removed
-// without too much work.
 FrontendDataTypeController::FrontendDataTypeController(
     scoped_refptr<base::SingleThreadTaskRunner> ui_thread,
     const base::Closure& error_callback,
-    ProfileSyncComponentsFactory* profile_sync_factory,
-    Profile* profile,
-    ProfileSyncService* sync_service)
+    sync_driver::SyncClient* sync_client)
     : DataTypeController(ui_thread, error_callback),
-      profile_sync_factory_(profile_sync_factory),
-      profile_(profile),
-      sync_service_(sync_service),
+      sync_client_(sync_client),
       state_(NOT_RUNNING) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  DCHECK(profile_sync_factory);
-  DCHECK(profile);
-  DCHECK(sync_service);
+  DCHECK(sync_client);
 }
 
 void FrontendDataTypeController::LoadModels(
@@ -109,7 +98,7 @@ void FrontendDataTypeController::Stop() {
 
   CleanUpState();
 
-  sync_service_->DeactivateDataType(type());
+  sync_client_->GetSyncService()->DeactivateDataType(type());
 
   if (model_associator()) {
     syncer::SyncError error;  // Not used.
@@ -152,9 +141,7 @@ void FrontendDataTypeController::OnSingleDataTypeUnrecoverableError(
 
 FrontendDataTypeController::FrontendDataTypeController()
     : DataTypeController(base::ThreadTaskRunnerHandle::Get(), base::Closure()),
-      profile_sync_factory_(NULL),
-      profile_(NULL),
-      sync_service_(NULL),
+      sync_client_(NULL),
       state_(NOT_RUNNING) {
 }