summaryrefslogtreecommitdiffstats
path: root/sync/engine/update_applicator.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sync/engine/update_applicator.cc')
-rw-r--r--sync/engine/update_applicator.cc30
1 files changed, 1 insertions, 29 deletions
diff --git a/sync/engine/update_applicator.cc b/sync/engine/update_applicator.cc
index 3edf1f8..e8731ce 100644
--- a/sync/engine/update_applicator.cc
+++ b/sync/engine/update_applicator.cc
@@ -19,12 +19,8 @@ namespace syncer {
using syncable::ID;
-UpdateApplicator::UpdateApplicator(Cryptographer* cryptographer,
- const ModelSafeRoutingInfo& routes,
- ModelSafeGroup group_filter)
+UpdateApplicator::UpdateApplicator(Cryptographer* cryptographer)
: cryptographer_(cryptographer),
- group_filter_(group_filter),
- routing_info_(routes),
updates_applied_(0),
encryption_conflicts_(0),
hierarchy_conflicts_(0) {
@@ -58,11 +54,6 @@ void UpdateApplicator::AttemptApplications(
for (std::vector<int64>::iterator i = to_apply.begin();
i != to_apply.end(); ++i) {
- syncable::Entry read_entry(trans, syncable::GET_BY_HANDLE, *i);
- if (SkipUpdate(read_entry)) {
- continue;
- }
-
syncable::MutableEntry entry(trans, syncable::GET_BY_HANDLE, *i);
UpdateAttemptResponse result = AttemptToUpdateEntry(
trans, &entry, cryptographer_);
@@ -103,23 +94,4 @@ void UpdateApplicator::AttemptApplications(
}
}
-bool UpdateApplicator::SkipUpdate(const syncable::Entry& entry) {
- ModelType type = entry.GetServerModelType();
- ModelSafeGroup g = GetGroupForModelType(type, routing_info_);
- // The set of updates passed to the UpdateApplicator should already
- // be group-filtered.
- if (g != group_filter_) {
- NOTREACHED();
- return true;
- }
- if (g == GROUP_PASSIVE &&
- !routing_info_.count(type) &&
- type != UNSPECIFIED &&
- type != TOP_LEVEL_FOLDER) {
- DVLOG(1) << "Skipping update application, type not permitted.";
- return true;
- }
- return false;
-}
-
} // namespace syncer