[Sync] Fix dcheck when setting sync encryption.

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 123c80fecbb0955583245862c980fdb43f6ac0e1..be283205517485766a3ce6cb3454948ada94ed9b 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1340,7 +1340,7 @@ void ProfileSyncService::SetEncryptEverything(bool encrypt_everything) {
   encryption_pending_ = encrypt_everything;
   // Callers shouldn't try to disable encrypt everything once it has
   // already succeeded.
-  DCHECK(!encrypt_everything_);
+  DCHECK(encrypt_everything || !encrypt_everything_);

[akalin, 2011/10/27 20:11:34]

this DCHECK should probably go above encryption_pending_ = encrypt_everything

Also, what about:

if (encrypt_everything_) {
  DCHECK(encrypt_everything);
}

[Nicolas Zea, 2011/10/27 20:54:10]

Done.

 }
 
 bool ProfileSyncService::encryption_pending() const {