[Sync] Add nigori node conflict resolution.

chrome/browser/sync/syncable/directory_manager.h

Index: chrome/browser/sync/syncable/directory_manager.h
diff --git a/chrome/browser/sync/syncable/directory_manager.h b/chrome/browser/sync/syncable/directory_manager.h
index 243000ba84eb7b7de501b43a9add87681ff790eb..29420edeac1c636569fe348ff540db5987defd57 100644
--- a/chrome/browser/sync/syncable/directory_manager.h
+++ b/chrome/browser/sync/syncable/directory_manager.h
@@ -24,6 +24,7 @@
 #include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/browser/sync/util/weak_handle.h"
 
+namespace browser_sync { class Cryptographer; }
 namespace sync_api { class BaseTransaction; }
 namespace syncable { class BaseTransaction; }
 
@@ -111,6 +112,7 @@ class ScopedDirLookup {
   }
   Directory* operator -> () const;
   operator Directory* () const;
+  DirectoryManager* manager() const;
 
  protected:  // Don't allow creation on heap, except by sync API wrapper.
   friend class sync_api::BaseTransaction;