[Sync] Add nigori node conflict resolution.

chrome/browser/sync/syncable/directory_manager.h

 // 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.
 //
 // This used to do a lot of TLS-based management of multiple Directory objects.
 // We now can access Directory objects from any thread for general purpose
 // operations and we only ever have one Directory, so this class isn't doing
 // anything too fancy besides keeping calling and access conventions the same
 // for now.
 // TODO(timsteele): We can probably nuke this entire class and use raw
 // Directory objects everywhere.
 #ifndef CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_
 #define CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/sync/syncable/dir_open_result.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #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; }
 
 namespace syncable {
 
 class DirectoryChangeDelegate;
 
 class DirectoryManager {
  public:
 
@@ skipping 67 matching lines @@
  public:
   ScopedDirLookup(DirectoryManager* dirman, const std::string& name);
   ~ScopedDirLookup();
 
   inline bool good() {
     good_checked_ = true;
     return good_;
   }
   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;
   void* operator new(size_t size) { return (::operator new)(size); }
 
   Directory* dir_;
   bool good_;
   // Ensure that the programmer checks good before using the ScopedDirLookup.
   // This member should can be removed if it ever shows up in profiling
   bool good_checked_;
   DirectoryManager* const dirman_;
 };
 
 }  // namespace syncable
 
 #endif  // CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_