diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 03:24:28 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 03:24:28 +0000 |
| commit | 1d2bb3da1250a11a2af4c645e71d8d34f192ef2f (patch) | |
| tree | 97c8c4d9ce629d489820f4c73ae72bbf55e487d5 | |
| parent | 263245320cd5179f10e1c38ec52e6b33ef52387a (diff) | |
| download | chromium_src-1d2bb3da1250a11a2af4c645e71d8d34f192ef2f.zip chromium_src-1d2bb3da1250a11a2af4c645e71d8d34f192ef2f.tar.gz chromium_src-1d2bb3da1250a11a2af4c645e71d8d34f192ef2f.tar.bz2 | |
Disable ContentSettingBubbleControolerTest.Init
It starts failing non-ASAN Mac.
WebKit blamelist r120956:r120957
Chrome blamelist r143425:r143434
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#testType=browser_tests&tests=ContentSettingBubbleControllerTest.Init
BUG=crbug.com/134060
TEST=none
TBR=cevans
Review URL: https://chromiumcodereview.appspot.com/10635018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143524 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm | 10 |
1 files changed, 2 insertions, 8 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 8131bde..77e5833 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 @@ -54,15 +54,9 @@ ContentSettingBubbleControllerTest::ContentSettingBubbleControllerTest() ContentSettingBubbleControllerTest::~ContentSettingBubbleControllerTest() { } -// Fails under ASan, http://crbug.com/134060. -#if defined(ADDRESS_SANITIZER) -#define MAYBE_Init DISABLED_Init -#else -#define MAYBE_Init Init -#endif - // Check that the bubble doesn't crash or leak for any settings type -TEST_F(ContentSettingBubbleControllerTest, MAYBE_Init) { +// http://crbug.com/134060. +TEST_F(ContentSettingBubbleControllerTest, DISABLED_Init) { for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { if (i == CONTENT_SETTINGS_TYPE_NOTIFICATIONS || i == CONTENT_SETTINGS_TYPE_INTENTS || |