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

chrome/browser/sync/profile_sync_service_harness.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 96 matching lines @@
 
   // Enables sync for all sync datatypes.
   void EnableSyncForAllDatatypes();
 
   // Disables sync for all sync datatypes.
   void DisableSyncForAllDatatypes();
 
   // Returns a snapshot of the current sync session.
   const SyncSessionSnapshot* GetLastSessionSnapshot() const;
 
-  // Encrypt the datatype |type|. This method will block while the sync backend
-  // host performs the encryption or a timeout is reached. Returns false if
-  // encryption failed, else true.
-  // Note: this method does not currently support tracking encryption status
-  // while other sync activities are being performed. Sync should be fully
-  // synced when this is called.
-  bool EnableEncryptionForType(syncable::ModelType type);
-
-  // Check if |type| is encrypted.
-  bool IsTypeEncrypted(syncable::ModelType type);
-
  private:
   friend class StateChangeTimeoutEvent;
 
   enum WaitState {
     // The sync client has just been initialized.
     INITIAL_WAIT_STATE = 0,
 
     // The sync client awaits the OnBackendInitialized() callback.
     WAITING_FOR_ON_BACKEND_INITIALIZED,
 
     // Waiting for a passphrase to be required.
     WAITING_FOR_PASSPHRASE_REQUIRED,
 
     // Waiting for a set passphrase to be accepted by the cryptographer.
     WAITING_FOR_PASSPHRASE_ACCEPTED,
 
     // The sync client is waiting for the first sync cycle to complete.
     WAITING_FOR_INITIAL_SYNC,
 
     // The sync client is waiting for an ongoing sync cycle to complete.
     WAITING_FOR_SYNC_TO_FINISH,
 
     // The sync client anticipates incoming updates leading to a new sync cycle.
     WAITING_FOR_UPDATES,
 
-    // The sync client anticipates encryption of new datatypes.
-    WAITING_FOR_ENCRYPTION,
-
     // The sync client cannot reach the server.
     SERVER_UNREACHABLE,
 
     // The sync client is fully synced and there are no pending updates.
     FULLY_SYNCED,
 
     // Syncing is disabled for the client.
     SYNC_DISABLED,
 
     NUMBER_OF_STATES,
@@ skipping 20 matching lines @@
   // other client has.
   bool MatchesOtherClient(ProfileSyncServiceHarness* partner);
 
   // Logs message with relevant info about client's sync state (if available).
   void LogClientInfo(std::string message);
 
   // Gets the current progress indicator of the current sync session
   // for a particular datatype.
   std::string GetUpdatedTimestamp(syncable::ModelType model_type);
 
-  // When in WAITING_FOR_ENCRYPTION state, we check to see if this type is now
-  // encrypted to determine if we're done.
-  syncable::ModelType waiting_for_encryption_type_;
-
   WaitState wait_state_;
 
   Profile* profile_;
   ProfileSyncService* service_;
 
   // The harness of the client whose update progress marker we're expecting
   // eventually match.
   ProfileSyncServiceHarness* timestamp_match_partner_;
 
   // Credentials used for GAIA authentication.
   std::string username_;
   std::string password_;
 
   // Client ID, used for logging purposes.
   int id_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceHarness);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_