[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 a8d1a25a573fe0b4aba550c91b32b55a575e686a..59fbf8c512122625b28bb85e5bb59784efa9ad01 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
@@ -48,6 +50,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);
 };