[Sync] Replace ProfileSyncComponentsFactory with SyncClient

components/sync_driver/shared_change_processor.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/shared_change_processor.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "components/sync_driver/generic_change_processor.h"
 #include "components/sync_driver/generic_change_processor_factory.h"
-#include "components/sync_driver/sync_api_component_factory.h"
+#include "components/sync_driver/sync_client.h"
 #include "sync/api/sync_change.h"
+#include "sync/api/syncable_service.h"
 
 using base::AutoLock;
 
 namespace syncer {
 class AttachmentService;
 }
 
 namespace sync_driver {
 
 SharedChangeProcessor::SharedChangeProcessor()
@@ skipping 18 matching lines @@
                                             generic_change_processor_)) {
         NOTREACHED();
       }
     }
   } else {
     DCHECK(!generic_change_processor_);
   }
 }
 
 base::WeakPtr<syncer::SyncableService> SharedChangeProcessor::Connect(
-    SyncApiComponentFactory* sync_factory,
+    SyncClient* sync_client,
     GenericChangeProcessorFactory* processor_factory,
     syncer::UserShare* user_share,
     DataTypeErrorHandler* error_handler,
     syncer::ModelType type,
     const base::WeakPtr<syncer::SyncMergeResult>& merge_result) {
-  DCHECK(sync_factory);
+  DCHECK(sync_client);
   DCHECK(error_handler);
   DCHECK_NE(type, syncer::UNSPECIFIED);
   backend_task_runner_ = base::ThreadTaskRunnerHandle::Get();
   AutoLock lock(monitor_lock_);
   if (disconnected_)
     return base::WeakPtr<syncer::SyncableService>();
   type_ = type;
   error_handler_ = error_handler;
   base::WeakPtr<syncer::SyncableService> local_service =
-      sync_factory->GetSyncableServiceForType(type);
+      sync_client->GetSyncableServiceForType(type);
   if (!local_service.get()) {
     LOG(WARNING) << "SyncableService destroyed before DTC was stopped.";
     disconnected_ = true;
     return base::WeakPtr<syncer::SyncableService>();
   }
 
   generic_change_processor_ =
       processor_factory->CreateGenericChangeProcessor(type,
                                                       user_share,
                                                       error_handler,
                                                       local_service,
                                                       merge_result,
-                                                      sync_factory).release();
+                                                      sync_client).release();
   // If available, propagate attachment service to the syncable service.
   scoped_ptr<syncer::AttachmentService> attachment_service =
       generic_change_processor_->GetAttachmentService();
   if (attachment_service) {
     local_service->SetAttachmentService(attachment_service.Pass());
   }
   return local_service;
 }
 
 bool SharedChangeProcessor::Disconnect() {
@@ skipping 122 matching lines @@
     return error_handler_->CreateAndUploadError(location, message, type_);
   } else {
     return syncer::SyncError(location,
                              syncer::SyncError::DATATYPE_ERROR,
                              message,
                              type_);
   }
 }
 
 }  // namespace sync_driver