Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(537)

Unified Diff: components/sync/driver/glue/ui_model_worker_unittest.cc

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync/driver/glue/ui_model_worker.cc ('k') | components/sync/driver/invalidation_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/driver/glue/ui_model_worker_unittest.cc
diff --git a/components/sync/driver/glue/ui_model_worker_unittest.cc b/components/sync/driver/glue/ui_model_worker_unittest.cc
index 1c4d828a97cdced8cb69279bc9039c76658f90e1..7ad15d960bb061a9738fd703a27644d97e4be73a 100644
--- a/components/sync/driver/glue/ui_model_worker_unittest.cc
+++ b/components/sync/driver/glue/ui_model_worker_unittest.cc
@@ -19,7 +19,8 @@
#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:
@@ -27,11 +28,11 @@ class UIModelWorkerVisitor {
: 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:
@@ -48,7 +49,7 @@ class 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);
}
@@ -99,5 +100,3 @@ TEST_F(SyncUIModelWorkerTest, ScheduledWorkRunsOnUILoop) {
base::RunLoop().Run();
syncer_thread()->Stop();
}
-
-} // namespace syncer
« no previous file with comments | « components/sync/driver/glue/ui_model_worker.cc ('k') | components/sync/driver/invalidation_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698