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

chrome/browser/sync/glue/browser_thread_model_worker.h

Index: chrome/browser/sync/glue/browser_thread_model_worker.h
diff --git a/chrome/browser/sync/glue/browser_thread_model_worker.h b/chrome/browser/sync/glue/browser_thread_model_worker.h
index c1c0730795d5368ded4f33abe75c6864393f6aef..487e56cddb344de69793098c307655f29d2791bc 100644
--- a/chrome/browser/sync/glue/browser_thread_model_worker.h
+++ b/chrome/browser/sync/glue/browser_thread_model_worker.h
@@ -10,6 +10,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
+#include "chrome/browser/sync/util/unrecoverable_error_info.h"
 #include "content/browser/browser_thread.h"
 
 namespace base {
@@ -27,15 +28,18 @@ class BrowserThreadModelWorker : public browser_sync::ModelSafeWorker {
   virtual ~BrowserThreadModelWorker();
 
   // ModelSafeWorker implementation. Called on the sync thread.
-  virtual void DoWorkAndWaitUntilDone(Callback0::Type* work);
-  virtual ModelSafeGroup GetModelSafeGroup();
+  virtual UnrecoverableErrorInfo DoWorkAndWaitUntilDone(
+      const WorkCallback& work) OVERRIDE;
+  virtual ModelSafeGroup GetModelSafeGroup() OVERRIDE;
 
  protected:
   // Marked pure virtual so subclasses have to override, but there is
   // an implementation that subclasses should use.  This is so that
   // (subclass)::CallDoWorkAndSignalTask shows up in callstacks.
   virtual void CallDoWorkAndSignalTask(
-      Callback0::Type* work, base::WaitableEvent* done) = 0;
+      const WorkCallback& work,
+      base::WaitableEvent* done,
+      UnrecoverableErrorInfo* error_info) = 0;
 
  private:
   BrowserThread::ID thread_;
@@ -54,7 +58,9 @@ class DatabaseModelWorker : public BrowserThreadModelWorker {
 
  protected:
   virtual void CallDoWorkAndSignalTask(
-      Callback0::Type* work, base::WaitableEvent* done) OVERRIDE;
+      const WorkCallback& work,
+      base::WaitableEvent* done,
+      UnrecoverableErrorInfo* error_info) OVERRIDE;
 };
 
 class FileModelWorker : public BrowserThreadModelWorker {
@@ -64,7 +70,9 @@ class FileModelWorker : public BrowserThreadModelWorker {
 
  protected:
   virtual void CallDoWorkAndSignalTask(
-      Callback0::Type* work, base::WaitableEvent* done) OVERRIDE;
+      const WorkCallback& work,
+      base::WaitableEvent* done,
+      UnrecoverableErrorInfo* error_info) OVERRIDE;
 };
 
 }  // namespace browser_sync