Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/sync/api/entity_data.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_SYNC_API_ENTITY_DATA_H_
 #define COMPONENTS_SYNC_API_ENTITY_DATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/sync/base/proto_value_ptr.h"
 #include "components/sync/protocol/sync.pb.h"
 
-namespace syncer {
+namespace syncer_v2 {
 
 struct EntityData;
 
 struct EntityDataTraits {
   static void SwapValue(EntityData* dest, EntityData* src);
   static bool HasValue(const EntityData& value);
   static const EntityData& DefaultValue();
 };
 
-typedef ProtoValuePtr<EntityData, EntityDataTraits> EntityDataPtr;
+typedef syncer::ProtoValuePtr<EntityData, EntityDataTraits> EntityDataPtr;
 typedef std::vector<EntityDataPtr> EntityDataList;
 typedef std::map<std::string, EntityDataPtr> EntityDataMap;
 
 // A light-weight container for sync entity data which represents either
 // local data created on the ModelTypeService side or remote data created
 // on ModelTypeWorker.
 // EntityData is supposed to be wrapped and passed by reference.
 struct EntityData {
  public:
   EntityData();
@@ skipping 40 matching lines @@
   std::unique_ptr<base::DictionaryValue> ToDictionaryValue();
 
  private:
   friend struct EntityDataTraits;
   // Used to transfer the data without copying.
   void Swap(EntityData* other);
 
   DISALLOW_COPY_AND_ASSIGN(EntityData);
 };
 
-}  // namespace syncer
+}  // namespace syncer_v2
 
 #endif  // COMPONENTS_SYNC_API_ENTITY_DATA_H_