[Sync] Fix dcheck when setting sync encryption.

It's valid to call SetEncryptEverything after turning on encryption as long
as you're not trying to turn it off.

BUG=none
TEST=set a custom passphrase after turning on encryption


Review URL: http://codereview.chromium.org/8416008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107650 0039d316-1c4b-4281-b951-d872f2087c98

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 {