| Index: sync/api/sync_data.cc
|
| diff --git a/sync/api/sync_data.cc b/sync/api/sync_data.cc
|
| index a2a419106a022868e9bd028e1fb8c1192c97fec0..b9e2ca999f57390a337614161fda82a51e9524f9 100644
|
| --- a/sync/api/sync_data.cc
|
| +++ b/sync/api/sync_data.cc
|
| @@ -44,7 +44,7 @@ void SyncData::ImmutableSyncEntityTraits::Swap(sync_pb::SyncEntity* t1,
|
|
|
| SyncData::SyncData()
|
| : is_valid_(false),
|
| - id_(syncer::kInvalidId) {}
|
| + id_(kInvalidId) {}
|
|
|
| SyncData::SyncData(int64 id, sync_pb::SyncEntity* entity)
|
| : is_valid_(true),
|
| @@ -56,9 +56,9 @@ SyncData::~SyncData() {}
|
| // Static.
|
| SyncData SyncData::CreateLocalDelete(
|
| const std::string& sync_tag,
|
| - syncer::ModelType datatype) {
|
| + ModelType datatype) {
|
| sync_pb::EntitySpecifics specifics;
|
| - syncer::AddDefaultFieldValue(datatype, &specifics);
|
| + AddDefaultFieldValue(datatype, &specifics);
|
| return CreateLocalData(sync_tag, "", specifics);
|
| }
|
|
|
| @@ -71,13 +71,13 @@ SyncData SyncData::CreateLocalData(
|
| entity.set_client_defined_unique_tag(sync_tag);
|
| entity.set_non_unique_name(non_unique_title);
|
| entity.mutable_specifics()->CopyFrom(specifics);
|
| - return SyncData(syncer::kInvalidId, &entity);
|
| + return SyncData(kInvalidId, &entity);
|
| }
|
|
|
| // Static.
|
| SyncData SyncData::CreateRemoteData(
|
| int64 id, const sync_pb::EntitySpecifics& specifics) {
|
| - DCHECK_NE(id, syncer::kInvalidId);
|
| + DCHECK_NE(id, kInvalidId);
|
| sync_pb::SyncEntity entity;
|
| entity.mutable_specifics()->CopyFrom(specifics);
|
| return SyncData(id, &entity);
|
| @@ -91,8 +91,8 @@ const sync_pb::EntitySpecifics& SyncData::GetSpecifics() const {
|
| return immutable_entity_.Get().specifics();
|
| }
|
|
|
| -syncer::ModelType SyncData::GetDataType() const {
|
| - return syncer::GetModelTypeFromSpecifics(GetSpecifics());
|
| +ModelType SyncData::GetDataType() const {
|
| + return GetModelTypeFromSpecifics(GetSpecifics());
|
| }
|
|
|
| const std::string& SyncData::GetTag() const {
|
| @@ -112,17 +112,16 @@ int64 SyncData::GetRemoteId() const {
|
| }
|
|
|
| bool SyncData::IsLocal() const {
|
| - return id_ == syncer::kInvalidId;
|
| + return id_ == kInvalidId;
|
| }
|
|
|
| std::string SyncData::ToString() const {
|
| if (!IsValid())
|
| return "<Invalid SyncData>";
|
|
|
| - std::string type = syncer::ModelTypeToString(GetDataType());
|
| + std::string type = ModelTypeToString(GetDataType());
|
| std::string specifics;
|
| - scoped_ptr<DictionaryValue> value(
|
| - syncer::EntitySpecificsToValue(GetSpecifics()));
|
| + scoped_ptr<DictionaryValue> value(EntitySpecificsToValue(GetSpecifics()));
|
| base::JSONWriter::WriteWithOptions(value.get(),
|
| base::JSONWriter::OPTIONS_PRETTY_PRINT,
|
| &specifics);
|
|
|