Revert of Fix some more for= usage. (patchset #7 id:120001 of https://codereview.chromium.org/539383003/)

Reason for revert:
breaks linux_chromeos on try runs here and on buildbot

Original issue's description:
> Fix some more for= usage.
>
> Also fix some controlled settings indicators.
>
> BUG=409938
> R=dbeam@chromium.org
>
> Committed: https://crrev.com/ce80b519af00bb6259e8c63f91fee5263d818124
> Cr-Commit-Position: refs/heads/master@{#294681}

TBR=dbeam@chromium.org,estade@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=409938

Review URL: https://codereview.chromium.org/562023003

Cr-Commit-Position: refs/heads/master@{#294765}