[Sync] Fix dcheck when setting sync encryption.

[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


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=107650

[akalin, 2011-10-27 20:11:33]

LGTM

http://codereview.chromium.org/8416008/diff/1/chrome/browser/sync/profile_syn...
File chrome/browser/sync/profile_sync_service.cc (right):

http://codereview.chromium.org/8416008/diff/1/chrome/browser/sync/profile_syn...
chrome/browser/sync/profile_sync_service.cc:1343: DCHECK(encrypt_everything ||
!encrypt_everything_);
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:09]

Done

http://codereview.chromium.org/8416008/diff/1/chrome/browser/sync/profile_syn...
File chrome/browser/sync/profile_sync_service.cc (right):

http://codereview.chromium.org/8416008/diff/1/chrome/browser/sync/profile_syn...
chrome/browser/sync/profile_sync_service.cc:1343: DCHECK(encrypt_everything ||
!encrypt_everything_);
On 2011/10/27 20:11:34, akalin wrote:
> this DCHECK should probably go above encryption_pending_ = encrypt_everything
> 
> Also, what about:
> 
> if (encrypt_everything_) {
>   DCHECK(encrypt_everything);
> }

Done.

[commit-bot: I haz the power, 2011-10-27 20:54:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/8416008/4001

[commit-bot: I haz the power, 2011-10-27 21:49:59]

Try job failure for 8416008-4001 (retry) on linux_rel for step "ui_tests".
It's a second try, previously, step "ui_tests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...

[commit-bot: I haz the power, 2011-10-27 22:32:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/8416008/4001

[commit-bot: I haz the power, 2011-10-27 23:31:55]

Change committed as 107650