Fix WaitForTypeEncryption race condition

chrome/browser/sync/profile_sync_service_harness.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <iterator>
 #include <ostream>
@@ skipping 984 matching lines @@
       (syncable::MODEL_TYPE_COUNT - syncable::FIRST_REAL_MODEL_TYPE));
   service_->OnUserChoseDatatypes(sync_everything,
                                  synced_datatypes);
 
   // Wait some time to let the enryption finish.
   return WaitForTypeEncryption(type);
 }
 
 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;
   }
 
   std::string reason = "Waiting for encryption.";
   wait_state_ = WAITING_FOR_ENCRYPTION;
   waiting_for_encryption_type_ = type;
   if (!AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs, reason)) {
     LOG(ERROR) << "Did not receive EncryptionComplete notification after"
@@ skipping 22 matching lines @@
   return (synced_types.count(type) != 0);
 }
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   DictionaryValue value;
   sync_ui_util::ConstructAboutInformation(service_, &value);
   std::string service_status;
   base::JSONWriter::Write(&value, true, &service_status);
   return service_status;
 }