[Sync] Remove SyncClient dep from SyncBackendRegistrar.

components/sync/driver/glue/sync_backend_registrar.cc

 // Copyright 2012 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/glue/sync_backend_registrar.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "components/sync/driver/change_processor.h"
-#include "components/sync/driver/sync_client.h"
 #include "components/sync/syncable/user_share.h"
 
 namespace syncer {
 
-SyncBackendRegistrar::SyncBackendRegistrar(const std::string& name,
-                                           SyncClient* sync_client)
-    : name_(name), sync_client_(sync_client) {
-  DCHECK(sync_client_);
-
-  MaybeAddWorker(GROUP_DB);
-  MaybeAddWorker(GROUP_FILE);
-  MaybeAddWorker(GROUP_UI);
-  MaybeAddWorker(GROUP_PASSIVE);
-  MaybeAddWorker(GROUP_HISTORY);
-  MaybeAddWorker(GROUP_PASSWORD);
+SyncBackendRegistrar::SyncBackendRegistrar(
+    const std::string& name,
+    ModelSafeWorkerFactory worker_factory)
+    : name_(name) {
+  DCHECK(!worker_factory.is_null());
+  MaybeAddWorker(worker_factory, GROUP_DB);
+  MaybeAddWorker(worker_factory, GROUP_FILE);
+  MaybeAddWorker(worker_factory, GROUP_UI);
+  MaybeAddWorker(worker_factory, GROUP_PASSIVE);
+  MaybeAddWorker(worker_factory, GROUP_HISTORY);
+  MaybeAddWorker(worker_factory, GROUP_PASSWORD);
 }
 
 void SyncBackendRegistrar::RegisterNonBlockingType(ModelType type) {
   DCHECK(ui_thread_checker_.CalledOnValidThread());
   base::AutoLock lock(lock_);
   // There may have been a previously successful sync of a type when passive,
   // which is now NonBlocking. We're not sure what order these two sets of types
   // are being registered in, so guard against SetInitialTypes(...) having been
   // already called by undoing everything to these types.
   if (routing_info_.find(type) != routing_info_.end() &&
@@ skipping 229 matching lines @@
   auto it = workers_.find(group);
   DCHECK(it != workers_.end());
   return it->second->IsOnModelThread();
 }
 
 SyncBackendRegistrar::~SyncBackendRegistrar() {
   // All data types should have been deactivated by now.
   DCHECK(processors_.empty());
 }
 
-void SyncBackendRegistrar::MaybeAddWorker(ModelSafeGroup group) {
-  const scoped_refptr<ModelSafeWorker> worker =
-      sync_client_->CreateModelWorkerForGroup(group);
+void SyncBackendRegistrar::MaybeAddWorker(ModelSafeWorkerFactory worker_factory,
+                                          ModelSafeGroup group) {
+  scoped_refptr<ModelSafeWorker> worker = worker_factory.Run(group);
   if (worker) {
     DCHECK(workers_.find(group) == workers_.end());
     workers_[group] = worker;
   }
 }
 
 ModelSafeGroup SyncBackendRegistrar::GetInitialGroupForType(
     ModelType type) const {
   return non_blocking_types_.Has(type) ? GROUP_NON_BLOCKING : GROUP_PASSIVE;
 }
 
 }  // namespace syncer