diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 20:45:28 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 20:45:28 +0000 |
| commit | 4ecb2c0eb6481131d28ad9b2cd1d11b15c6d6c1c (patch) | |
| tree | 27ab77b331bfe5d3a89840d7ad96013a798634cb | |
| parent | 95a3c7152aeccc595b49aaf50dafd5b48ce227d1 (diff) | |
| download | chromium_src-4ecb2c0eb6481131d28ad9b2cd1d11b15c6d6c1c.zip chromium_src-4ecb2c0eb6481131d28ad9b2cd1d11b15c6d6c1c.tar.gz chromium_src-4ecb2c0eb6481131d28ad9b2cd1d11b15c6d6c1c.tar.bz2 | |
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
| -rw-r--r-- | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm | 3 | ||||
| -rw-r--r-- | chrome/chrome_nibs.gypi | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm index 9f60c8e..2fa31d9 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm +++ b/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 || diff --git a/chrome/chrome_nibs.gypi b/chrome/chrome_nibs.gypi index 6798563..07af8c4 100644 --- a/chrome/chrome_nibs.gypi +++ b/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', |