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.
+    // TODO(miguelg) this is probably not the right layer to do this.
+    DispatchNonPersistentCloseEvent(notification_id);
+  }
   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