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

chrome/browser/sync/profile_sync_service.h

Index: chrome/browser/sync/profile_sync_service.h
===================================================================
--- chrome/browser/sync/profile_sync_service.h	(revision 75295)
+++ chrome/browser/sync/profile_sync_service.h	(working copy)
@@ -190,8 +190,6 @@
   virtual void OnClearServerDataSucceeded();
   virtual void OnPassphraseRequired(bool for_decryption);
   virtual void OnPassphraseAccepted();
-  virtual void OnEncryptionComplete(
-      const syncable::ModelTypeSet& encrypted_types);
 
   // Called when a user enters credentials through UI.
   virtual void OnUserSubmittedAuth(const std::string& username,
@@ -436,19 +434,6 @@
                              bool is_explicit,
                              bool is_creation);
 
-  // Changes the set of datatypes that require encryption. This affects all
-  // machines synced to this account and all data belonging to the specified
-  // types.
-  // Note that this is an asynchronous operation (the encryption of data is
-  // performed on SyncBackendHost's core thread) and may not have an immediate
-  // effect.
-  virtual void EncryptDataTypes(
-      const syncable::ModelTypeSet& encrypted_types);
-
-  // Get the currently encrypted data types.
-  virtual void GetEncryptedDataTypes(
-      syncable::ModelTypeSet* encrypted_types) const;
-
   // Returns whether processing changes is allowed.  Check this before doing
   // any model-modifying operations.
   bool ShouldPushChanges();
@@ -655,10 +640,6 @@
   // is reworked to allow one-shot commands like clearing server data.
   base::OneShotTimer<ProfileSyncService> clear_server_data_timer_;
 
-  // The set of encrypted types. This is updated whenever datatypes are
-  // encrypted through the OnEncryptionComplete callback of SyncFrontend.
-  syncable::ModelTypeSet encrypted_types_;
-
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };