| Index: sync/api/sync_data.cc
|
| diff --git a/sync/api/sync_data.cc b/sync/api/sync_data.cc
|
| index 13c47c2ac460ad6bd04278b4dbc085d83979c67f..a2a419106a022868e9bd028e1fb8c1192c97fec0 100644
|
| --- a/sync/api/sync_data.cc
|
| +++ b/sync/api/sync_data.cc
|
| @@ -56,9 +56,9 @@ SyncData::~SyncData() {}
|
| // Static.
|
| SyncData SyncData::CreateLocalDelete(
|
| const std::string& sync_tag,
|
| - syncable::ModelType datatype) {
|
| + syncer::ModelType datatype) {
|
| sync_pb::EntitySpecifics specifics;
|
| - syncable::AddDefaultFieldValue(datatype, &specifics);
|
| + syncer::AddDefaultFieldValue(datatype, &specifics);
|
| return CreateLocalData(sync_tag, "", specifics);
|
| }
|
|
|
| @@ -91,8 +91,8 @@ const sync_pb::EntitySpecifics& SyncData::GetSpecifics() const {
|
| return immutable_entity_.Get().specifics();
|
| }
|
|
|
| -syncable::ModelType SyncData::GetDataType() const {
|
| - return syncable::GetModelTypeFromSpecifics(GetSpecifics());
|
| +syncer::ModelType SyncData::GetDataType() const {
|
| + return syncer::GetModelTypeFromSpecifics(GetSpecifics());
|
| }
|
|
|
| const std::string& SyncData::GetTag() const {
|
| @@ -119,7 +119,7 @@ std::string SyncData::ToString() const {
|
| if (!IsValid())
|
| return "<Invalid SyncData>";
|
|
|
| - std::string type = syncable::ModelTypeToString(GetDataType());
|
| + std::string type = syncer::ModelTypeToString(GetDataType());
|
| std::string specifics;
|
| scoped_ptr<DictionaryValue> value(
|
| syncer::EntitySpecificsToValue(GetSpecifics()));
|
|
|