Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/sync/driver/glue/browser_thread_model_worker.cc

Index: components/sync/driver/glue/browser_thread_model_worker.cc
diff --git a/components/sync/driver/glue/browser_thread_model_worker.cc b/components/sync/driver/glue/browser_thread_model_worker.cc
index 2b77c03a4e4c45a6fb0c754179d414c4b4ffe775..8b8567ce21ec230f2d0431bad7c0cae87a351d96 100644
--- a/components/sync/driver/glue/browser_thread_model_worker.cc
+++ b/components/sync/driver/glue/browser_thread_model_worker.cc
@@ -11,17 +11,17 @@
 using base::SingleThreadTaskRunner;
 using base::WaitableEvent;
 
-namespace syncer {
+namespace browser_sync {
 
 BrowserThreadModelWorker::BrowserThreadModelWorker(
     const scoped_refptr<SingleThreadTaskRunner>& runner,
-    ModelSafeGroup group,
-    WorkerLoopDestructionObserver* observer)
+    syncer::ModelSafeGroup group,
+    syncer::WorkerLoopDestructionObserver* observer)
     : ModelSafeWorker(observer), runner_(runner), group_(group) {}
 
-SyncerError BrowserThreadModelWorker::DoWorkAndWaitUntilDoneImpl(
-    const WorkCallback& work) {
-  SyncerError error = UNSET;
+syncer::SyncerError BrowserThreadModelWorker::DoWorkAndWaitUntilDoneImpl(
+    const syncer::WorkCallback& work) {
+  syncer::SyncerError error = syncer::UNSET;
   if (runner_->BelongsToCurrentThread()) {
     DLOG(WARNING) << "Already on thread " << runner_;
     return work.Run();
@@ -32,14 +32,14 @@ SyncerError BrowserThreadModelWorker::DoWorkAndWaitUntilDoneImpl(
           base::Bind(&BrowserThreadModelWorker::CallDoWorkAndSignalTask, this,
                      work, work_done_or_stopped(), &error))) {
     DLOG(WARNING) << "Failed to post task to runner " << runner_;
-    error = CANNOT_DO_WORK;
+    error = syncer::CANNOT_DO_WORK;
     return error;
   }
   work_done_or_stopped()->Wait();
   return error;
 }
 
-ModelSafeGroup BrowserThreadModelWorker::GetModelSafeGroup() {
+syncer::ModelSafeGroup BrowserThreadModelWorker::GetModelSafeGroup() {
   return group_;
 }
 
@@ -55,13 +55,14 @@ void BrowserThreadModelWorker::RegisterForLoopDestruction() {
   }
 }
 
-void BrowserThreadModelWorker::CallDoWorkAndSignalTask(const WorkCallback& work,
-                                                       WaitableEvent* done,
-                                                       SyncerError* error) {
+void BrowserThreadModelWorker::CallDoWorkAndSignalTask(
+    const syncer::WorkCallback& work,
+    WaitableEvent* done,
+    syncer::SyncerError* error) {
   DCHECK(runner_->BelongsToCurrentThread());
   if (!IsStopped())
     *error = work.Run();
   done->Signal();
 }
 
-}  // namespace syncer
+}  // namespace browser_sync