Chromium Code Reviews| 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 577447e073400b523aaba3b49c2a73dffc35675a..8a25b9544beac61b405b2c35cdbd66d65f0efa1c 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; |
|
tim (not reviewing)
2012/01/06 16:33:42
Part of me wishes we prefixed the values with SYNC
|
| } |
| private: |