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

components/sync/driver/glue/ui_model_worker_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync/driver/glue/ui_model_worker.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace syncer {
+using browser_sync::UIModelWorker;
+using syncer::SyncerError;
 
 class UIModelWorkerVisitor {
  public:
   UIModelWorkerVisitor(base::WaitableEvent* was_run, bool quit_loop)
       : quit_loop_when_run_(quit_loop), was_run_(was_run) {}
   virtual ~UIModelWorkerVisitor() {}
 
-  virtual SyncerError DoWork() {
+  virtual syncer::SyncerError DoWork() {
     was_run_->Signal();
     if (quit_loop_when_run_)
       base::MessageLoop::current()->QuitWhenIdle();
-    return SYNCER_OK;
+    return syncer::SYNCER_OK;
   }
 
  private:
   bool quit_loop_when_run_;
   base::WaitableEvent* was_run_;
   DISALLOW_COPY_AND_ASSIGN(UIModelWorkerVisitor);
 };
 
 // A faux-syncer that only interacts with its model safe worker.
 class Syncer {
  public:
   explicit Syncer(UIModelWorker* worker) : worker_(worker) {}
   ~Syncer() {}
 
   void SyncShare(UIModelWorkerVisitor* visitor) {
     // We wait until the callback is executed. So it is safe to use Unretained.
-    WorkCallback c =
+    syncer::WorkCallback c =
         base::Bind(&UIModelWorkerVisitor::DoWork, base::Unretained(visitor));
     worker_->DoWorkAndWaitUntilDone(c);
   }
 
  private:
   scoped_refptr<UIModelWorker> worker_;
   DISALLOW_COPY_AND_ASSIGN(Syncer);
 };
 
 class SyncUIModelWorkerTest : public testing::Test {
@@ skipping 30 matching lines @@
 
   syncer_thread()->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&Syncer::SyncShare, base::Unretained(syncer()), v.get()));
 
   // We are on the UI thread, so run our loop to process the
   // (hopefully) scheduled task from a SyncShare invocation.
   base::RunLoop().Run();
   syncer_thread()->Stop();
 }
-
-}  // namespace syncer