Fix PushManager.subscribe() permission request on Android

Fix PushManager.subscribe() permission request on Android

https://codereview.chromium.org/2149883002 merged the
PushMessagingPermissionContext into the NotificationPermissionContext.
Unfortunately, this meant that PushManager.subscribe() tried to show
a push messaging permission infobar instead of the notifications
infobar, which fails because there is no push messaging infobar. This
patch switches push messaging back to the notifications infobar.

BUG=644256
Review-Url: https://codereview.chromium.org/2316673002
Cr-Commit-Position: refs/heads/master@{#416762}
(cherry picked from commit e0db126dd99d297686d49eedd745d196708167ee)

Committed: https://chromium.googlesource.com/chromium/src/+/d256ccde6cb75b87e4346d64e6e868028197ab6b

[johnme, 2016-09-07 13:28:11]

Description was changed from

==========
Fix PushManager.subscribe() permission request on Android

https://codereview.chromium.org/2149883002 merged the
PushMessagingPermissionContext into the NotificationPermissionContext.
Unfortunately, this meant that PushManager.subscribe() tried to show
a push messaging permission infobar instead of the notifications
infobar, which fails because there is no push messaging infobar. This
patch switches push messaging back to the notifications infobar.

BUG=644256

Review-Url: https://codereview.chromium.org/2316673002
Cr-Commit-Position: refs/heads/master@{#416762}
(cherry picked from commit e0db126dd99d297686d49eedd745d196708167ee)
==========

to

==========
Fix PushManager.subscribe() permission request on Android

https://codereview.chromium.org/2149883002 merged the
PushMessagingPermissionContext into the NotificationPermissionContext.
Unfortunately, this meant that PushManager.subscribe() tried to show
a push messaging permission infobar instead of the notifications
infobar, which fails because there is no push messaging infobar. This
patch switches push messaging back to the notifications infobar.

BUG=644256

Review-Url: https://codereview.chromium.org/2316673002
Cr-Commit-Position: refs/heads/master@{#416762}
(cherry picked from commit e0db126dd99d297686d49eedd745d196708167ee)

Committed:
https://chromium.googlesource.com/chromium/src/+/d256ccde6cb75b87e4346d64e6e8...
==========

[johnme, 2016-09-07 13:28:12]

Committed patchset #1 (id:1) manually as
d256ccde6cb75b87e4346d64e6e868028197ab6b.