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

Unified Diff: components/sync/api/entity_data.cc

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. 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/api/entity_data.h ('k') | components/sync/api/entity_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/api/entity_data.cc
diff --git a/components/sync/api/entity_data.cc b/components/sync/api/entity_data.cc
index 44183d8f6a5543e51ef41b6d1d7709407dea410d..3c105558756252933c65ca20719a71c572f4dee2 100644
--- a/components/sync/api/entity_data.cc
+++ b/components/sync/api/entity_data.cc
@@ -13,13 +13,13 @@
#include "components/sync/base/unique_position.h"
#include "components/sync/protocol/proto_value_conversions.h"
-namespace syncer_v2 {
+namespace syncer {
namespace {
std::string UniquePositionToString(
const sync_pb::UniquePosition& unique_position) {
- return syncer::UniquePosition::FromProto(unique_position).ToDebugString();
+ return UniquePosition::FromProto(unique_position).ToDebugString();
}
} // namespace
@@ -52,13 +52,13 @@ EntityDataPtr EntityData::PassToPtr() {
std::unique_ptr<base::DictionaryValue> EntityData::ToDictionaryValue() {
std::unique_ptr<base::DictionaryValue> dict =
- syncer::EntitySpecificsToValue(specifics);
+ EntitySpecificsToValue(specifics);
ADD_TO_DICT(dict, id, );
ADD_TO_DICT(dict, client_tag_hash, );
ADD_TO_DICT(dict, non_unique_name, );
ADD_TO_DICT(dict, parent_id, );
- ADD_TO_DICT(dict, creation_time, syncer::GetTimeDebugString);
- ADD_TO_DICT(dict, modification_time, syncer::GetTimeDebugString);
+ ADD_TO_DICT(dict, creation_time, GetTimeDebugString);
+ ADD_TO_DICT(dict, modification_time, GetTimeDebugString);
ADD_TO_DICT(dict, unique_position, UniquePositionToString);
return dict;
}
@@ -78,4 +78,4 @@ const EntityData& EntityDataTraits::DefaultValue() {
return default_instance;
}
-} // namespace syncer_v2
+} // namespace syncer
« no previous file with comments | « components/sync/api/entity_data.h ('k') | components/sync/api/entity_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698