[Sync] Move //components/sync to the syncer namespace, take 2.

components/sync/api/entity_data.cc

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