| Index: sync/engine/update_applicator.cc
|
| diff --git a/sync/engine/update_applicator.cc b/sync/engine/update_applicator.cc
|
| index 72d2decfa75b91c846c5b25f79fa1b325130c91d..03ae08df7d8aef8e03fb4b1e335581ae7bea2358 100644
|
| --- a/sync/engine/update_applicator.cc
|
| +++ b/sync/engine/update_applicator.cc
|
| @@ -101,7 +101,7 @@ void UpdateApplicator::Advance() {
|
| }
|
|
|
| bool UpdateApplicator::SkipUpdate(const syncable::Entry& entry) {
|
| - syncable::ModelType type = entry.GetServerModelType();
|
| + syncer::ModelType type = entry.GetServerModelType();
|
| ModelSafeGroup g = GetGroupForModelType(type, routing_info_);
|
| // The set of updates passed to the UpdateApplicator should already
|
| // be group-filtered.
|
| @@ -111,8 +111,8 @@ bool UpdateApplicator::SkipUpdate(const syncable::Entry& entry) {
|
| }
|
| if (g == GROUP_PASSIVE &&
|
| !routing_info_.count(type) &&
|
| - type != syncable::UNSPECIFIED &&
|
| - type != syncable::TOP_LEVEL_FOLDER) {
|
| + type != syncer::UNSPECIFIED &&
|
| + type != syncer::TOP_LEVEL_FOLDER) {
|
| DVLOG(1) << "Skipping update application, type not permitted.";
|
| return true;
|
| }
|
|
|