Fix ContentSettingBubbleControllerTest.Init

Fix ContentSettingBubbleControllerTest.Init

BUG=175629
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=182001

[Nico, 2013-02-12 01:20:03]

Still trying to understand how this could ever work.

[sail, 2013-02-12 01:51:41]

LGTM Thanks for the fix.

[Nico, 2013-02-12 02:02:21]

On second thought, maybe bauerb meant to use ContentBlockedSimple for the media
bubble too?

bauerb: Which change is right: The mm change or the gypi change in patch set 2?

[markusheintz_, 2013-02-12 08:47:11]

On 2013/02/12 02:02:21, Nico wrote:
> On second thought, maybe bauerb meant to use ContentBlockedSimple for the
media
> bubble too?
> 
> bauerb: Which change is right: The mm change or the gypi change in patch set
2?

The change in the mm is wrong! We need the ContentBlockedMedia.xib file. There
are more changes comming that add more content to this bubble which makes it
considerably different to ContentBlockedSimple.

[Nico, 2013-02-12 19:37:26]

On 2013/02/12 08:47:11, markusheintz_ wrote:
> On 2013/02/12 02:02:21, Nico wrote:
> > On second thought, maybe bauerb meant to use ContentBlockedSimple for the
> media
> > bubble too? 
> > 
> > bauerb: Which change is right: The mm change or the gypi change in patch set
> 2?
> 
> The change in the mm is wrong! We need the ContentBlockedMedia.xib file. There
> are more changes comming that add more content to this bubble which makes it
> considerably different to ContentBlockedSimple.

Ok, I'll move forward with my original fix then. bauerb: Shout if you think this
is wrong.

[commit-bot: I haz the power, 2013-02-12 19:40:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/12209110/4002

[Bernhard Bauer, 2013-02-12 21:29:10]

LGTM, just one nit:

https://codereview.chromium.org/12209110/diff/4001/chrome/browser/ui/cocoa/co...
File
chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm
(right):

https://codereview.chromium.org/12209110/diff/4001/chrome/browser/ui/cocoa/co...
chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm:58:
// Disabled: started failing after CONTENT_SETTINGS_TYPE_INTENTS was removed.
Nit: remove this comment now?