Use notification display service to collect persistent notifications.

chrome/browser/notifications/platform_notification_service_unittest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 37 matching lines @@
 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
 using content::NotificationResources;
 using content::PlatformNotificationData;
 
 namespace {
 
-const char kNotificationId[] = "my-notification-id";
+const char kPersistentNotificationId[] = "p:my-notification-id";
+const char kNonPersistentNotificationId[] = "n:my-notification-id";
 const int kNotificationVibrationPattern[] = { 100, 200, 300 };
 
 class MockDesktopNotificationDelegate
     : public content::DesktopNotificationDelegate {
  public:
   MockDesktopNotificationDelegate()
       : displayed_(false),
         clicked_(false) {}
 
   ~MockDesktopNotificationDelegate() override {}
@@ skipping 50 matching lines @@
   // The close closure may be specified if so desired.
   MockDesktopNotificationDelegate* CreateSimplePageNotificationWithCloseClosure(
       base::Closure* close_closure) const {
     PlatformNotificationData notification_data;
     notification_data.title = base::ASCIIToUTF16("My Notification");
     notification_data.body = base::ASCIIToUTF16("Hello, world!");
 
     MockDesktopNotificationDelegate* delegate =
         new MockDesktopNotificationDelegate();
 
-    service()->DisplayNotification(profile(), kNotificationId,
+    service()->DisplayNotification(profile(), kNonPersistentNotificationId,
                                    GURL("https://chrome.com/"),
                                    notification_data, NotificationResources(),
                                    base::WrapUnique(delegate), close_closure);
 
     return delegate;
   }
 
   // Returns the Platform Notification Service these unit tests are for.
   PlatformNotificationServiceImpl* service() const {
     return PlatformNotificationServiceImpl::GetInstance();
@@ skipping 50 matching lines @@
   // Note that we cannot verify whether the closed event was called on the
   // delegate given that it'd result in a use-after-free.
 }
 
 TEST_F(PlatformNotificationServiceTest, PersistentNotificationDisplay) {
   PlatformNotificationData notification_data;
   notification_data.title = base::ASCIIToUTF16("My notification's title");
   notification_data.body = base::ASCIIToUTF16("Hello, world!");
 
   service()->DisplayPersistentNotification(
-      profile(), kNotificationId, GURL() /* service_worker_scope */,
+      profile(), kPersistentNotificationId, GURL() /* service_worker_scope */,
       GURL("https://chrome.com/"), notification_data, NotificationResources());
 
   ASSERT_EQ(1u, GetNotificationCount());
 
   Notification notification = GetDisplayedNotification();
   EXPECT_EQ("https://chrome.com/", notification.origin_url().spec());
   EXPECT_EQ("My notification's title",
       base::UTF16ToUTF8(notification.title()));
   EXPECT_EQ("Hello, world!",
       base::UTF16ToUTF8(notification.message()));
 
-  service()->ClosePersistentNotification(profile(), kNotificationId);
+  service()->ClosePersistentNotification(profile(), kPersistentNotificationId);
   EXPECT_EQ(0u, GetNotificationCount());
 }
 
 TEST_F(PlatformNotificationServiceTest, DisplayPageNotificationMatches) {
   std::vector<int> vibration_pattern(
       kNotificationVibrationPattern,
       kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern));
 
   PlatformNotificationData notification_data;
   notification_data.title = base::ASCIIToUTF16("My notification's title");
   notification_data.body = base::ASCIIToUTF16("Hello, world!");
   notification_data.vibration_pattern = vibration_pattern;
   notification_data.silent = true;
 
   MockDesktopNotificationDelegate* delegate
       = new MockDesktopNotificationDelegate();
-  service()->DisplayNotification(profile(), kNotificationId,
+  service()->DisplayNotification(profile(), kNonPersistentNotificationId,
                                  GURL("https://chrome.com/"), notification_data,
                                  NotificationResources(),
                                  base::WrapUnique(delegate), nullptr);
 
   ASSERT_EQ(1u, GetNotificationCount());
 
   Notification notification = GetDisplayedNotification();
   EXPECT_EQ("https://chrome.com/", notification.origin_url().spec());
   EXPECT_EQ("My notification's title",
       base::UTF16ToUTF8(notification.title()));
@@ skipping 21 matching lines @@
       content::PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON;
   notification_data.actions[0].title = base::ASCIIToUTF16("Button 1");
   notification_data.actions[1].type =
       content::PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT;
   notification_data.actions[1].title = base::ASCIIToUTF16("Button 2");
 
   NotificationResources notification_resources;
   notification_resources.action_icons.resize(notification_data.actions.size());
 
   service()->DisplayPersistentNotification(
-      profile(), kNotificationId, GURL() /* service_worker_scope */,
+      profile(), kPersistentNotificationId, GURL() /* service_worker_scope */,
       GURL("https://chrome.com/"), notification_data, notification_resources);
 
   ASSERT_EQ(1u, GetNotificationCount());
 
   Notification notification = GetDisplayedNotification();
   EXPECT_EQ("https://chrome.com/", notification.origin_url().spec());
   EXPECT_EQ("My notification's title", base::UTF16ToUTF8(notification.title()));
   EXPECT_EQ("Hello, world!", base::UTF16ToUTF8(notification.message()));
 
   EXPECT_THAT(notification.vibration_pattern(),
@@ skipping 19 matching lines @@
 
   base::Time after_page_notification =
       HostContentSettingsMapFactory::GetForProfile(profile())->GetLastUsage(
           origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   EXPECT_GT(after_page_notification, begin_time);
 
   // Ensure that there is at least some time between the two calls.
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1));
 
   service()->DisplayPersistentNotification(
-      profile(), kNotificationId, GURL() /* service_worker_scope */, origin,
-      PlatformNotificationData(), NotificationResources());
+      profile(), kPersistentNotificationId, GURL() /* service_worker_scope */,
+      origin, PlatformNotificationData(), NotificationResources());
 
   base::Time after_persistent_notification =
       HostContentSettingsMapFactory::GetForProfile(profile())->GetLastUsage(
           origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   EXPECT_GT(after_persistent_notification, after_page_notification);
 }
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 
 TEST_F(PlatformNotificationServiceTest, DisplayNameForContextMessage) {
@@ skipping 112 matching lines @@
   notification = service()->CreateNotificationFromData(
       profile(),
       GURL() /* service_worker_scope */,
       GURL("chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"),
       notification_data, NotificationResources(),
       new MockNotificationDelegate("hello"));
   EXPECT_EQ("NotificationTest",
             base::UTF16ToUTF8(notification.context_message()));
 }
 
+TEST_F(PlatformNotificationServiceTest, GetDisplayedPersistentNotifications) {
+  PlatformNotificationData notification_data;
+  notification_data.title =
+      base::ASCIIToUTF16("Non Persistent notification's title");
+  notification_data.body = base::ASCIIToUTF16("Hello, world!");
+
+  MockDesktopNotificationDelegate* delegate =
+      new MockDesktopNotificationDelegate();
+  service()->DisplayNotification(profile(), kNonPersistentNotificationId,
+                                 GURL("https://chrome.com/"), notification_data,
+                                 NotificationResources(),
+                                 base::WrapUnique(delegate), nullptr);
+
+  notification_data.title =
+      base::ASCIIToUTF16("Persistent notification's title");
+  service()->DisplayPersistentNotification(
+      profile(), kPersistentNotificationId, GURL() /* service_worker_scope */,
+      GURL("https://chrome.com/"), notification_data, NotificationResources());
+  ASSERT_EQ(2u, GetNotificationCount());
+
+  std::set<std::string> displayed_notifications;
+  ASSERT_TRUE(service()->GetDisplayedPersistentNotifications(
+      profile(), &displayed_notifications));
+  EXPECT_EQ(1u, displayed_notifications.size());
+}
+
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)