sync: Introduce control data types

sync/engine/syncer_util.h

Index: sync/engine/syncer_util.h
diff --git a/sync/engine/syncer_util.h b/sync/engine/syncer_util.h
index e15c16da3b649f4a35f46b68c941829551f107bb..7087767fe01a84c230cdb2aebcce982e7e6b91bb 100644
--- a/sync/engine/syncer_util.h
+++ b/sync/engine/syncer_util.h
@@ -63,6 +63,19 @@ void SplitServerInformationIntoNewEntry(
 void UpdateLocalDataFromServerData(syncable::WriteTransaction* trans,
                                    syncable::MutableEntry* entry);
 
+// Marks the item as no longer requiring sync, allowing the server's version
+// to 'win' during the next update application step.
+void IgnoreLocalChanges(syncable::MutableEntry* entry);

[tim (not reviewing), 2012/08/22 22:42:28]

Is this actually needed outside of ConflictResolver?  It's unfortunate to add
more to this disorganized util dumping ground.  The concepts of ignoring /
overwriting changes from one side or another seem very tied to conflict
resolution. If they're needed externally to that file now, static class methods
would be slightly better from an organizational point of view, as would a
separate conflict_resolver_util file / namespace.

[rlarocque, 2012/08/23 20:11:23]

Moved to conflict_util.cc/h.

+
+// Marks the item as no longer requiring update from server data.  This will
+// cause the item to be committed to the server, overwriting the server's
+// version.
+void OverwriteServerChanges(syncable::MutableEntry* entry);
+
+// The local and server versions are identical, so unset the bits that put them
+// into a conflicting state.
+void IgnoreConflict(syncable::MutableEntry *trans);
+
 VerifyCommitResult ValidateCommitEntry(syncable::Entry* entry);
 
 VerifyResult VerifyNewEntry(const sync_pb::SyncEntity& update,