Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(785)

Unified Diff: components/sync/driver/glue/sync_backend_registrar.cc

Issue 2501743005: [Sync] Remove SyncClient dep from SyncBackendRegistrar. (Closed)
Patch Set: Self-review. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/sync/driver/glue/sync_backend_registrar.cc
diff --git a/components/sync/driver/glue/sync_backend_registrar.cc b/components/sync/driver/glue/sync_backend_registrar.cc
index c78238bfd6f98c87e93640ca6a0cf88a04ff7fd9..4d73be4c0ece4ce52b101cdd6a8897876d0eaad7 100644
--- a/components/sync/driver/glue/sync_backend_registrar.cc
+++ b/components/sync/driver/glue/sync_backend_registrar.cc
@@ -11,22 +11,21 @@
#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) {
@@ -276,9 +275,9 @@ SyncBackendRegistrar::~SyncBackendRegistrar() {
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;
« no previous file with comments | « components/sync/driver/glue/sync_backend_registrar.h ('k') | components/sync/driver/glue/sync_backend_registrar_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698