| 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 b6b83db29694cd32dd1c982acbe0f0862b316668..f7358960ef9855baa94afde3796e50abd8f816ee 100644
|
| --- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc
|
| +++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
|
| @@ -11,12 +11,11 @@
|
| #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/test/test_browser_thread.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| using browser_sync::UIModelWorker;
|
| -using browser_sync::UnrecoverableErrorInfo;
|
| +using browser_sync::SyncerError;
|
| using content::BrowserThread;
|
|
|
| // Various boilerplate, primarily for the StopWithPendingWork test.
|
| @@ -29,12 +28,12 @@ class UIModelWorkerVisitor {
|
| was_run_(was_run) { }
|
| virtual ~UIModelWorkerVisitor() { }
|
|
|
| - virtual UnrecoverableErrorInfo DoWork() {
|
| + virtual SyncerError DoWork() {
|
| EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| was_run_->Signal();
|
| if (quit_loop_when_run_)
|
| MessageLoop::current()->Quit();
|
| - return UnrecoverableErrorInfo();
|
| + return browser_sync::NO_ERROR;
|
| }
|
|
|
| private:
|
|
|