Index: components/sync/engine_impl/model_type_worker.cc |
diff --git a/components/sync/engine_impl/model_type_worker.cc b/components/sync/engine_impl/model_type_worker.cc |
index f2589ef73427e8e4a124954eab5e1db0f083c3fb..50dee8c24f44ef9449688fd73de86235e5fa1867 100644 |
--- a/components/sync/engine_impl/model_type_worker.cc |
+++ b/components/sync/engine_impl/model_type_worker.cc |
@@ -22,13 +22,7 @@ |
#include "components/sync/engine_impl/worker_entity_tracker.h" |
#include "components/sync/syncable/syncable_util.h" |
-namespace syncer_v2 { |
- |
-using syncer::CommitContribution; |
-using syncer::Cryptographer; |
-using syncer::ModelType; |
-using syncer::NudgeHandler; |
-using syncer::SyncerError; |
+namespace syncer { |
ModelTypeWorker::ModelTypeWorker( |
ModelType type, |
@@ -95,7 +89,7 @@ SyncerError ModelTypeWorker::ProcessGetUpdatesResponse( |
const sync_pb::DataTypeProgressMarker& progress_marker, |
const sync_pb::DataTypeContext& mutated_context, |
const SyncEntityList& applicable_updates, |
- syncer::StatusController* status) { |
+ StatusController* status) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
// TODO(rlarocque): Handle data type context conflicts. |
@@ -119,8 +113,8 @@ SyncerError ModelTypeWorker::ProcessGetUpdatesResponse( |
EntityData data; |
data.id = update_entity->id_string(); |
data.client_tag_hash = client_tag_hash; |
- data.creation_time = syncer::ProtoTimeToTime(update_entity->ctime()); |
- data.modification_time = syncer::ProtoTimeToTime(update_entity->mtime()); |
+ data.creation_time = ProtoTimeToTime(update_entity->ctime()); |
+ data.modification_time = ProtoTimeToTime(update_entity->mtime()); |
data.non_unique_name = update_entity->name(); |
UpdateResponseData response_data; |
@@ -158,10 +152,10 @@ SyncerError ModelTypeWorker::ProcessGetUpdatesResponse( |
} |
} |
- return syncer::SYNCER_OK; |
+ return SYNCER_OK; |
} |
-void ModelTypeWorker::ApplyUpdates(syncer::StatusController* status) { |
+void ModelTypeWorker::ApplyUpdates(StatusController* status) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
// This should only ever be called after one PassiveApplyUpdates. |
DCHECK(data_type_state_.initial_sync_done()); |
@@ -169,7 +163,7 @@ void ModelTypeWorker::ApplyUpdates(syncer::StatusController* status) { |
ApplyPendingUpdates(); |
} |
-void ModelTypeWorker::PassiveApplyUpdates(syncer::StatusController* status) { |
+void ModelTypeWorker::PassiveApplyUpdates(StatusController* status) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
// This should only be called at the end of the very first download cycle. |
DCHECK(!data_type_state_.initial_sync_done()); |
@@ -197,7 +191,7 @@ void ModelTypeWorker::EnqueueForCommit(const CommitRequestDataList& list) { |
for (const CommitRequestData& commit : list) { |
const EntityData& data = commit.entity.value(); |
if (!data.is_deleted()) { |
- DCHECK_EQ(type_, syncer::GetModelTypeFromSpecifics(data.specifics)); |
+ DCHECK_EQ(type_, GetModelTypeFromSpecifics(data.specifics)); |
} |
GetOrCreateEntityTracker(data)->RequestCommit(commit); |
} |
@@ -418,4 +412,4 @@ WorkerEntityTracker* ModelTypeWorker::GetOrCreateEntityTracker( |
return entity ? entity : CreateEntityTracker(data); |
} |
-} // namespace syncer_v2 |
+} // namespace syncer |