[Sync] Add nigori node conflict resolution.

chrome/browser/sync/syncable/directory_manager.cc

Index: chrome/browser/sync/syncable/directory_manager.cc
diff --git a/chrome/browser/sync/syncable/directory_manager.cc b/chrome/browser/sync/syncable/directory_manager.cc
index c207b3c52c35859bb68a4687d2a1d7f62a6dfee3..2bdb6279ef3943b498cbba4d3706276b338c8a7d 100644
--- a/chrome/browser/sync/syncable/directory_manager.cc
+++ b/chrome/browser/sync/syncable/directory_manager.cc
@@ -13,6 +13,7 @@
 #include "base/port.h"
 #include "base/string_util.h"
 #include "chrome/browser/sync/syncable/syncable.h"
+#include "chrome/browser/sync/util/cryptographer.h"
 
 using browser_sync::Cryptographer;
 
@@ -143,4 +144,8 @@ ScopedDirLookup::operator Directory* () const {
   return dir_;
 }
 
+DirectoryManager* ScopedDirLookup::manager() const {
+  return dirman_;
+}
+
 }  // namespace syncable