Simplify permission-related code for Web Notifications.

chrome/browser/push_messaging/push_messaging_permission_context.cc

Index: chrome/browser/push_messaging/push_messaging_permission_context.cc
diff --git a/chrome/browser/push_messaging/push_messaging_permission_context.cc b/chrome/browser/push_messaging/push_messaging_permission_context.cc
index d29f5c31f7ac0121ee3d91bfc505299a63ffb2d3..7806a666762614478aa317054e787d3267fe7227 100644
--- a/chrome/browser/push_messaging/push_messaging_permission_context.cc
+++ b/chrome/browser/push_messaging/push_messaging_permission_context.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/push_messaging/push_messaging_permission_context.h"
 
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
-#include "chrome/browser/notifications/desktop_notification_service.h"
-#include "chrome/browser/notifications/desktop_notification_service_factory.h"
+#include "chrome/browser/notifications/notification_permission_context.h"
+#include "chrome/browser/notifications/notification_permission_context_factory.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -37,12 +37,12 @@ ContentSetting PushMessagingPermissionContext::GetPermissionStatus(
       profile_->GetHostContentSettingsMap()->GetContentSetting(
           requesting_origin, embedding_origin, kPushSettingType, std::string());
 
-  DesktopNotificationService* notification_service =
-      DesktopNotificationServiceFactory::GetForProfile(profile_);
-  DCHECK(notification_service);
+  NotificationPermissionContext* notification_context =
+      NotificationPermissionContextFactory::GetForProfile(profile_);
+  DCHECK(notification_context);
 
   ContentSetting notifications_permission =
-      notification_service->GetPermissionStatus(requesting_origin,
+      notification_context->GetPermissionStatus(requesting_origin,
                                                 embedding_origin);
 
   if (notifications_permission == CONTENT_SETTING_BLOCK ||
@@ -87,11 +87,12 @@ void PushMessagingPermissionContext::DecidePermission(
                         false /* persist */, CONTENT_SETTING_BLOCK);
     return;
   }
-  DesktopNotificationService* notification_service =
-      DesktopNotificationServiceFactory::GetForProfile(profile_);
-  DCHECK(notification_service);
 
-  notification_service->RequestPermission(
+  NotificationPermissionContext* notification_context =
+      NotificationPermissionContextFactory::GetForProfile(profile_);
+  DCHECK(notification_context);
+
+  notification_context->RequestPermission(
       web_contents, id, requesting_origin, user_gesture,
       base::Bind(&PushMessagingPermissionContext::DecidePushPermission,
                  weak_factory_ui_thread_.GetWeakPtr(), id, requesting_origin,