[Sync] Add nigori node conflict resolution.

chrome/browser/sync/engine/resolve_conflicts_command.cc

Index: chrome/browser/sync/engine/resolve_conflicts_command.cc
diff --git a/chrome/browser/sync/engine/resolve_conflicts_command.cc b/chrome/browser/sync/engine/resolve_conflicts_command.cc
index b55f9ad04b16ee396866ccff45a82b7dbf7498ab..e76b1c7f19259312697b15e331074dbf5521076f 100644
--- a/chrome/browser/sync/engine/resolve_conflicts_command.cc
+++ b/chrome/browser/sync/engine/resolve_conflicts_command.cc
@@ -34,8 +34,11 @@ void ResolveConflictsCommand::ModelChangingExecuteImpl(
   const sessions::ConflictProgress* progress = status->conflict_progress();
   if (!progress)
     return;  // Nothing to do.
+  syncable::WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir);
+  const Cryptographer* cryptographer =
+      session->context()->directory_manager()->GetCryptographer(&trans);
   status->update_conflicts_resolved(
-      resolver->ResolveConflicts(dir, *progress, status));
+      resolver->ResolveConflicts(&trans, cryptographer, *progress, status));
 }
 
 }  // namespace browser_sync