| Index: sync/syncable/entry.cc
|
| diff --git a/sync/syncable/entry.cc b/sync/syncable/entry.cc
|
| index 948a0fcab4662bce95bf97c0f284b3d98a0cd896..ba64299c7340271cae8ac2e3280b5c40a2ed7256 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);
|
| }
|
|
|
| -syncer::ModelType Entry::GetServerModelType() const {
|
| +ModelType Entry::GetServerModelType() const {
|
| ModelType specifics_type = kernel_->GetServerModelType();
|
| if (specifics_type != UNSPECIFIED)
|
| return specifics_type;
|
| @@ -81,7 +81,7 @@ syncer::ModelType Entry::GetServerModelType() const {
|
| return UNSPECIFIED;
|
| }
|
|
|
| -syncer::ModelType Entry::GetModelType() const {
|
| +ModelType Entry::GetModelType() const {
|
| ModelType specifics_type = GetModelTypeFromSpecifics(Get(SPECIFICS));
|
| if (specifics_type != UNSPECIFIED)
|
| return specifics_type;
|
| @@ -111,8 +111,7 @@ std::ostream& operator<<(std::ostream& os, const Entry& entry) {
|
| }
|
| for ( ; i < TIME_FIELDS_END; ++i) {
|
| os << g_metas_columns[i].name << ": "
|
| - << syncer::GetTimeDebugString(
|
| - kernel->ref(static_cast<TimeField>(i))) << ", ";
|
| + << GetTimeDebugString(kernel->ref(static_cast<TimeField>(i))) << ", ";
|
| }
|
| for ( ; i < ID_FIELDS_END; ++i) {
|
| os << g_metas_columns[i].name << ": "
|
|
|