[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..de7e1c75a5c5bd183cf7249463419d22cd318593 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1337,10 +1337,11 @@ void ProfileSyncService::SetEncryptEverything(bool encrypt_everything) {
   // must check that instead of |backend_initialized_|.
   // TODO(akalin): Fix the above. :/
   DCHECK(sync_initialized());
-  encryption_pending_ = encrypt_everything;
   // Callers shouldn't try to disable encrypt everything once it has
   // already succeeded.
-  DCHECK(!encrypt_everything_);
+  if (!encrypt_everything)
+    DCHECK(!encrypt_everything_);
+  encryption_pending_ = encrypt_everything;
 }
 
 bool ProfileSyncService::encryption_pending() const {