[Sync] Implement encryption-aware conflict resolution.

chrome/browser/sync/engine/process_updates_command.h

Index: chrome/browser/sync/engine/process_updates_command.h
diff --git a/chrome/browser/sync/engine/process_updates_command.h b/chrome/browser/sync/engine/process_updates_command.h
index 1f127066cc4ca78f4f48493b4356f589cc7079c3..f5d8c0c97441016b8f8e94c17b1391e28e4e38ea 100644
--- a/chrome/browser/sync/engine/process_updates_command.h
+++ b/chrome/browser/sync/engine/process_updates_command.h
@@ -21,6 +21,8 @@ class SyncEntity;
 
 namespace browser_sync {
 
+class Cryptographer;
+
 // A syncer command for processing updates.
 //
 // Preconditions - updates in the SyncerSesssion have been downloaded
@@ -47,6 +49,7 @@ class ProcessUpdatesCommand : public ModelChangingSyncerCommand {
   ServerUpdateProcessingResult ProcessUpdate(
       const syncable::ScopedDirLookup& dir,
       const sync_pb::SyncEntity& proto_update,
+      const Cryptographer* cryptographer,
       syncable::WriteTransaction* const trans);
   DISALLOW_COPY_AND_ASSIGN(ProcessUpdatesCommand);
 };