Implement Non-Closable Notification

ui/message_center/message_center_impl_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/message_center/message_center_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 541 matching lines @@
   EXPECT_TRUE(NotificationsContain(notifications, "id4"));
 
   blocker.SetNotificationsEnabled(true);
   EXPECT_EQ(4u, message_center()->NotificationCount());
   notifications = message_center()->GetVisibleNotifications();
   EXPECT_TRUE(NotificationsContain(notifications, "id1"));
   EXPECT_TRUE(NotificationsContain(notifications, "id2"));
   EXPECT_TRUE(NotificationsContain(notifications, "id3"));
   EXPECT_TRUE(NotificationsContain(notifications, "id4"));
 
-  // RemoveAllVisibleNotifications should remove just visible notifications.
+  // Remove just visible notifications.
   blocker.SetNotificationsEnabled(false);
-  message_center()->RemoveAllVisibleNotifications(false /* by_user */);
+  message_center()->RemoveAllNotifications(
+      false /* by_user */, MessageCenter::RemoveType::NON_PINNED);
   EXPECT_EQ(0u, message_center()->NotificationCount());
   blocker.SetNotificationsEnabled(true);
   EXPECT_EQ(2u, message_center()->NotificationCount());
   notifications = message_center()->GetVisibleNotifications();
   EXPECT_TRUE(NotificationsContain(notifications, "id1"));
   EXPECT_FALSE(NotificationsContain(notifications, "id2"));
   EXPECT_TRUE(NotificationsContain(notifications, "id3"));
   EXPECT_FALSE(NotificationsContain(notifications, "id4"));
 
-  // And RemoveAllNotifications should remove all.
+  // And remove all including invisible notifications.
   blocker.SetNotificationsEnabled(false);
-  message_center()->RemoveAllNotifications(false /* by_user */);
+  message_center()->RemoveAllNotifications(false /* by_user */,
+                                           MessageCenter::RemoveType::ALL);
   EXPECT_EQ(0u, message_center()->NotificationCount());
 }
 
 #if defined(OS_CHROMEOS)
 TEST_F(MessageCenterImplTest, CachedUnreadCount) {
   message_center()->AddNotification(
       scoped_ptr<Notification>(CreateSimpleNotification("id1")));
   message_center()->AddNotification(
       scoped_ptr<Notification>(CreateSimpleNotification("id2")));
   message_center()->AddNotification(
@@ skipping 588 matching lines @@
   // Then open the message center.
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Then update a notification; the update should have propagated.
   message_center()->RemoveNotification(id, false);
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 }
 
 }  // namespace internal
 }  // namespace message_center