Revert "Fix Website Settings crash with Plugins ASK setting."

Revert "Fix Website Settings crash with Plugins ASK setting."

This reverts commit 5abc69b1a406999169052b7d457de86fd67c6f8c.

Reason for revert:

The Linux GN bot failed compile:
http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20GN&number=19568

Due to error running grit:
KeyError: 'Duplicate keys: [18500]'

We have seen this error before, and it should have already been fixed
in grit's resource_ids....

I expect the problem is with GN since this failure isn't happening on
any other bot, however reverting in the meantime to make the tree green
until this is sorted out.

TBR=tommycli@chromium.org
NOTRY=true

Committed: https://crrev.com/09eafe7304589043a9b9aa34b9ef559ead1e8e59
Cr-Commit-Position: refs/heads/master@{#309567}

[eroman, 2014-12-23 18:48:53]

The CQ bit was checked by eroman@chromium.org

[commit-bot: I haz the power, 2014-12-23 18:49:28]

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

[commit-bot: I haz the power, 2014-12-23 18:50:13]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2014-12-23 18:51:05]

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

[eroman, 2014-12-23 19:21:50]

@tommycli: You are unfortunately caught in the middle of some infrastructure
problems. Following up on the issue at:

https://code.google.com/p/chromium/issues/detail?id=444902

[tommycli, 2014-12-23 19:24:04]

On 2014/12/23 19:21:50, eroman wrote:
> @tommycli: You are unfortunately caught in the middle of some infrastructure
> problems. Following up on the issue at:
> 
> https://code.google.com/p/chromium/issues/detail?id=444902

eroman: Thanks for investigating and following up. I saw the reds on the
trybots, but I assumed they were spurious and wouldn't break tree. Moving
forward, do you want me to send this through CQ again? Or do something else?

[eroman, 2014-12-23 19:28:46]

I am about to re-land your change, I have an idea on how to make the bots
healthy. Hopefully it works!

[tommycli, 2014-12-23 19:31:17]

On 2014/12/23 19:28:46, eroman wrote:
> I am about to re-land your change, I have an idea on how to make the bots
> healthy. Hopefully it works!

Thank you sir!

[chromium-reviews, 2014-12-23 19:32:04]

By the way, this https://codereview.chromium.org/819183002/ is a followup
that's due to be sent in next.

Let me know if the bots are happy with that first patch, then I'll send in
the second patch.

On Tue, Dec 23, 2014 at 11:31 AM, <tommycli@chromium.org> wrote:

> On 2014/12/23 19:28:46, eroman wrote:
>
>> I am about to re-land your change, I have an idea on how to make the bots
>> healthy. Hopefully it works!
>>
>
> Thank you sir!
>
> https://codereview.chromium.org/825753002/
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[eroman, 2014-12-23 20:33:31]

The bots are happy now (see
https://code.google.com/p/chromium/issues/detail?id=444902).

Feel free to commit any follow-ups at your leisure!