Take 2: sync changes to support encryption

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 7753b1b5a3bf9fba9e0209480e62db42f287db09..61f303e4dd578e81c33f1ac4674847a1ae5c57f6 100644
--- a/chrome/browser/sync/syncable/directory_manager.h
+++ b/chrome/browser/sync/syncable/directory_manager.h
@@ -22,6 +22,7 @@
 #include "chrome/browser/sync/syncable/dir_open_result.h"
 #include "chrome/browser/sync/syncable/path_name_cmp.h"
 #include "chrome/browser/sync/syncable/syncable.h"
+#include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/browser/sync/util/sync_types.h"
 #include "chrome/common/deprecated/event_sys.h"
 
@@ -76,6 +77,10 @@ class DirectoryManager {
 
   Channel* channel() const { return channel_; }
 
+  browser_sync::Cryptographer* cryptographer() const {
+    return cryptographer_.get();
+  }
+
  protected:
   DirOpenResult OpenImpl(const std::string& name, const FilePath& path,
                          bool* was_open);
@@ -91,8 +96,9 @@ class DirectoryManager {
 
   Channel* const channel_;
 
- private:
+  scoped_ptr<browser_sync::Cryptographer> cryptographer_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(DirectoryManager);
 };