diff options
| author | koss@chromium.org <koss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 05:39:41 +0000 |
|---|---|---|
| committer | koss@chromium.org <koss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 05:39:41 +0000 |
| commit | 1b3ee24351430ea49ecc0cb52a4a0ca39ad5a8af (patch) | |
| tree | ce33ce1d5da429fa2673ea66e9acdba4373e1b2d | |
| parent | dbb03fbe591bdf4e711af10c3e8233e68b29ee49 (diff) | |
| download | chromium_src-1b3ee24351430ea49ecc0cb52a4a0ca39ad5a8af.zip chromium_src-1b3ee24351430ea49ecc0cb52a4a0ca39ad5a8af.tar.gz chromium_src-1b3ee24351430ea49ecc0cb52a4a0ca39ad5a8af.tar.bz2 | |
Re-enable ManuallyCloseMessageCenter in linux aura builds.
Test tuns without errors or warning on my machine.
BUG=163931
Review URL: https://codereview.chromium.org/163433014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251543 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc index c4ea34d..e9a26ed 100644 --- a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc +++ b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc @@ -218,15 +218,8 @@ IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, MAYBE_ManyPopupNotifications) { EXPECT_EQ(kMaxVisiblePopupNotifications, popups.size()); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) -// TODO(erg): linux_aura bringup: http://crbug.com/163931 -#define MAYBE_ManuallyCloseMessageCenter DISABLED_ManuallyCloseMessageCenter -#else -#define MAYBE_ManuallyCloseMessageCenter ManuallyCloseMessageCenter -#endif - IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, - MAYBE_ManuallyCloseMessageCenter) { + ManuallyCloseMessageCenter) { NotificationUIManager* manager = g_browser_process->notification_ui_manager(); ASSERT_TRUE(manager->DelegatesToMessageCenter()); MessageCenterNotificationManager* mc_manager = |