| Index: chrome/browser/sync/glue/ui_model_worker_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
|
| index c0230f1879016f99aa85118b1dde05705c3f0701..ebc5e3d77767a246f4ce20401bca16273b90a057 100644
|
| --- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc
|
| +++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
|
| @@ -9,10 +9,12 @@
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/threading/thread.h"
|
| #include "chrome/browser/sync/glue/ui_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 browser_sync::UIModelWorker;
|
| +using browser_sync::sessions::UnrecoverableErrorInfo;
|
|
|
| // Various boilerplate, primarily for the StopWithPendingWork test.
|
|
|
| @@ -24,7 +26,7 @@ class UIModelWorkerVisitor {
|
| was_run_(was_run) { }
|
| virtual ~UIModelWorkerVisitor() { }
|
|
|
| - virtual void DoWork() {
|
| + virtual void DoWork(UnrecoverableErrorInfo* error_info) {
|
| EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| was_run_->Signal();
|
| if (quit_loop_when_run_)
|
| @@ -44,7 +46,8 @@ class Syncer {
|
| ~Syncer() {}
|
|
|
| void SyncShare(UIModelWorkerVisitor* visitor) {
|
| - scoped_ptr<Callback0::Type> c(NewCallback(visitor,
|
| + scoped_ptr<Callback1<UnrecoverableErrorInfo*>::Type> c(
|
| + NewCallback(visitor,
|
| &UIModelWorkerVisitor::DoWork));
|
| worker_->DoWorkAndWaitUntilDone(c.get());
|
| }
|
|
|