| Index: components/password_manager/sync/browser/password_model_worker.cc
|
| diff --git a/components/password_manager/sync/browser/password_model_worker.cc b/components/password_manager/sync/browser/password_model_worker.cc
|
| index e081ff17a7addf1e2b89552323752d5b7bfd5866..91d17c883f50439c547f33cd8ad18acbe796b24f 100644
|
| --- a/components/password_manager/sync/browser/password_model_worker.cc
|
| +++ b/components/password_manager/sync/browser/password_model_worker.cc
|
| @@ -5,7 +5,7 @@
|
| #include "components/password_manager/sync/browser/password_model_worker.h"
|
|
|
| #include "base/bind.h"
|
| -#include "base/memory/ref_counted.h"
|
| +#include "base/callback.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "components/password_manager/core/browser/password_store.h"
|
| #include "components/sync/base/scoped_event_signal.h"
|
| @@ -24,18 +24,11 @@ void CallDoWorkAndSignalEvent(const syncer::WorkCallback& work,
|
| } // namespace
|
|
|
| PasswordModelWorker::PasswordModelWorker(
|
| - const scoped_refptr<password_manager::PasswordStore>& password_store,
|
| - syncer::WorkerLoopDestructionObserver* observer)
|
| - : syncer::ModelSafeWorker(observer), password_store_(password_store) {
|
| + const scoped_refptr<password_manager::PasswordStore>& password_store)
|
| + : password_store_(password_store) {
|
| DCHECK(password_store.get());
|
| }
|
|
|
| -void PasswordModelWorker::RegisterForLoopDestruction() {
|
| - base::AutoLock lock(password_store_lock_);
|
| - password_store_->ScheduleTask(base::Bind(
|
| - &PasswordModelWorker::RegisterForPasswordLoopDestruction, this));
|
| -}
|
| -
|
| syncer::SyncerError PasswordModelWorker::DoWorkAndWaitUntilDoneImpl(
|
| const syncer::WorkCallback& work) {
|
| syncer::SyncerError error = syncer::UNSET;
|
| @@ -71,10 +64,6 @@ syncer::ModelSafeGroup PasswordModelWorker::GetModelSafeGroup() {
|
|
|
| PasswordModelWorker::~PasswordModelWorker() {}
|
|
|
| -void PasswordModelWorker::RegisterForPasswordLoopDestruction() {
|
| - SetWorkingLoopToCurrent();
|
| -}
|
| -
|
| void PasswordModelWorker::RequestStop() {
|
| ModelSafeWorker::RequestStop();
|
|
|
|
|