| Index: chrome/browser/sync/glue/ui_model_worker.cc
|
| diff --git a/chrome/browser/sync/glue/ui_model_worker.cc b/chrome/browser/sync/glue/ui_model_worker.cc
|
| index 0eda00f742b235e5a71c657b488c8a37f1ffd64a..5bc35a7fcac7dd65369a2f10cf38719c793440eb 100644
|
| --- a/chrome/browser/sync/glue/ui_model_worker.cc
|
| +++ b/chrome/browser/sync/glue/ui_model_worker.cc
|
| @@ -19,10 +19,10 @@ namespace browser_sync {
|
| namespace {
|
|
|
| // A simple callback to signal a waitable event after running a closure.
|
| -void CallDoWorkAndSignalCallback(const csync::WorkCallback& work,
|
| +void CallDoWorkAndSignalCallback(const syncer::WorkCallback& work,
|
| base::WaitableEvent* work_done,
|
| UIModelWorker* const scheduler,
|
| - csync::SyncerError* error_info) {
|
| + syncer::SyncerError* error_info) {
|
| if (work.is_null()) {
|
| // This can happen during tests or cases where there are more than just the
|
| // default UIModelWorker in existence and it gets destroyed before
|
| @@ -76,8 +76,8 @@ void UIModelWorker::Stop() {
|
| state_ = STOPPED;
|
| }
|
|
|
| -csync::SyncerError UIModelWorker::DoWorkAndWaitUntilDone(
|
| - const csync::WorkCallback& work) {
|
| +syncer::SyncerError UIModelWorker::DoWorkAndWaitUntilDone(
|
| + const syncer::WorkCallback& work) {
|
| // In most cases, this method is called in WORKING state. It is possible this
|
| // gets called when we are in the RUNNING_MANUAL_SHUTDOWN_PUMP state, because
|
| // the UI loop has initiated shutdown but the syncer hasn't got the memo yet.
|
| @@ -85,7 +85,7 @@ csync::SyncerError UIModelWorker::DoWorkAndWaitUntilDone(
|
| // code handling this case in Stop(). Note there _no_ way we can be in here
|
| // with state_ = STOPPED, so it is safe to read / compare in this case.
|
| CHECK_NE(ANNOTATE_UNPROTECTED_READ(state_), STOPPED);
|
| - csync::SyncerError error_info;
|
| + syncer::SyncerError error_info;
|
| if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
|
| DLOG(WARNING) << "DoWorkAndWaitUntilDone called from "
|
| << "ui_loop_. Probably a nested invocation?";
|
| @@ -114,8 +114,8 @@ csync::SyncerError UIModelWorker::DoWorkAndWaitUntilDone(
|
| return error_info;
|
| }
|
|
|
| -csync::ModelSafeGroup UIModelWorker::GetModelSafeGroup() {
|
| - return csync::GROUP_UI;
|
| +syncer::ModelSafeGroup UIModelWorker::GetModelSafeGroup() {
|
| + return syncer::GROUP_UI;
|
| }
|
|
|
| void UIModelWorker::OnSyncerShutdownComplete() {
|
|
|