| Index: sync/syncable/entry.cc
|
| diff --git a/sync/syncable/entry.cc b/sync/syncable/entry.cc
|
| index 170924eaa355e45ea0033d84f27d00e6012c8065..948a0fcab4662bce95bf97c0f284b3d98a0cd896 100644
|
| --- a/sync/syncable/entry.cc
|
| +++ b/sync/syncable/entry.cc
|
| @@ -64,7 +64,7 @@ const string& Entry::Get(StringField field) const {
|
| return kernel_->ref(field);
|
| }
|
|
|
| -syncable::ModelType Entry::GetServerModelType() const {
|
| +syncer::ModelType Entry::GetServerModelType() const {
|
| ModelType specifics_type = kernel_->GetServerModelType();
|
| if (specifics_type != UNSPECIFIED)
|
| return specifics_type;
|
| @@ -81,7 +81,7 @@ syncable::ModelType Entry::GetServerModelType() const {
|
| return UNSPECIFIED;
|
| }
|
|
|
| -syncable::ModelType Entry::GetModelType() const {
|
| +syncer::ModelType Entry::GetModelType() const {
|
| ModelType specifics_type = GetModelTypeFromSpecifics(Get(SPECIFICS));
|
| if (specifics_type != UNSPECIFIED)
|
| return specifics_type;
|
|
|