Revamp desktop Autofill settings, round 2

Revamp desktop Autofill settings, round 2

BUG=446698
NOPRESUBMIT=true

Committed: https://crrev.com/884a7f0a7db9c0d7c95038e191a2c0d1c9920f2b
Cr-Commit-Position: refs/heads/master@{#320573}

[Evan Stade, 2015-03-12 23:06:48]

estade@chromium.org changed reviewers:
+ rouslan@chromium.org

[please use gerrit instead, 2015-03-13 18:25:52]

https://codereview.chromium.org/1001043004/diff/40001/chrome/app/generated_re...
File chrome/app/generated_resources.grd (right):

https://codereview.chromium.org/1001043004/diff/40001/chrome/app/generated_re...
chrome/app/generated_resources.grd:10506: +<<<<<<< HEAD
Please fix.

[please use gerrit instead, 2015-03-13 19:27:30]

lgtm

[Evan Stade, 2015-03-13 19:29:59]

The CQ bit was checked by estade@chromium.org

[commit-bot: I haz the power, 2015-03-13 19:30:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1001043004/60001

[commit-bot: I haz the power, 2015-03-13 19:39:24]

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

[commit-bot: I haz the power, 2015-03-13 19:39:25]

Try jobs failed on following builders:
  ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)

[Evan Stade, 2015-03-13 19:53:27]

The CQ bit was checked by estade@chromium.org

[Evan Stade, 2015-03-13 19:53:28]

The patchset sent to the CQ was uploaded after l-g-t-m from rouslan@chromium.org
Link to the patchset: https://codereview.chromium.org/1001043004/#ps80001
(title: "fix unittest")

[commit-bot: I haz the power, 2015-03-13 19:53:55]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1001043004/80001

[commit-bot: I haz the power, 2015-03-13 20:13:47]

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

[commit-bot: I haz the power, 2015-03-13 20:13:48]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[Evan Stade, 2015-03-13 20:45:43]

The CQ bit was checked by estade@chromium.org

[commit-bot: I haz the power, 2015-03-13 20:45:54]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1001043004/80001

[commit-bot: I haz the power, 2015-03-13 21:06:19]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2015-03-13 21:08:10]

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