Take 2: sync changes to support encryption

chrome/browser/sync/syncable/directory_manager.cc

 // Copyright (c) 2009 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/port.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/common/deprecated/event_sys-inl.h"
 
+using browser_sync::Cryptographer;
+
 namespace syncable {
 
 static const FilePath::CharType kSyncDataDatabaseFilename[] =
     FILE_PATH_LITERAL("SyncData.sqlite3");
 
 DirectoryManagerEvent DirectoryManagerShutdownEvent() {
   DirectoryManagerEvent event;
   event.what_happened = DirectoryManagerEvent::SHUTDOWN;
   return event;
 }
 
 // static
 const FilePath DirectoryManager::GetSyncDataDatabaseFilename() {
   return FilePath(kSyncDataDatabaseFilename);
 }
 
 const FilePath DirectoryManager::GetSyncDataDatabasePath() const {
   return root_path_.Append(GetSyncDataDatabaseFilename());
 }
 
 DirectoryManager::DirectoryManager(const FilePath& path)
     : root_path_(path),
       managed_directory_(NULL),
-      channel_(new Channel(DirectoryManagerShutdownEvent())) {
+      channel_(new Channel(DirectoryManagerShutdownEvent())),
+      cryptographer_(new Cryptographer) {
 }
 
 DirectoryManager::~DirectoryManager() {
   AutoLock lock(lock_);
   DCHECK_EQ(managed_directory_, static_cast<Directory*>(NULL))
       << "Dir " << managed_directory_->name() << " not closed!";
   delete channel_;
 }
 
 bool DirectoryManager::Open(const std::string& name) {
@@ skipping 95 matching lines @@
   return dir_;
 }
 
 ScopedDirLookup::operator Directory* () const {
   CHECK(good_checked_);
   DCHECK(good_);
   return dir_;
 }
 
 }  // namespace syncable