| Index: ash/system/web_notification/web_notification_tray_unittest.cc
|
| diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc
|
| index 1e8dca66116ac2ca88ad6d77e7dd9a4e05914b5a..6b5706e60b54f0da480345dbe1d06c65fd9d610b 100644
|
| --- a/ash/system/web_notification/web_notification_tray_unittest.cc
|
| +++ b/ash/system/web_notification/web_notification_tray_unittest.cc
|
| @@ -20,17 +20,12 @@
|
| #include "ui/message_center/notification_list.h"
|
| #include "ui/message_center/notification_types.h"
|
| #include "ui/message_center/views/message_center_bubble.h"
|
| -#include "ui/message_center/views/message_popup_bubble.h"
|
| #include "ui/message_center/views/message_popup_collection.h"
|
| #include "ui/views/controls/label.h"
|
| #include "ui/views/layout/fill_layout.h"
|
| #include "ui/views/view.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "base/win/windows_version.h"
|
| -#endif
|
| -
|
| namespace ash {
|
|
|
| namespace {
|
| @@ -190,14 +185,9 @@ TEST_F(WebNotificationTrayTest, DISABLED_ManyPopupNotifications) {
|
| EXPECT_TRUE(GetTray()->IsPopupVisible());
|
| EXPECT_EQ(notifications_to_add,
|
| GetMessageCenter()->NotificationCount());
|
| - if (message_center::IsRichNotificationEnabled()) {
|
| - NotificationList::PopupNotifications popups =
|
| - GetMessageCenter()->GetPopupNotifications();
|
| - EXPECT_EQ(message_center::kMaxVisiblePopupNotifications, popups.size());
|
| - } else {
|
| - EXPECT_EQ(message_center::kMaxVisiblePopupNotifications,
|
| - GetTray()->GetPopupBubbleForTest()->NumMessageViewsForTest());
|
| - }
|
| + NotificationList::PopupNotifications popups =
|
| + GetMessageCenter()->GetPopupNotifications();
|
| + EXPECT_EQ(message_center::kMaxVisiblePopupNotifications, popups.size());
|
| }
|
|
|
| } // namespace ash
|
|
|