Index: components/sync/core/processor_entity_tracker.cc |
diff --git a/components/sync/core/processor_entity_tracker.cc b/components/sync/core/processor_entity_tracker.cc |
index 5238d6efd76b3f13d2eebeb5e02bde476a917448..d0a14a78de34de452cf2035e084202e3df15c1dd 100644 |
--- a/components/sync/core/processor_entity_tracker.cc |
+++ b/components/sync/core/processor_entity_tracker.cc |
@@ -10,7 +10,7 @@ |
#include "components/sync/core/non_blocking_sync_common.h" |
#include "components/sync/syncable/syncable_util.h" |
-namespace syncer_v2 { |
+namespace syncer { |
namespace { |
@@ -35,7 +35,7 @@ std::unique_ptr<ProcessorEntityTracker> ProcessorEntityTracker::CreateNew( |
metadata.set_sequence_number(0); |
metadata.set_acked_sequence_number(0); |
metadata.set_server_version(kUncommittedVersion); |
- metadata.set_creation_time(syncer::TimeToProtoTime(creation_time)); |
+ metadata.set_creation_time(TimeToProtoTime(creation_time)); |
return std::unique_ptr<ProcessorEntityTracker>( |
new ProcessorEntityTracker(storage_key, &metadata)); |
@@ -130,7 +130,7 @@ void ProcessorEntityTracker::RecordAcceptedUpdate( |
RecordIgnoredUpdate(update); |
metadata_.set_is_deleted(update.entity->is_deleted()); |
metadata_.set_modification_time( |
- syncer::TimeToProtoTime(update.entity->modification_time)); |
+ TimeToProtoTime(update.entity->modification_time)); |
UpdateSpecificsHash(update.entity->specifics); |
} |
@@ -154,19 +154,18 @@ void ProcessorEntityTracker::MakeLocalChange(std::unique_ptr<EntityData> data) { |
IncrementSequenceNumber(); |
UpdateSpecificsHash(data->specifics); |
- metadata_.set_modification_time( |
- syncer::TimeToProtoTime(data->modification_time)); |
+ metadata_.set_modification_time(TimeToProtoTime(data->modification_time)); |
metadata_.set_is_deleted(false); |
data->id = metadata_.server_id(); |
- data->creation_time = syncer::ProtoTimeToTime(metadata_.creation_time()); |
+ data->creation_time = ProtoTimeToTime(metadata_.creation_time()); |
commit_data_.reset(); |
CacheCommitData(data.get()); |
} |
void ProcessorEntityTracker::Delete() { |
IncrementSequenceNumber(); |
- metadata_.set_modification_time(syncer::TimeToProtoTime(base::Time::Now())); |
+ metadata_.set_modification_time(TimeToProtoTime(base::Time::Now())); |
metadata_.set_is_deleted(true); |
metadata_.clear_specifics_hash(); |
// Clear any cached pending commit data. |
@@ -185,9 +184,8 @@ void ProcessorEntityTracker::InitializeCommitRequestData( |
EntityData data; |
data.client_tag_hash = metadata_.client_tag_hash(); |
data.id = metadata_.server_id(); |
- data.creation_time = syncer::ProtoTimeToTime(metadata_.creation_time()); |
- data.modification_time = |
- syncer::ProtoTimeToTime(metadata_.modification_time()); |
+ data.creation_time = ProtoTimeToTime(metadata_.creation_time()); |
+ data.modification_time = ProtoTimeToTime(metadata_.modification_time()); |
request->entity = data.PassToPtr(); |
} |
@@ -249,4 +247,4 @@ void ProcessorEntityTracker::UpdateSpecificsHash( |
} |
} |
-} // namespace syncer_v2 |
+} // namespace syncer |