Minimize the delegate dependencies for non persistent notifications.

content/browser/notifications/notification_message_filter.cc

Index: content/browser/notifications/notification_message_filter.cc
diff --git a/content/browser/notifications/notification_message_filter.cc b/content/browser/notifications/notification_message_filter.cc
index 56064347d26ab470e7c5aa4d74596e7273e25d19..823eeadc428e76cd98d5f7537bf24357fa4d90b2 100644
--- a/content/browser/notifications/notification_message_filter.cc
+++ b/content/browser/notifications/notification_message_filter.cc
@@ -20,6 +20,7 @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_database_data.h"
+#include "content/public/browser/notification_event_dispatcher.h"
 #include "content/public/browser/platform_notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
@@ -90,13 +91,14 @@ NotificationMessageFilter::NotificationMessageFilter(
     BrowserContext* browser_context)
     : BrowserMessageFilter(PlatformNotificationMsgStart),
       process_id_(process_id),
+      platform_notification_shown_(false),
       notification_context_(notification_context),
       resource_context_(resource_context),
       service_worker_context_(service_worker_context),
       browser_context_(browser_context),
       weak_factory_io_(this) {}
 
-NotificationMessageFilter::~NotificationMessageFilter() {}
+NotificationMessageFilter::~NotificationMessageFilter() = default;
 
 void NotificationMessageFilter::DidCloseNotification(
     const std::string& notification_id) {
@@ -105,6 +107,12 @@ void NotificationMessageFilter::DidCloseNotification(
 }
 
 void NotificationMessageFilter::OnDestruct() const {
+  if (platform_notification_shown_) {

[Peter Beverloo, 2017/05/31 17:52:43]

Just always call it? We'd bail out super early in std::remove() (in
base::EraseIf) if the container is empty.

[Miguel Garcia, 2017/06/01 17:00:53]

I'm fine with that, it's only that this is called a lot (on every navigation
etc.) so it seems the kind of thing we want to only do if needed in case the
logic ever grows for whatever reason.

[Peter Beverloo, 2017/06/01 17:56:27]

We have one NMF per renderer process, so it's much less frequent than once per
navigation. The actual overhead would pretty much come down to a CALL, post
compiler optimizations. You can drop the DCHECK anyway.

[Miguel Garcia, 2017/06/02 12:37:13]

As discussed offline I am keeping it with a more common name.

On 2017/06/01 17:56:27, Peter Beverloo wrote:

+    NotificationEventDispatcher* event_dispatcher =
+        content::NotificationEventDispatcher::GetInstance();
+    DCHECK(event_dispatcher);
+    event_dispatcher->RendererGone(process_id_);
+  }
   BrowserThread::DeleteOnIOThread::Destruct(this);
 }
 
@@ -161,6 +169,12 @@ void NotificationMessageFilter::OnShowPlatformNotification(
           origin, notification_data.tag, non_persistent_notification_id,
           process_id_);
 
+  NotificationEventDispatcher* event_dispatcher =
+      content::NotificationEventDispatcher::GetInstance();
+  platform_notification_shown_ = true;
+  event_dispatcher->RegisterNonPersistentNotification(
+      notification_id, process_id_, non_persistent_notification_id);
+
   std::unique_ptr<DesktopNotificationDelegate> delegate(
       new PageNotificationDelegate(process_id_, non_persistent_notification_id,
                                    notification_id));