Use the same codepath for NOTIFICATIONS and PUSH_MESSAGING permissions

chrome/browser/permissions/permission_manager.cc

 // Copyright 2015 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_manager.h"
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/background_sync/background_sync_permission_context.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/media/media_stream_device_permission_context.h"
 #include "chrome/browser/media/midi_permission_context.h"
 #include "chrome/browser/notifications/notification_permission_context.h"
 #include "chrome/browser/permissions/permission_context_base.h"
 #include "chrome/browser/permissions/permission_manager_factory.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/push_messaging/push_messaging_permission_context.h"
 #include "chrome/browser/storage/durable_storage_permission_context.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/features.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
@@ skipping 182 matching lines @@
 PermissionManager* PermissionManager::Get(Profile* profile) {
   return PermissionManagerFactory::GetForProfile(profile);
 }
 
 PermissionManager::PermissionManager(Profile* profile)
     : profile_(profile),
       weak_ptr_factory_(this) {
   permission_contexts_[PermissionType::MIDI_SYSEX] =
       base::WrapUnique(new MidiPermissionContext(profile));
   permission_contexts_[PermissionType::PUSH_MESSAGING] =
-      base::WrapUnique(new PushMessagingPermissionContext(profile));
+      base::WrapUnique(new NotificationPermissionContext(
+          profile, PermissionType::PUSH_MESSAGING));
   permission_contexts_[PermissionType::NOTIFICATIONS] =
-      base::WrapUnique(new NotificationPermissionContext(profile));
+      base::WrapUnique(new NotificationPermissionContext(
+          profile, PermissionType::NOTIFICATIONS));
 #if !BUILDFLAG(ANDROID_JAVA_UI)
   permission_contexts_[PermissionType::GEOLOCATION] =
       base::WrapUnique(new GeolocationPermissionContext(profile));
 #else
   permission_contexts_[PermissionType::GEOLOCATION] =
       base::WrapUnique(new GeolocationPermissionContextAndroid(profile));
 #endif
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   permission_contexts_[PermissionType::PROTECTED_MEDIA_IDENTIFIER] =
       base::WrapUnique(new ProtectedMediaIdentifierPermissionContext(profile));
@@ skipping 235 matching lines @@
     // Add the callback to |callbacks| which will be run after the loop to
     // prevent re-entrance issues.
     callbacks.push_back(
         base::Bind(subscription->callback,
                    ContentSettingToPermissionStatus(new_value)));
   }
 
   for (const auto& callback : callbacks)
     callback.Run();
 }