[Sync] Add nigori node conflict resolution.

chrome/browser/sync/engine/resolve_conflicts_command.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/engine/resolve_conflicts_command.h"
 
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/sync/sessions/sync_session.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
@@ skipping 16 matching lines @@
     return;
 
   syncable::ScopedDirLookup dir(session->context()->directory_manager(),
                                 session->context()->account_name());
   if (!dir.good())
     return;
   sessions::StatusController* status = session->mutable_status_controller();
   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