Revert 75287 - [Sync] Initial support for encrypting any datatype (no UI hook...

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
===================================================================
--- chrome/browser/sync/profile_sync_service.cc	(revision 75295)
+++ chrome/browser/sync/profile_sync_service.cc	(working copy)
@@ -433,7 +433,11 @@
 }
 
 bool ProfileSyncService::IsEncryptedDatatypeEnabled() const {
-  return encrypted_types_.size() > 0;
+  // Currently on passwords are an encrypted datatype, so
+  // we check to see if it is enabled.
+  syncable::ModelTypeSet types;
+  GetPreferredDataTypes(&types);
+  return types.count(syncable::PASSWORDS) != 0;
 }
 
 void ProfileSyncService::StartUp() {
@@ -747,14 +751,6 @@
   wizard_.Step(SyncSetupWizard::DONE);
 }
 
-void ProfileSyncService::OnEncryptionComplete(
-    const syncable::ModelTypeSet& encrypted_types) {
-  if (encrypted_types_ != encrypted_types) {
-    encrypted_types_ = encrypted_types;
-    NotifyObservers();
-  }
-}
-
 void ProfileSyncService::ShowLoginDialog(gfx::NativeWindow parent_window) {
   if (!cros_user_.empty()) {
     // For ChromeOS, any login UI needs to be handled by the settings page.
@@ -1174,16 +1170,6 @@
     tried_setting_explicit_passphrase_ = true;
 }
 
-void ProfileSyncService::EncryptDataTypes(
-    const syncable::ModelTypeSet& encrypted_types) {
-  backend_->EncryptDataTypes(encrypted_types);
-}
-
-void ProfileSyncService::GetEncryptedDataTypes(
-    syncable::ModelTypeSet* encrypted_types) const {
-  *encrypted_types = encrypted_types_;
-}
-
 void ProfileSyncService::Observe(NotificationType type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {