Fix PushManager.subscribe() permission request on Android

chrome/browser/permissions/permission_queue_controller.cc

 // Copyright 2013 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 "chrome/browser/permissions/permission_queue_controller.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 113 matching lines @@
       &PermissionQueueController::OnPermissionSet, base::Unretained(controller),
       id_, requesting_frame_, embedder_, user_gesture_);
   switch (type_) {
     case content::PermissionType::GEOLOCATION:
       infobar_ = GeolocationInfoBarDelegateAndroid::Create(
           GetInfoBarService(id_), requesting_frame_, user_gesture_, profile_,
           callback);
       break;
 #if defined(ENABLE_NOTIFICATIONS)
     case content::PermissionType::NOTIFICATIONS:
+    case content::PermissionType::PUSH_MESSAGING:
       infobar_ = NotificationPermissionInfoBarDelegate::Create(

[raymes, 2016/09/06 23:06:38]

This looks ok to merge to me. I think we actually need to pass in the permission
type here, because it's used in PermissionInfoBarDelegate but I don't think that
will have any impact right now (the code that uses it is behind a flag).

           GetInfoBarService(id_), requesting_frame_, user_gesture_, profile_,
           callback);
       break;
 #endif  // ENABLE_NOTIFICATIONS
     case content::PermissionType::MIDI_SYSEX:
       infobar_ = MidiPermissionInfoBarDelegateAndroid::Create(
           GetInfoBarService(id_), requesting_frame_, user_gesture_, profile_,
           callback);
       break;
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
@@ skipping 267 matching lines @@
   }
 
   ContentSetting content_setting =
       (decision == GRANTED) ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
 
   HostContentSettingsMapFactory::GetForProfile(profile_)
       ->SetContentSettingDefaultScope(
           requesting_frame.GetOrigin(), embedder.GetOrigin(),
           content_settings_type_, std::string(), content_setting);
 }