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

chrome/browser/sync/engine/model_safe_worker.h

Index: chrome/browser/sync/engine/model_safe_worker.h
diff --git a/chrome/browser/sync/engine/model_safe_worker.h b/chrome/browser/sync/engine/model_safe_worker.h
index f4829ec4b58140f9d37d57541ff0bb7ac4d25c38..8e760a1fcb25b75e06270defe39aa557d3d41e85 100644
--- a/chrome/browser/sync/engine/model_safe_worker.h
+++ b/chrome/browser/sync/engine/model_safe_worker.h
@@ -13,6 +13,7 @@
 #include "base/callback_old.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/sync/syncable/model_type.h"
+#include "chrome/browser/sync/sessions/unrecoverable_error_info.h"
 
 namespace base {
 class DictionaryValue;
@@ -52,7 +53,8 @@ class ModelSafeWorker : public base::RefCountedThreadSafe<ModelSafeWorker> {
   // Any time the Syncer performs model modifications (e.g employing a
   // WriteTransaction), it should be done by this method to ensure it is done
   // from a model-safe thread.
-  virtual void DoWorkAndWaitUntilDone(Callback0::Type* work);
+  virtual sessions::UnrecoverableErrorInfo DoWorkAndWaitUntilDone(
+      Callback1<sessions::UnrecoverableErrorInfo*>::Type* work);

[akalin, 2011/10/25 03:20:06]

probably easier to provide a typedef for the callback, like:

typedef Callback1<...>::Type WorkCallback;

[lipalani1, 2011/10/26 00:12:13]

Done.

 
   virtual ModelSafeGroup GetModelSafeGroup();