[Sync] Initial support for encrypting any datatype (no UI hookup yet).

chrome/browser/sync/profile_sync_service_harness.h

Index: chrome/browser/sync/profile_sync_service_harness.h
diff --git a/chrome/browser/sync/profile_sync_service_harness.h b/chrome/browser/sync/profile_sync_service_harness.h
index ddbfbe22f85dbfe6e0093289fa213078819d352f..04f1c9b193e9ef29106e9e7b4f097d2d4347e2a2 100644
--- a/chrome/browser/sync/profile_sync_service_harness.h
+++ b/chrome/browser/sync/profile_sync_service_harness.h
@@ -114,6 +114,14 @@ class ProfileSyncServiceHarness : public ProfileSyncServiceObserver {
   // 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.
+  bool EnableEncryptionForType(syncable::ModelType type);
+
+  // Check if |type| is encrypted.
+  bool IsTypeEncrypted(syncable::ModelType type);
+
  private:
   friend class StateChangeTimeoutEvent;
 
@@ -139,6 +147,9 @@ class ProfileSyncServiceHarness : public ProfileSyncServiceObserver {
     // 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,
 
@@ -179,6 +190,10 @@ class ProfileSyncServiceHarness : public ProfileSyncServiceObserver {
   // 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_;

[Raghu Simha, 2011/02/14 22:56:51]

It looks like you're always setting this member before reading its value, but
I'd still recommend initializing it in the constructor.

[Nicolas Zea, 2011/02/15 19:52:18]

Done.

+
   WaitState wait_state_;
 
   Profile* profile_;