Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3567)

Unified Diff: sync/engine/apply_updates_command.cc

Issue 10559104: sync: Process 'control' data separately (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename, cleanup, fix tests Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/engine/apply_control_data_updates_unittest.cc ('k') | sync/engine/apply_updates_command_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/apply_updates_command.cc
diff --git a/sync/engine/apply_updates_command.cc b/sync/engine/apply_updates_command.cc
index fd18ff225161d4109bb81ba94a3d3e815ebae364..b8072671cb4f0524596fda892084ea8ff1e1503a 100644
--- a/sync/engine/apply_updates_command.cc
+++ b/sync/engine/apply_updates_command.cc
@@ -32,10 +32,15 @@ std::set<ModelSafeGroup> ApplyUpdatesCommand::GetGroupsToChange(
for (syncable::FullModelTypeSet::Iterator it =
server_types_with_unapplied_updates.First(); it.Good(); it.Inc()) {
+ VLOG(2) << "TYPES: " << ModelTypeToString(it.Get());
groups_with_unapplied_updates.insert(
GetGroupForModelType(it.Get(), session.routing_info()));
}
+ // The INTERNAL types are special. They have their own update routines,
+ // ApplyUpdatesCommand should not process them.
+ groups_with_unapplied_updates.erase(GROUP_CONTROL);
+
return groups_with_unapplied_updates;
}
« no previous file with comments | « sync/engine/apply_control_data_updates_unittest.cc ('k') | sync/engine/apply_updates_command_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698