Use notification display service to collect persistent notifications.

chrome/browser/notifications/platform_notification_service_impl.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 "chrome/browser/notifications/platform_notification_service_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_event_dispatcher.h"
+#include "content/public/browser/notification_id_verifier.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #include "extensions/features/features.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/notifier_settings.h"
@@ skipping 319 matching lines @@
 
 bool PlatformNotificationServiceImpl::GetDisplayedPersistentNotifications(
     BrowserContext* browser_context,
     std::set<std::string>* displayed_notifications) {
   DCHECK(displayed_notifications);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile || profile->AsTestingProfile())
     return false;  // Tests will not have a message center.
 
-  // TODO(peter): Filter for persistent notifications only.
-  return GetNotificationDisplayService(profile)->GetDisplayed(
-      displayed_notifications);
+  // Filter out non persistent notifications.
+  if (GetNotificationDisplayService(profile)->GetDisplayed(
+          displayed_notifications)) {
+    for (auto it = displayed_notifications->begin();
+         it != displayed_notifications->end();) {
+      if (content::NotificationIdVerifier::IsNonPersistentNotification(*it)) {
+        it = displayed_notifications->erase(it);
+      } else {
+        ++it;
+      }
+    }
+    return true;
+  }
+  return false;

[Peter Beverloo, 2016/12/02 13:43:34]

I think we should dismiss the previous TODO and just continue to return
everything. That way we don't have to expose NotificationIdVerifier in the
//content API.

[Miguel Garcia, 2016/12/06 12:01:18]

That's a good plan, I renamed the method in the process to make it clear what it
does.

 }
 
 void PlatformNotificationServiceImpl::OnClickEventDispatchComplete(
     content::PersistentNotificationStatus status) {
   UMA_HISTOGRAM_ENUMERATION(
       "Notifications.PersistentWebNotificationClickResult", status,
       content::PersistentNotificationStatus::
           PERSISTENT_NOTIFICATION_STATUS_MAX);
 #if BUILDFLAG(ENABLE_BACKGROUND)
   DCHECK_GT(pending_click_dispatch_events_, 0);
@@ skipping 111 matching lines @@
   }
 #endif
 
   return base::string16();
 }
 
 void PlatformNotificationServiceImpl::SetNotificationDisplayServiceForTesting(
     NotificationDisplayService* display_service) {
   test_display_service_ = display_service;
 }