[Sync] Add nigori node conflict resolution.

chrome/browser/sync/engine/conflict_resolver.h

Index: chrome/browser/sync/engine/conflict_resolver.h
diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
index 38e418ece5511b49dcc9374510348ebdd0c68b39..b1cab715eda4cb8e8daf0d199550287be6b35f92 100644
--- a/chrome/browser/sync/engine/conflict_resolver.h
+++ b/chrome/browser/sync/engine/conflict_resolver.h
@@ -27,6 +27,8 @@ class WriteTransaction;
 
 namespace browser_sync {
 
+class Cryptographer;
+
 namespace sessions {
 class ConflictProgress;
 class StatusController;
@@ -41,7 +43,8 @@ class ConflictResolver {
   ~ConflictResolver();
   // Called by the syncer at the end of a update/commit cycle.
   // Returns true if the syncer should try to apply its updates again.
-  bool ResolveConflicts(const syncable::ScopedDirLookup& dir,
+  bool ResolveConflicts(syncable::WriteTransaction* trans,
+                        const Cryptographer* cryptographer,
                         const sessions::ConflictProgress& progress,
                         sessions::StatusController* status);
 
@@ -58,9 +61,11 @@ class ConflictResolver {
   ProcessSimpleConflictResult ProcessSimpleConflict(
       syncable::WriteTransaction* trans,
       const syncable::Id& id,
+      const Cryptographer* cryptographer,
       sessions::StatusController* status);
 
-  bool ResolveSimpleConflicts(const syncable::ScopedDirLookup& dir,
+  bool ResolveSimpleConflicts(syncable::WriteTransaction* trans,
+                              const Cryptographer* cryptographer,
                               const sessions::ConflictProgress& progress,
                               sessions::StatusController* status);