Revert of sync: Add non-blocking type encryption support

sync/util/cryptographer.cc

Index: sync/util/cryptographer.cc
diff --git a/sync/util/cryptographer.cc b/sync/util/cryptographer.cc
index cb155b5536e1c13fcd9030fdd35e4a8b6b9767ee..29f378125a728bf9adb4ff0cae1e51556952f385 100644
--- a/sync/util/cryptographer.cc
+++ b/sync/util/cryptographer.cc
@@ -251,7 +251,7 @@
 
 bool Cryptographer::GetBootstrapToken(std::string* token) const {
   DCHECK(token);
-  std::string unencrypted_token = GetDefaultNigoriKeyData();
+  std::string unencrypted_token = GetDefaultNigoriKey();
   if (unencrypted_token.empty())
     return false;
 
@@ -324,11 +324,7 @@
   return false;
 }
 
-std::string Cryptographer::GetDefaultNigoriKeyName() const {
-  return default_nigori_name_;
-}
-
-std::string Cryptographer::GetDefaultNigoriKeyData() const {
+std::string Cryptographer::GetDefaultNigoriKey() const {
   if (!is_initialized())
     return std::string();
   NigoriMap::const_iterator iter = nigoris_.find(default_nigori_name_);