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

chrome/browser/sync/glue/ui_model_worker_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/sync/glue/ui_model_worker.h"
+#include "chrome/browser/sync/util/unrecoverable_error_info.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::UIModelWorker;
+using browser_sync::UnrecoverableErrorInfo;
 
 // Various boilerplate, primarily for the StopWithPendingWork test.
 
 class UIModelWorkerVisitor {
  public:
   UIModelWorkerVisitor(base::WaitableEvent* was_run,
                        bool quit_loop)
      : quit_loop_when_run_(quit_loop),
        was_run_(was_run) { }
   virtual ~UIModelWorkerVisitor() { }
 
-  virtual void DoWork() {
+  virtual UnrecoverableErrorInfo DoWork() {
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
     was_run_->Signal();
     if (quit_loop_when_run_)
       MessageLoop::current()->Quit();
+    return UnrecoverableErrorInfo();
   }
 
  private:
   bool quit_loop_when_run_;
   base::WaitableEvent* was_run_;
   DISALLOW_COPY_AND_ASSIGN(UIModelWorkerVisitor);
 };
 
 // A faux-syncer that only interacts with its model safe worker.
 class Syncer {
  public:
   explicit Syncer(UIModelWorker* worker) : worker_(worker) {}
   ~Syncer() {}
 
   void SyncShare(UIModelWorkerVisitor* visitor) {
-    scoped_ptr<Callback0::Type> c(NewCallback(visitor,
-        &UIModelWorkerVisitor::DoWork));
-    worker_->DoWorkAndWaitUntilDone(c.get());
+    // We wait until the callback is executed. So it is safe to use Unretained.
+    browser_sync::WorkCallback c = base::Bind(&UIModelWorkerVisitor::DoWork,
+                                              base::Unretained(visitor));
+    worker_->DoWorkAndWaitUntilDone(c);
   }
  private:
   scoped_refptr<UIModelWorker> worker_;
   DISALLOW_COPY_AND_ASSIGN(Syncer);
 };
 
 // A task run from the SyncerThread to "sync share", ie tell the Syncer to
 // ask its ModelSafeWorker to do something.
 class FakeSyncShareTask : public Task {
  public:
@@ skipping 157 matching lines @@
       new FakeSyncShareTask(syncer(), fox3.get()));
 
   // This is what gets the UI thread blocked until NotifyExitRequested,
   // which is called when FakeSyncapiShutdownTask runs and deletes the syncer.
   bmw()->Stop();
 
   // Was the thread killed?
   EXPECT_FALSE(syncer_thread()->IsRunning());
   core_thread()->Stop();
 }