Revert of Minimize the delegate dependencies for non persistent notifications.

Revert of Minimize the delegate dependencies for non persistent notifications. (patchset #5 id:80001 of https://codereview.chromium.org/2888303004/ )

Reason for revert:
This broke the unit test 

PlatformNotificationServiceTest.DisplayPageDisplayedEvent

see 
https://uberchromegw.corp.google.com/i/chromium.android/builders/Android%20N5X%20Swarm%20Builder/builds/12814

Original issue's description:
> Minimize the delegate dependencies for non persistent notifications.
> 
> Upgrade NotificationEventDispatcher to support IPCs for non persistent notifications
> as well as persistent ones.
> 
> Use the dispatcher directly from the handler.
> 
> After this patch land we will be able to use the same path for non native notifications and
> get rid of the delegate #ifdefs
> 
> This work is happening in 
> https://codereview.chromium.org/2906913002#ps1
> and 
> https://codereview.chromium.org/2906883003#ps1
> 
> 
> BUG=720345
> 
> Review-Url: https://codereview.chromium.org/2888303004
> Cr-Commit-Position: refs/heads/master@{#476646}
> Committed: https://chromium.googlesource.com/chromium/src/+/26f0196082493c3d5109f196828a8c5baf16005a

TBR=peter@chromium.org,dewittj@chromium.org,avi@chromium.org,miguelg@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=720345

[michaelbai, 2017-06-02 23:26:00]

The CQ bit was checked by michaelbai@chromium.org

[michaelbai, 2017-06-02 23:26:00]

Created Revert of Minimize the delegate dependencies for non persistent
notifications.

[commit-bot: I haz the power, 2017-06-02 23:26:42]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-02 23:27:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-06-02 23:27:12]

Failed to apply patch for
chrome/browser/notifications/native_notification_display_service.cc:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/browser/notifications/native_notification_display_service.cc:21
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: chrome/browser/notifications/native_notification_display_service.cc:
patch does not apply

Patch:       chrome/browser/notifications/native_notification_display_service.cc
Index: chrome/browser/notifications/native_notification_display_service.cc
diff --git a/chrome/browser/notifications/native_notification_display_service.cc
b/chrome/browser/notifications/native_notification_display_service.cc
index
2781af6c926d89d4c9998f73e3801164025585fb..2ffcd75fd3929c32998c54c28a73145fdbef9796
100644
--- a/chrome/browser/notifications/native_notification_display_service.cc
+++ b/chrome/browser/notifications/native_notification_display_service.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/notifications/persistent_notification_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_event_dispatcher.h"
 #include "extensions/features/features.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -94,13 +93,9 @@
     notification_bridge_->Display(notification_type, notification_id,
                                   GetProfileId(profile_),
                                   profile_->IsOffTheRecord(), notification);
-    // Unlike all other notifications non persistent notifications require
-    // an event after the notification has been displayed.
-    // TODO(miguelg) create an OnShow notification handler instead.
-    if (notification_type == NotificationCommon::NON_PERSISTENT) {
-      content::NotificationEventDispatcher::GetInstance()
-          ->DispatchNonPersistentShowEvent(notification_id);
-    }
+    notification.delegate()->Display();
+    NotificationHandler* handler = GetNotificationHandler(notification_type);
+    handler->RegisterNotification(notification_id, notification.delegate());
   } else if (message_center_display_service_) {
     message_center_display_service_->Display(notification_type,
notification_id,
                                              notification);

[michaelbai, 2017-06-03 00:41:35]

Description was changed from

==========
Revert of Minimize the delegate dependencies for non persistent notifications.
(patchset #5 id:80001 of https://codereview.chromium.org/2888303004/ )

Reason for revert:
This broke the unit test 

PlatformNotificationServiceTest.DisplayPageDisplayedEvent

see 
https://uberchromegw.corp.google.com/i/chromium.android/builders/Android%20N5...

Original issue's description:
> Minimize the delegate dependencies for non persistent notifications.
> 
> Upgrade NotificationEventDispatcher to support IPCs for non persistent
notifications
> as well as persistent ones.
> 
> Use the dispatcher directly from the handler.
> 
> After this patch land we will be able to use the same path for non native
notifications and
> get rid of the delegate #ifdefs
> 
> This work is happening in 
> https://codereview.chromium.org/2906913002#ps1
> and 
> https://codereview.chromium.org/2906883003#ps1
> 
> 
> BUG=720345
> 
> Review-Url: https://codereview.chromium.org/2888303004
> Cr-Commit-Position: refs/heads/master@{#476646}
> Committed:
https://chromium.googlesource.com/chromium/src/+/26f0196082493c3d5109f196828a...

TBR=peter@chromium.org,dewittj@chromium.org,avi@chromium.org,miguelg@chromium...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=720345
==========

to

==========
Revert of Minimize the delegate dependencies for non persistent notifications.
(patchset #5 id:80001 of https://codereview.chromium.org/2888303004/ )

Reason for revert:
This broke the unit test 

PlatformNotificationServiceTest.DisplayPageDisplayedEvent

see 
https://uberchromegw.corp.google.com/i/chromium.android/builders/Android%20N5...

Original issue's description:
> Minimize the delegate dependencies for non persistent notifications.
> 
> Upgrade NotificationEventDispatcher to support IPCs for non persistent
notifications
> as well as persistent ones.
> 
> Use the dispatcher directly from the handler.
> 
> After this patch land we will be able to use the same path for non native
notifications and
> get rid of the delegate #ifdefs
> 
> This work is happening in 
> https://codereview.chromium.org/2906913002#ps1
> and 
> https://codereview.chromium.org/2906883003#ps1
> 
> 
> BUG=720345
> 
> Review-Url: https://codereview.chromium.org/2888303004
> Cr-Commit-Position: refs/heads/master@{#476646}
> Committed:
https://chromium.googlesource.com/chromium/src/+/26f0196082493c3d5109f196828a...

TBR=peter@chromium.org,dewittj@chromium.org,avi@chromium.org,miguelg@chromium...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=720345
==========