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

chrome/browser/sync/profile_sync_service_harness.cc

Index: chrome/browser/sync/profile_sync_service_harness.cc
diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc
index 95eaff179992291f3dd132f4a1a61044bb8f72ec..7c482f01ff1b61a0f71b4ba67782660e430124fd 100644
--- a/chrome/browser/sync/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/profile_sync_service_harness.cc
@@ -288,6 +288,12 @@ bool ProfileSyncServiceHarness::RunStateChangeMachine() {
       LogClientInfo("SYNC_DISABLED");
       break;
     }
+    case WAITING_FOR_ENCRYPTION: {
+      // Sync has finished encrypting the datatypes. There is nothing to do.

[Raghu Simha, 2011/02/14 05:29:52]

This seems wrong. Just because you're in RunStateChangeMachine() in the
WAITING_FOR_ENCRYPTION state doesn't necessarily mean that encryption is
complete. I'd imagine this state would be implemented similar to
WAITING_FOR_INITIAL_SYNC, where you check if a condition is satisfied before
calling SignalStateCompleteWithNextState. In this case, I'd imagine the
condition to be IsTypeEncrypted(), although you'd need to devise a way of
knowing which type you're waiting on.

[Nicolas Zea, 2011/02/14 21:18:41]

Done.

+      LogClientInfo("WAITING_FOR_ENCRYPTION");
+      SignalStateCompleteWithNextState(FULLY_SYNCED);
+      break;
+    }
     default:
       // Invalid state during observer callback which may be triggered by other
       // classes using the the UI message loop.  Defer to their handling.
@@ -597,3 +603,38 @@ void ProfileSyncServiceHarness::LogClientInfo(std::string message) {
             << ": Sync service not available.";
   }
 }
+
+bool ProfileSyncServiceHarness::EnableEncryptionForType(
+    syncable::ModelType type) {
+  syncable::ModelTypeSet encrypted_types;
+  service_->GetEncryptedDataTypes(&encrypted_types);
+  encrypted_types.insert(type);
+  service_->EncryptDataTypes(encrypted_types);
+
+  // Wait some time to let the enryption finish.
+  std::string reason = "Waiting for encryption.";
+  wait_state_ = WAITING_FOR_ENCRYPTION;
+  if (!AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs, reason)) {
+    LOG(ERROR) << "Did not receive EncryptionComplete notification after"
+               << kLiveSyncOperationTimeoutMs / 1000
+               << " seconds.";
+    return false;
+  }
+
+  syncable::ModelTypeSet newly_encrypted_types;
+  service_->GetEncryptedDataTypes(&newly_encrypted_types);
+  if (newly_encrypted_types != encrypted_types) {
+    return false;
+  }

[Raghu Simha, 2011/02/14 05:29:52]

The above block seems to be doing the same as IsTypeEncrypted(). Why not replace
it with a call to the method?

[Nicolas Zea, 2011/02/14 21:18:41]

Done.

+
+  return true;
+}
+
+bool ProfileSyncServiceHarness::IsTypeEncrypted(syncable::ModelType type) {
+  syncable::ModelTypeSet encrypted_types;
+  service_->GetEncryptedDataTypes(&encrypted_types);
+  if (encrypted_types.count(type) == 0) {
+    return false;
+  }
+  return true;
+}