diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-17 02:40:41 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-17 02:40:41 +0000 |
| commit | 19633ea2811595f1e9d82f2b131cac4fa23dba38 (patch) | |
| tree | aedaf6d11f93edb28edc347272da75413d422f21 /ash | |
| parent | 406203d804cfd1c0ff1b74bced465700df5a531b (diff) | |
| download | chromium_src-19633ea2811595f1e9d82f2b131cac4fa23dba38.zip chromium_src-19633ea2811595f1e9d82f2b131cac4fa23dba38.tar.gz chromium_src-19633ea2811595f1e9d82f2b131cac4fa23dba38.tar.bz2 | |
Disable the crashy SystemTrayTest tests on all the platforms because of a real use-after-free.
BUG=127539
TBR=stevenjb
Review URL: https://chromiumcodereview.appspot.com/10563016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142627 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/system/tray/system_tray_unittest.cc | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc index 6ba8f0e..4499da7 100644 --- a/ash/system/tray/system_tray_unittest.cc +++ b/ash/system/tray/system_tray_unittest.cc @@ -103,14 +103,8 @@ TEST_F(SystemTrayTest, SystemTrayDefaultView) { ASSERT_FALSE(tray->CloseBubbleForTest()); } -#if defined(OS_WIN) -// This test is crashing on windows. See http://crbug.com/127539. -#define MAYBE_SystemTrayTestItems DISABLED_SystemTrayTestItems -#else -#define MAYBE_SystemTrayTestItems SystemTrayTestItems -#endif - -TEST_F(SystemTrayTest, MAYBE_SystemTrayTestItems) { +// Disabled due to a use-after-free, see http://crbug.com/127539. +TEST_F(SystemTrayTest, DISABLED_SystemTrayTestItems) { SystemTray* tray = GetSystemTray(); ASSERT_TRUE(tray->GetWidget()); @@ -202,14 +196,8 @@ TEST_F(SystemTrayTest, DISABLED_SystemTrayNotifications) { ASSERT_TRUE(test_item->notification_view() != NULL); } -#if defined(OS_WIN) -// This test is crashing on windows. See http://crbug.com/127539. -#define MAYBE_BubbleCreationTypesTest DISABLED_BubbleCreationTypesTest -#else -#define MAYBE_BubbleCreationTypesTest BubbleCreationTypesTest -#endif - -TEST_F(SystemTrayTest, MAYBE_BubbleCreationTypesTest) { +// Disabled due to a use-after-free, see http://crbug.com/127539. +TEST_F(SystemTrayTest, DISABLED_BubbleCreationTypesTest) { SystemTray* tray = GetSystemTray(); ASSERT_TRUE(tray->GetWidget()); |