Fix ContentSettingBubbleControllerTest.Init

BUG=175629

Review URL: https://codereview.chromium.org/12209110

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182001 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

@@ -56,8 +56,7 @@ ContentSettingBubbleControllerTest::~ContentSettingBubbleControllerTest() {
 
 // Check that the bubble doesn't crash or leak for any settings type
 // Disabled: started failing after CONTENT_SETTINGS_TYPE_INTENTS was removed.
-// https://code.google.com/p/chromium/issues/detail?id=175629
-TEST_F(ContentSettingBubbleControllerTest, DISABLED_Init) {
+TEST_F(ContentSettingBubbleControllerTest, Init) {
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     if (i == CONTENT_SETTINGS_TYPE_NOTIFICATIONS ||
         i == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE ||

chrome/chrome_nibs.gypi

@@ -18,6 +18,7 @@
       'app/nibs/ChromeToMobileBubble.xib',
       'app/nibs/CollectedCookies.xib',
       'app/nibs/ContentBlockedCookies.xib',
+      'app/nibs/ContentBlockedMedia.xib',
       'app/nibs/ContentBlockedMixedScript.xib',
       'app/nibs/ContentBlockedPlugins.xib',
       'app/nibs/ContentBlockedPopups.xib',