Worker changes to prepare for lock-free shutdown.

chrome/browser/sync/glue/password_model_worker.h

Index: chrome/browser/sync/glue/password_model_worker.h
diff --git a/chrome/browser/sync/glue/password_model_worker.h b/chrome/browser/sync/glue/password_model_worker.h
index d074b87da86453859d1e95f1871e7cc9b4e5494a..463a64887e111bd712afe429888ace3aa111d754 100644
--- a/chrome/browser/sync/glue/password_model_worker.h
+++ b/chrome/browser/sync/glue/password_model_worker.h
@@ -25,14 +25,17 @@ namespace browser_sync {
 // which is the DB thread on Linux and Windows.
 class PasswordModelWorker : public syncer::ModelSafeWorker {
  public:
-  explicit PasswordModelWorker(
-      const scoped_refptr<PasswordStore>& password_store);
+  PasswordModelWorker(const scoped_refptr<PasswordStore>& password_store,
+                      syncer::WorkerObserver* observer);
 
   // syncer::ModelSafeWorker implementation. Called on syncapi SyncerThread.
-  virtual syncer::SyncerError DoWorkAndWaitUntilDone(
-      const syncer::WorkCallback& work) OVERRIDE;
+  virtual void RegisterForLoopDestruction() OVERRIDE;
   virtual syncer::ModelSafeGroup GetModelSafeGroup() OVERRIDE;
 
+ protected:
+  virtual syncer::SyncerError DoWorkAndWaitUntilDone(
+      const syncer::WorkCallback& work, base::WaitableEvent* done) OVERRIDE;
+
  private:
   virtual ~PasswordModelWorker();
 
@@ -41,6 +44,10 @@ class PasswordModelWorker : public syncer::ModelSafeWorker {
     base::WaitableEvent* done,
     syncer::SyncerError* error);
 
+  // Called on password thread to add PasswordModelWorker as destruction
+  // observer.
+  void RegisterForPasswordLoopDestruction();
+
   scoped_refptr<PasswordStore> password_store_;
   DISALLOW_COPY_AND_ASSIGN(PasswordModelWorker);
 };