GitLab

Consolidate lists in chrome/browser/prefs/browser_prefs.cc.

In browser_prefs.cc, both RegisterLocalState() and
RegisterProfilePrefs() have lists of registration functions to call.
Over time, these pile up so there are now repeated #if cond blocks.
Consolidate those and also alphabetize some of the lists that are
clearly unsorted. Fix a lint error as well.

Change-Id: Ifef2f127fe59e9571bf693efa0421789b0a2cfb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1994670Reviewed-by: Dominic Battré <battre@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730197}