Deprecate per notification type delegates.

content/browser/notifications/notification_event_dispatcher_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 "content/browser/notifications/notification_event_dispatcher_impl.h"
 
 #include "base/callback.h"
 #include "base/optional.h"
 #include "build/build_config.h"
 #include "content/browser/notifications/notification_message_filter.h"
@@ skipping 376 matching lines @@
       browser_context, notification_id, origin,
       base::Bind(&DoDispatchNotificationCloseEvent, notification_id, by_user,
                  dispatch_complete_callback),
       dispatch_complete_callback);
 }
 
 void NotificationEventDispatcherImpl::RegisterNonPersistentNotification(
     const std::string& notification_id,
     int renderer_id,
     int non_persistent_id) {
+  if (non_persistent_ids_.count(notification_id) &&
+      non_persistent_ids_[notification_id] != non_persistent_id) {
+    // Notify close for a previously displayed notification with the same id,
+    // this can happen when replacing a non-persistent notification with the
+    // same tag since from the JS point of view there will be two notification
+    // objects and the old one needs to receive the close event.
+    DCHECK(renderer_ids_[notification_id] == renderer_id);

[Peter Beverloo, 2017/06/08 06:48:11]

I don't think this DCHECK is valid. What if an origin runs in multiple renderer
processes?

[Miguel Garcia, 2017/06/09 12:24:51]

Good point. Removed

+    DispatchNonPersistentCloseEvent(notification_id);

[Peter Beverloo, 2017/06/08 06:48:11]

This feels like the wrong layer. Right now the Message Center UI Manager will
fire this event on the delegate. I guess doing that would require the NDS to get
the list of shown notifications, check if the notification ID is in it, and then
manually fire the close event?

This should be a TODO.

[Miguel Garcia, 2017/06/09 12:24:51]

Done.

+  }
   renderer_ids_[notification_id] = renderer_id;
   non_persistent_ids_[notification_id] = non_persistent_id;
 }
 
 void NotificationEventDispatcherImpl::DispatchNonPersistentShowEvent(
     const std::string& notification_id) {
   if (!renderer_ids_.count(notification_id))
     return;
   DCHECK(non_persistent_ids_.count(notification_id));
 
@@ skipping 51 matching lines @@
     if (iter->second == renderer_id) {
       non_persistent_ids_.erase(iter->first);
       iter = renderer_ids_.erase(iter);
     } else {
       iter++;
     }
   }
 }
 
 }  // namespace content