[Sync] Add nigori node conflict resolution.

chrome/browser/sync/syncable/directory_manager.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/syncable/directory_manager.h"
 
 #include <map>
 #include <set>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #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;
 
 namespace syncable {
 
 static const FilePath::CharType kSyncDataDatabaseFilename[] =
     FILE_PATH_LITERAL("SyncData.sqlite3");
 
 // static
 const FilePath DirectoryManager::GetSyncDataDatabaseFilename() {
@@ skipping 110 matching lines @@
   DCHECK(good_);
   return dir_;
 }
 
 ScopedDirLookup::operator Directory* () const {
   CHECK(good_checked_);
   DCHECK(good_);
   return dir_;
 }
 
+DirectoryManager* ScopedDirLookup::manager() const {
+  return dirman_;
+}
+
 }  // namespace syncable