Introduce the plumbing necessary to report Unrecoverable error from model safe workers.

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 8aa4956f2883b4b38ac83b499678968c2de74281..53f6c7c3ce91af4d8138a20727819c9fcf9b441d 100644
--- a/chrome/browser/sync/glue/password_model_worker.h
+++ b/chrome/browser/sync/glue/password_model_worker.h
@@ -7,9 +7,11 @@
 #pragma once
 
 #include "chrome/browser/sync/engine/model_safe_worker.h"
+#include "chrome/browser/sync/util/unrecoverable_error_info.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 
 class PasswordStore;
@@ -29,12 +31,15 @@ class PasswordModelWorker : public browser_sync::ModelSafeWorker {
   virtual ~PasswordModelWorker();
 
   // ModelSafeWorker implementation. Called on syncapi SyncerThread.
-  virtual void DoWorkAndWaitUntilDone(Callback0::Type* work);
-  virtual ModelSafeGroup GetModelSafeGroup();
+  virtual UnrecoverableErrorInfo DoWorkAndWaitUntilDone(
+      const WorkCallback& work) OVERRIDE;
+  virtual ModelSafeGroup GetModelSafeGroup() OVERRIDE;
 
  private:
-  void CallDoWorkAndSignalTask(Callback0::Type* work,
-                               base::WaitableEvent* done);
+  void CallDoWorkAndSignalTask(
+    const WorkCallback& work,
+    base::WaitableEvent* done,
+    UnrecoverableErrorInfo* error_info);
 
   scoped_refptr<PasswordStore> password_store_;
   DISALLOW_COPY_AND_ASSIGN(PasswordModelWorker);