reland ce80b519af00bb6259e8c63f91fee5263d818124 with fix for failed test.

reland ce80b519af00bb6259e8c63f91fee5263d818124 with fix for failed test.

Fix some more for= usage.

Also fix some controlled settings indicators.

BUG=409938
R=dbeam@chromium.org

Committed: https://crrev.com/8b2bcd7696a1edcc67caa79f89c8069766f2c4e7
Cr-Commit-Position: refs/heads/master@{#295201}

[Dan Beam, 2014-09-16 21:39:55]

lgtm

[Evan Stade, 2014-09-16 22:01:15]

The CQ bit was checked by estade@chromium.org

[commit-bot: I haz the power, 2014-09-16 22:02:34]

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

[commit-bot: I haz the power, 2014-09-16 22:08:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-16 22:08:53]

Try jobs failed on following builders:
  android_arm64_dbg_recipe on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_arm64_d...)
  android_clang_dbg_recipe on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_clang_d...)
  chromium_presubmit on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)
  ios_rel_device_ninja on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)

[Evan Stade, 2014-09-16 23:14:34]

The CQ bit was checked by estade@chromium.org

[commit-bot: I haz the power, 2014-09-16 23:16:57]

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

[commit-bot: I haz the power, 2014-09-17 01:03:04]

Committed patchset #3 (id:40001) as f92788ed49642d596e4f892f18a9fdd2a5029fea

[commit-bot: I haz the power, 2014-09-17 01:04:04]

Patchset 3 (id:??) landed as
https://crrev.com/8b2bcd7696a1edcc67caa79f89c8069766f2c4e7
Cr-Commit-Position: refs/heads/master@{#295201}