GitLab

The sync consent screen is skipped for non-branded (e.g. developer)
builds. We need to do this check after the check for non-GAIA and
public accounts, otherwise we try to enable sync for account types
that don't have an IdentityManager primary account.

This fixes DCHECK failures on account_id in Active Directory and
device local account tests.

This CL also adds an explicit sync consent screen test for Active
Directory accounts, because it took me a while to figure out why
unrelated AD tests were failing in sync consent code.

Bug: 1060289
Change-Id: Ief0b78ae6869349993b4427226af625591d827f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2211181
Auto-Submit: James Cook <jamescook@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773125}