Revert of Fix some more for= usage.

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
Committed: https://crrev.com/5a4ccee21258b2a6266375d194149ba27e80b3f7
Cr-Commit-Position: refs/heads/master@{#294765}

[jam, 2014-09-14 06:12:47]

Created Revert of Fix some more for= usage.

[commit-bot: I haz the power, 2014-09-14 06:13:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patchset/562023003/1

[commit-bot: I haz the power, 2014-09-14 06:15:38]

Committed patchset #1 (id:1) as 154a1371c702c01faf4ea991f5124c4a3879844d

[commit-bot: I haz the power, 2014-09-14 06:21:47]

Patchset 1 (id:??) landed as
https://crrev.com/5a4ccee21258b2a6266375d194149ba27e80b3f7
Cr-Commit-Position: refs/heads/master@{#294765}