Revert of Minimize the delegate dependencies for non persistent notifications.

content/browser/notifications/notification_message_filter.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_message_filter.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "content/browser/bad_message.h"
-#include "content/browser/notifications/notification_event_dispatcher_impl.h"
 #include "content/browser/notifications/notification_id_generator.h"
 #include "content/browser/notifications/page_notification_delegate.h"
 #include "content/browser/notifications/platform_notification_context_impl.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/common/platform_notification_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_database_data.h"
@@ skipping 60 matching lines @@
 }  // namespace
 
 NotificationMessageFilter::NotificationMessageFilter(
     int process_id,
     PlatformNotificationContextImpl* notification_context,
     ResourceContext* resource_context,
     const scoped_refptr<ServiceWorkerContextWrapper>& service_worker_context,
     BrowserContext* browser_context)
     : BrowserMessageFilter(PlatformNotificationMsgStart),
       process_id_(process_id),
-      non_persistent__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() = default;
+NotificationMessageFilter::~NotificationMessageFilter() {}
 
 void NotificationMessageFilter::DidCloseNotification(
     const std::string& notification_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   close_closures_.erase(notification_id);
 }
 
 void NotificationMessageFilter::OnDestruct() const {
-  if (non_persistent__notification_shown_) {
-    NotificationEventDispatcherImpl* event_dispatcher =
-        content::NotificationEventDispatcherImpl::GetInstance();
-    DCHECK(event_dispatcher);
-    event_dispatcher->RendererGone(process_id_);
-  }
   BrowserThread::DeleteOnIOThread::Destruct(this);
 }
 
 bool NotificationMessageFilter::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NotificationMessageFilter, message)
     IPC_MESSAGE_HANDLER(PlatformNotificationHostMsg_Show,
                         OnShowPlatformNotification)
     IPC_MESSAGE_HANDLER(PlatformNotificationHostMsg_ShowPersistent,
                         OnShowPersistentNotification)
@@ skipping 36 matching lines @@
   DCHECK(service);
 
   if (!VerifyNotificationPermissionGranted(service, origin))
     return;
 
   std::string notification_id =
       GetNotificationIdGenerator()->GenerateForNonPersistentNotification(
           origin, notification_data.tag, non_persistent_notification_id,
           process_id_);
 
-  NotificationEventDispatcherImpl* event_dispatcher =
-      content::NotificationEventDispatcherImpl::GetInstance();
-  non_persistent__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));
 
   base::Closure close_closure;
   service->DisplayNotification(browser_context_, notification_id, origin,
                                SanitizeNotificationData(notification_data),
                                notification_resources, std::move(delegate),
                                &close_closure);
 
@@ skipping 216 matching lines @@
   bad_message::ReceivedBadMessage(this, bad_message::NMF_NO_PERMISSION_VERIFY);
   return false;
 }
 
 NotificationIdGenerator* NotificationMessageFilter::GetNotificationIdGenerator()
     const {
   return notification_context_->notification_id_generator();
 }
 
 }  // namespace content