Fix WaitForTypeEncryption race condition

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 881c7256a5deedf2fab0b8467651b7529e4b8061..1fd917664b074fe21c884bd295020c9897c744af 100644
--- a/chrome/browser/sync/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/profile_sync_service_harness.cc
@@ -1002,8 +1002,8 @@ bool ProfileSyncServiceHarness::EnableEncryptionForType(
 
 bool ProfileSyncServiceHarness::WaitForTypeEncryption(
     syncable::ModelType type) {
-  if (IsSynced() &&
-      IsTypeEncrypted(type) &&
+  if (IsTypeEncrypted(type) &&

[akalin, 2011/09/22 18:12:05]

Can you add a comment for this?  This can easily be unknowingly reverted.

Also, maybe a TODO to figure out a better way to do this.

[rlarocque, 2011/09/22 19:05:58]

Done.

+      IsSynced() &&
       GetLastSessionSnapshot()->num_conflicting_updates == 0) {
     // Encryption is already complete for |type|; do not wait.
     return true;