TBR: willchan

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50541 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 15 deletions

diff --git a/chrome/browser/sync/syncable/directory_manager.cc b/chrome/browser/sync/syncable/directory_manager.cc
index 0719c67..96578c0 100644
--- a/chrome/browser/sync/syncable/directory_manager.cc
+++ b/chrome/browser/sync/syncable/directory_manager.cc
@@ -14,8 +14,6 @@
 #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[] =
@@ -39,8 +37,7 @@ const FilePath DirectoryManager::GetSyncDataDatabasePath() const {
 DirectoryManager::DirectoryManager(const FilePath& path)
     : root_path_(path),
       managed_directory_(NULL),
-      channel_(new Channel(DirectoryManagerShutdownEvent())),
-      cryptographer_(new Cryptographer) {
+      channel_(new Channel(DirectoryManagerShutdownEvent())) {
 }
 
 DirectoryManager::~DirectoryManager() {
diff --git a/chrome/browser/sync/syncable/directory_manager.h b/chrome/browser/sync/syncable/directory_manager.h
index 61f303e..7753b1b 100644
--- a/chrome/browser/sync/syncable/directory_manager.h
+++ b/chrome/browser/sync/syncable/directory_manager.h
@@ -22,7 +22,6 @@
 #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"
 
@@ -77,10 +76,6 @@ 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);
@@ -96,9 +91,8 @@ class DirectoryManager {
 
   Channel* const channel_;
 
-  scoped_ptr<browser_sync::Cryptographer> cryptographer_;
-
  private:
+
   DISALLOW_COPY_AND_ASSIGN(DirectoryManager);
 };
 
diff --git a/chrome/browser/sync/syncable/model_type.cc b/chrome/browser/sync/syncable/model_type.cc
index a03a794..ea89bb1 100644
--- a/chrome/browser/sync/syncable/model_type.cc
+++ b/chrome/browser/sync/syncable/model_type.cc
@@ -122,10 +122,6 @@ std::string ModelTypeToString(ModelType model_type) {
       return "Typed URLs";
     case EXTENSIONS:
       return "Extensions";
-    case PASSWORDS:
-      return "Passwords";
-    case NIGORI:
-      return "Encryption keys";
     default:
       NOTREACHED() << "No known extension for model type.";
       return "INVALID";