| Index: components/sync/api/entity_data.h
|
| diff --git a/components/sync/api/entity_data.h b/components/sync/api/entity_data.h
|
| index 913f2bf032c46d577ca2713032377db31fbc580e..0494755d8c648c5171186f58a92cd9525ad95307 100644
|
| --- a/components/sync/api/entity_data.h
|
| +++ b/components/sync/api/entity_data.h
|
| @@ -15,7 +15,7 @@
|
| #include "components/sync/base/proto_value_ptr.h"
|
| #include "components/sync/protocol/sync.pb.h"
|
|
|
| -namespace syncer_v2 {
|
| +namespace syncer {
|
|
|
| struct EntityData;
|
|
|
| @@ -25,7 +25,7 @@ struct EntityDataTraits {
|
| static const EntityData& DefaultValue();
|
| };
|
|
|
| -typedef syncer::ProtoValuePtr<EntityData, EntityDataTraits> EntityDataPtr;
|
| +typedef ProtoValuePtr<EntityData, EntityDataTraits> EntityDataPtr;
|
| typedef std::vector<EntityDataPtr> EntityDataList;
|
| typedef std::map<std::string, EntityDataPtr> EntityDataMap;
|
|
|
| @@ -86,6 +86,6 @@ struct EntityData {
|
| DISALLOW_COPY_AND_ASSIGN(EntityData);
|
| };
|
|
|
| -} // namespace syncer_v2
|
| +} // namespace syncer
|
|
|
| #endif // COMPONENTS_SYNC_API_ENTITY_DATA_H_
|
|
|