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

chrome/browser/sync/glue/browser_thread_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/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/test/test_timeouts.h"
 #include "base/timer.h"
 #include "chrome/browser/sync/glue/browser_thread_model_worker.h"
+#include "chrome/browser/sync/sessions/unrecoverable_error_info.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::OneShotTimer;
 using base::Thread;
 using base::TimeDelta;
 
 namespace browser_sync {
 
 namespace {
 
 class BrowserThreadModelWorkerTest : public testing::Test {
  public:
   BrowserThreadModelWorkerTest() :
       did_do_work_(false),
       db_thread_(BrowserThread::DB),
       io_thread_(BrowserThread::IO, &io_loop_),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {}
 
   bool did_do_work() { return did_do_work_; }
   BrowserThreadModelWorker* worker() { return worker_.get(); }
   OneShotTimer<BrowserThreadModelWorkerTest>* timer() { return &timer_; }
   ScopedRunnableMethodFactory<BrowserThreadModelWorkerTest>* factory() {
     return &method_factory_;
   }
 
   // Schedule DoWork to be executed on the DB thread and have the test fail if
   // DoWork hasn't executed within action_timeout_ms() ms.
   void ScheduleWork() {
-    scoped_ptr<Callback0::Type> c(NewCallback(this,
-        &BrowserThreadModelWorkerTest::DoWork));
+   WorkCallback c = base::Bind(&BrowserThreadModelWorkerTest::DoWork,
+       // We wait until the callback is done. So it is safe to use unretained.

[akalin, 2011/10/26 01:44:45]

You can just put the comment above the expression, and indent the line properly.

+       base::Unretained(this));
     timer()->Start(
         FROM_HERE,
         TimeDelta::FromMilliseconds(TestTimeouts::action_timeout_ms()),
         this,
         &BrowserThreadModelWorkerTest::Timeout);
-    worker()->DoWorkAndWaitUntilDone(c.get());
+    worker()->DoWorkAndWaitUntilDone(c);
   }
 
   // This is the work that will be scheduled to be done on the DB thread.
-  void DoWork() {
+  sessions::UnrecoverableErrorInfo DoWork() {
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
     timer_.Stop();  // Stop the failure timer so the test succeeds.
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, new MessageLoop::QuitTask());
     did_do_work_ = true;
+    return sessions::UnrecoverableErrorInfo();
   }
 
   // This will be called by the OneShotTimer and make the test fail unless
   // DoWork is called first.
   void Timeout() {
     ADD_FAILURE() << "Timed out waiting for work to be done on the DB thread.";
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, new MessageLoop::QuitTask());
   }
 
@@ skipping 23 matching lines @@
 TEST_F(BrowserThreadModelWorkerTest, DoesWorkOnDatabaseThread) {
   MessageLoop::current()->PostTask(FROM_HERE, factory()->NewRunnableMethod(
       &BrowserThreadModelWorkerTest::ScheduleWork));
   MessageLoop::current()->Run();
   EXPECT_TRUE(did_do_work());
 }
 
 }  // namespace
 
 }  // namespace browser_sync