diff options
| author | maxbogue <maxbogue@chromium.org> | 2015-10-22 10:34:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-22 17:34:50 +0000 |
| commit | 26624b136dbd72c7c1f2db0d34463cc6ea87f985 (patch) | |
| tree | 7a18ce92e73f57950d17e247e89a37617845832c /sync | |
| parent | 1f3ecb2eb8806026b81d6c5605aba11ea1d1859d (diff) | |
| download | chromium_src-26624b136dbd72c7c1f2db0d34463cc6ea87f985.zip chromium_src-26624b136dbd72c7c1f2db0d34463cc6ea87f985.tar.gz chromium_src-26624b136dbd72c7c1f2db0d34463cc6ea87f985.tar.bz2 | |
[Sync] Componentize SyncBackendRegistrar.
Adds SyncClient::CreateModelWorkerForGroup() for dependency
injection of the ModelSafeWorkers.
BUG=512066
Review URL: https://codereview.chromium.org/1394153004
Cr-Commit-Position: refs/heads/master@{#355567}
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/internal_api/public/engine/passive_model_worker.cc | 8 | ||||
| -rw-r--r-- | sync/internal_api/public/engine/passive_model_worker.h | 5 | ||||
| -rw-r--r-- | sync/tools/sync_client.cc | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sync/internal_api/public/engine/passive_model_worker.cc b/sync/internal_api/public/engine/passive_model_worker.cc index 3117194..c903929 100644 --- a/sync/internal_api/public/engine/passive_model_worker.cc +++ b/sync/internal_api/public/engine/passive_model_worker.cc @@ -8,11 +8,8 @@ namespace syncer { -PassiveModelWorker::PassiveModelWorker(const base::MessageLoop* sync_loop, - WorkerLoopDestructionObserver* observer) - : ModelSafeWorker(observer), - sync_loop_(sync_loop) { -} +PassiveModelWorker::PassiveModelWorker(WorkerLoopDestructionObserver* observer) + : ModelSafeWorker(observer) {} PassiveModelWorker::~PassiveModelWorker() { } @@ -23,7 +20,6 @@ void PassiveModelWorker::RegisterForLoopDestruction() { SyncerError PassiveModelWorker::DoWorkAndWaitUntilDoneImpl( const WorkCallback& work) { - DCHECK_EQ(base::MessageLoop::current(), sync_loop_); // Simply do the work on the current thread. return work.Run(); } diff --git a/sync/internal_api/public/engine/passive_model_worker.h b/sync/internal_api/public/engine/passive_model_worker.h index d7f076e..c2c1d98 100644 --- a/sync/internal_api/public/engine/passive_model_worker.h +++ b/sync/internal_api/public/engine/passive_model_worker.h @@ -18,8 +18,7 @@ namespace syncer { // thread). class SYNC_EXPORT PassiveModelWorker : public ModelSafeWorker { public: - explicit PassiveModelWorker(const base::MessageLoop* sync_loop, - WorkerLoopDestructionObserver* observer); + explicit PassiveModelWorker(WorkerLoopDestructionObserver* observer); // ModelSafeWorker implementation. Called on the sync thread. void RegisterForLoopDestruction() override; @@ -31,8 +30,6 @@ class SYNC_EXPORT PassiveModelWorker : public ModelSafeWorker { private: ~PassiveModelWorker() override; - const base::MessageLoop* const sync_loop_; - DISALLOW_COPY_AND_ASSIGN(PassiveModelWorker); }; diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index d8653ec..dbb1421 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -387,7 +387,7 @@ int SyncClientMain(int argc, char* argv[]) { routing_info[it.Get()] = GROUP_PASSIVE; } scoped_refptr<PassiveModelWorker> passive_model_safe_worker = - new PassiveModelWorker(&sync_loop, NULL); + new PassiveModelWorker(nullptr); std::vector<scoped_refptr<ModelSafeWorker> > workers; workers.push_back(passive_model_safe_worker); |