| 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 2c89dfece139facc7c9bf464b08cc7f97ee4c67e..e4de2822c2bab704ef747cec7a6bd5604c4bd0b2 100644
|
| --- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc
|
| +++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
|
| @@ -15,7 +15,7 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| using browser_sync::UIModelWorker;
|
| -using csync::SyncerError;
|
| +using syncer::SyncerError;
|
| using content::BrowserThread;
|
|
|
| // Various boilerplate, primarily for the StopWithPendingWork test.
|
| @@ -28,12 +28,12 @@ class UIModelWorkerVisitor {
|
| was_run_(was_run) { }
|
| virtual ~UIModelWorkerVisitor() { }
|
|
|
| - virtual csync::SyncerError DoWork() {
|
| + virtual syncer::SyncerError DoWork() {
|
| EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| was_run_->Signal();
|
| if (quit_loop_when_run_)
|
| MessageLoop::current()->Quit();
|
| - return csync::SYNCER_OK;
|
| + return syncer::SYNCER_OK;
|
| }
|
|
|
| private:
|
| @@ -50,7 +50,7 @@ class Syncer {
|
|
|
| void SyncShare(UIModelWorkerVisitor* visitor) {
|
| // We wait until the callback is executed. So it is safe to use Unretained.
|
| - csync::WorkCallback c = base::Bind(&UIModelWorkerVisitor::DoWork,
|
| + syncer::WorkCallback c = base::Bind(&UIModelWorkerVisitor::DoWork,
|
| base::Unretained(visitor));
|
| worker_->DoWorkAndWaitUntilDone(c);
|
| }
|
|
|