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

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2011 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/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 415 matching lines @@
                        credentials,
                        delete_sync_data_folder,
                        notifier_options_);
 }
 
 void ProfileSyncService::CreateBackend() {
   backend_.reset(new SyncBackendHost(profile_));
 }
 
 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() {
   // Don't start up multiple times.
   if (backend_.get()) {
     VLOG(1) << "Skipping bringing up backend host.";
     return;
   }
 
   DCHECK(AreCredentialsAvailable());
@@ skipping 293 matching lines @@
   data_type_manager_->Configure(types);
 
   NotifyObservers();
   observed_passphrase_required_ = false;
   tried_setting_explicit_passphrase_ = false;
   tried_creating_explicit_passphrase_ = false;
 
   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.
     Browser* browser = BrowserList::GetLastActiveWithProfile(profile());
     if (browser)
       browser->ShowOptionsTab(chrome::kPersonalOptionsSubPage);
     return;
   }
 
   if (WizardIsVisible()) {
@@ skipping 399 matching lines @@
     cached_passphrase_.is_explicit = is_explicit;
     cached_passphrase_.is_creation = is_creation;
   }
 
   if (is_explicit && is_creation)
     tried_creating_explicit_passphrase_ = true;
   else if (is_explicit)
     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) {
   switch (type.value) {
     case NotificationType::SYNC_CONFIGURE_START: {
       NotifyObservers();
       // TODO(sync): Maybe toast?
       break;
     }
     case NotificationType::SYNC_CONFIGURE_DONE: {
@@ skipping 135 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }