Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Unified Diff: chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc

Issue 1334363002: [Eraser] First pass at removing the notification center panel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: peter comments Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc
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 4f8c0ce7443d0b3240b441b981e71ffc9b68cf7c..acfdadb606f73f3e3f9d66d5450d8c5cf7eaacd2 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
@@ -145,7 +145,7 @@ IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, WebNotifications) {
}
IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, WebNotificationPopupBubble) {
- scoped_ptr<WebNotificationTray> tray(new WebNotificationTray(NULL));
+ scoped_ptr<WebNotificationTray> tray(new WebNotificationTray());
tray->message_center();
// Adding a notification should show the popup bubble.
@@ -168,31 +168,8 @@ IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, WebNotificationPopupBubble) {
using message_center::NotificationList;
-// Flaky, see http://crbug.com/222500 .
-IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest,
- DISABLED_ManyMessageCenterNotifications) {
- scoped_ptr<WebNotificationTray> tray(new WebNotificationTray(NULL));
- message_center::MessageCenter* message_center = tray->message_center();
-
- // Add the max visible notifications +1, ensure the correct visible number.
- size_t notifications_to_add = kMaxVisibleMessageCenterNotifications + 1;
- for (size_t i = 0; i < notifications_to_add; ++i) {
- std::string id = base::StringPrintf("test_id%d", static_cast<int>(i));
- std::string replace_id =
- base::StringPrintf("replace_id%d", static_cast<int>(i));
- AddNotification(id, replace_id);
- }
- bool shown = tray->message_center_tray_->ShowMessageCenterBubble();
- EXPECT_TRUE(shown);
- content::RunAllPendingInMessageLoop();
- EXPECT_TRUE(tray->message_center_delegate_ != NULL);
- EXPECT_EQ(notifications_to_add, message_center->NotificationCount());
- EXPECT_EQ(kMaxVisibleMessageCenterNotifications,
- tray->message_center_delegate_->NumMessageViewsForTest());
-}
-
IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, ManyPopupNotifications) {
- scoped_ptr<WebNotificationTray> tray(new WebNotificationTray(NULL));
+ scoped_ptr<WebNotificationTray> tray(new WebNotificationTray());
message_center::MessageCenter* message_center = tray->message_center();
// Add the max visible popup notifications +1, ensure the correct num visible.
@@ -213,46 +190,4 @@ IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, ManyPopupNotifications) {
EXPECT_EQ(kMaxVisiblePopupNotifications, popups.size());
}
-IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest,
- ManuallyCloseMessageCenter) {
- NotificationUIManager* manager = g_browser_process->notification_ui_manager();
- MessageCenterNotificationManager* mc_manager =
- static_cast<MessageCenterNotificationManager*>(manager);
-
- WebNotificationTray* tray =
- static_cast<WebNotificationTray*>(mc_manager->tray_.get());
- ASSERT_TRUE(NULL != tray);
-
- message_center::MessageCenter* message_center = tray->message_center();
-
- bool shown = tray->message_center_tray_->ShowMessageCenterBubble();
- EXPECT_TRUE(shown);
- EXPECT_TRUE(message_center->IsMessageCenterVisible());
-
- mc_manager->EnsureMessageCenterClosed();
-
- EXPECT_FALSE(message_center->IsMessageCenterVisible());
- if (NULL != tray->message_center_delegate_)
- EXPECT_TRUE(tray->message_center_delegate_->GetWidget()->IsClosed());
-}
-
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#define MAYBE_StatusIconBehavior DISABLED_StatusIconBehavior
-#else
-#define MAYBE_StatusIconBehavior StatusIconBehavior
-#endif
-IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, MAYBE_StatusIconBehavior) {
- scoped_ptr<WebNotificationTray> tray(new WebNotificationTray(NULL));
-
- EXPECT_TRUE(tray->status_icon_ == NULL);
- tray->OnMessageCenterTrayChanged();
- base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(tray->status_icon_ == NULL);
- AddNotification("test_id", "replace_id");
- base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(tray->status_icon_ != NULL);
- RemoveNotification("test_id");
- base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(tray->status_icon_ == NULL);
-}
} // namespace message_center

Powered by Google App Engine
This is Rietveld 408576698