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

chrome/browser/sync/glue/history_model_worker.cc

Index: chrome/browser/sync/glue/history_model_worker.cc
diff --git a/chrome/browser/sync/glue/history_model_worker.cc b/chrome/browser/sync/glue/history_model_worker.cc
index 5ad866431cccab9db5b76624a9b2390697b2506a..02b4863a5b6e526808cb5d61bbe8e284682b9fc6 100644
--- a/chrome/browser/sync/glue/history_model_worker.cc
+++ b/chrome/browser/sync/glue/history_model_worker.cc
@@ -13,15 +13,18 @@
 using base::WaitableEvent;
 
 namespace browser_sync {
-
+using sessions::UnrecoverableErrorInfo;
 class WorkerTask : public HistoryDBTask {
  public:
-  WorkerTask(Callback0::Type* work, WaitableEvent* done)
-    : work_(work), done_(done) {}
+  WorkerTask(
+      Callback1<sessions::UnrecoverableErrorInfo*>::Type* work,
+      WaitableEvent* done,
+      UnrecoverableErrorInfo* error_info)
+    : work_(work), done_(done), error_info_(error_info) {}
 
   virtual bool RunOnDBThread(history::HistoryBackend* backend,
                              history::HistoryDatabase* db) {
-    work_->Run();
+    work_->Run(error_info_);
     done_->Signal();
     return true;
   }
@@ -31,8 +34,9 @@ class WorkerTask : public HistoryDBTask {
   virtual void DoneRunOnMainThread() {}
 
  protected:
-  Callback0::Type* work_;
+  Callback1<UnrecoverableErrorInfo*>::Type* work_;
   WaitableEvent* done_;
+  UnrecoverableErrorInfo* error_info_;
 };
 
 
@@ -44,11 +48,14 @@ HistoryModelWorker::HistoryModelWorker(HistoryService* history_service)
 HistoryModelWorker::~HistoryModelWorker() {
 }
 
-void HistoryModelWorker::DoWorkAndWaitUntilDone(Callback0::Type* work) {
+UnrecoverableErrorInfo HistoryModelWorker::DoWorkAndWaitUntilDone(
+    Callback1<sessions::UnrecoverableErrorInfo*>::Type* work) {
   WaitableEvent done(false, false);
-  scoped_refptr<WorkerTask> task(new WorkerTask(work, &done));
+  UnrecoverableErrorInfo error_info;
+  scoped_refptr<WorkerTask> task(new WorkerTask(work, &done, &error_info));
   history_service_->ScheduleDBTask(task.get(), &cancelable_consumer_);
   done.Wait();
+  return error_info;
 }
 
 ModelSafeGroup HistoryModelWorker::GetModelSafeGroup() {