Reland: Show message center on lock screen

ui/message_center/notification_list_unittest.cc

 // Copyright (c) 2012 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/notification_list.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/i18n/time_formatting.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/message_center/fake_message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification_blocker.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/notifier_settings.h"
 
 using base::UTF8ToUTF16;
 
 namespace message_center {
 
 class NotificationListTest : public testing::Test {
  public:
   NotificationListTest() {}
   ~NotificationListTest() override {}
 
   void SetUp() override {
-    notification_list_.reset(new NotificationList());
+    message_center_.reset(new FakeMessageCenter());
+    notification_list_.reset(new NotificationList(message_center_.get()));
     counter_ = 0;
   }
 
  protected:
   // Currently NotificationListTest doesn't care about some fields like title or
   // message, so put a simple template on it. Returns the id of the new
   // notification.
   std::string AddNotification(
       const message_center::RichNotificationData& optional_fields) {
     std::string new_id;
@@ skipping 53 matching lines @@
   NotificationList* notification_list() { return notification_list_.get(); }
   const NotificationBlockers& blockers() const { return blockers_; }
 
   static const char kIdFormat[];
   static const char kTitleFormat[];
   static const char kMessageFormat[];
   static const char kDisplaySource[];
   static const char kExtensionId[];
 
  private:
+  std::unique_ptr<FakeMessageCenter> message_center_;
   std::unique_ptr<NotificationList> notification_list_;
   NotificationBlockers blockers_;
   size_t counter_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationListTest);
 };
 
 bool IsInNotifications(const NotificationList::Notifications& notifications,
                        const std::string& id) {
   for (NotificationList::Notifications::const_iterator iter =
@@ skipping 39 matching lines @@
   AddNotification();
   EXPECT_EQ(2u, notification_list()->NotificationCount(blockers()));
 }
 
 TEST_F(NotificationListTest, MessageCenterVisible) {
   AddNotification();
   EXPECT_EQ(1u, notification_list()->NotificationCount(blockers()));
   ASSERT_EQ(1u, notification_list()->UnreadCount(blockers()));
   ASSERT_EQ(1u, GetPopupCounts());
 
-  // Make the message center visible. It resets the unread count and popup
-  // counts.
-  notification_list()->SetMessageCenterVisible(true, NULL);
+  // Resets the unread count and popup counts.
+  notification_list()->SetNotificationsShown(blockers(), NULL);
   ASSERT_EQ(0u, notification_list()->UnreadCount(blockers()));
   ASSERT_EQ(0u, GetPopupCounts());
 }
 
 TEST_F(NotificationListTest, UnreadCount) {
   std::string id0 = AddNotification();
   std::string id1 = AddNotification();
   ASSERT_EQ(2u, notification_list()->UnreadCount(blockers()));
 
   notification_list()->MarkSinglePopupAsDisplayed(id0);
@@ skipping 124 matching lines @@
   ASSERT_EQ(0u, notification_list()->UnreadCount(blockers()));
 
   // Default priority has the limit on the number of the popups.
   for (size_t i = 0; i <= kMaxVisiblePopupNotifications; ++i)
     AddNotification();
   EXPECT_EQ(kMaxVisiblePopupNotifications + 1,
             notification_list()->NotificationCount(blockers()));
   EXPECT_EQ(kMaxVisiblePopupNotifications, GetPopupCounts());
 
   // Low priority: not visible to popups.
-  notification_list()->SetMessageCenterVisible(true, NULL);
-  notification_list()->SetMessageCenterVisible(false, NULL);
+  notification_list()->SetNotificationsShown(blockers(), NULL);
   EXPECT_EQ(0u, notification_list()->UnreadCount(blockers()));
   AddPriorityNotification(LOW_PRIORITY);
   EXPECT_EQ(kMaxVisiblePopupNotifications + 2,
             notification_list()->NotificationCount(blockers()));
   EXPECT_EQ(1u, notification_list()->UnreadCount(blockers()));
   EXPECT_EQ(0u, GetPopupCounts());
 
   // Minimum priority: doesn't update the unread count.
   AddPriorityNotification(MIN_PRIORITY);
   EXPECT_EQ(kMaxVisiblePopupNotifications + 3,
@@ skipping 37 matching lines @@
   GetNotification(system_id)->SetSystemPriority();
 
   EXPECT_EQ(2u, GetPopupCounts());
 
   notification_list()->MarkSinglePopupAsDisplayed(normal_id);
   notification_list()->MarkSinglePopupAsDisplayed(system_id);
 
   notification_list()->MarkSinglePopupAsShown(normal_id, false);
   notification_list()->MarkSinglePopupAsShown(system_id, false);
 
-  notification_list()->SetMessageCenterVisible(true, NULL);
-  notification_list()->SetMessageCenterVisible(false, NULL);
+  notification_list()->SetNotificationsShown(blockers(), NULL);
   EXPECT_EQ(1u, GetPopupCounts());
 
   // Mark as read -- emulation of mouse click.
   notification_list()->MarkSinglePopupAsShown(system_id, true);
   EXPECT_EQ(0u, GetPopupCounts());
 }
 
 TEST_F(NotificationListTest, PriorityPromotion) {
   std::string id0 = AddPriorityNotification(LOW_PRIORITY);
   std::string replaced = id0 + "_replaced";
@@ skipping 279 matching lines @@
       NotifierId(), RichNotificationData(), NULL));
   notification_list()->AddNotification(std::move(updated_notification));
 
   EXPECT_FALSE(notification_list()->HasNotificationOfType(
       id, message_center::NOTIFICATION_TYPE_SIMPLE));
   EXPECT_TRUE(notification_list()->HasNotificationOfType(
       id, message_center::NOTIFICATION_TYPE_PROGRESS));
 }
 
 }  // namespace message_center