Revert "Use the same codepath for NOTIFICATIONS and PUSH_MESSAGING permissions"

chrome/browser/notifications/notification_permission_context.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/notifications/notification_permission_context.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/callback.h"
@@ skipping 141 matching lines @@
   task.Run();
   task_queue_.pop_front();
   if (!task_queue_.empty())
     task_queue_.front().timer->Reset();
 }
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(VisibilityTimerTabHelper);
 
-NotificationPermissionContext::NotificationPermissionContext(
-    Profile* profile,
-    content::PermissionType permission_type)
+NotificationPermissionContext::NotificationPermissionContext(Profile* profile)
     : PermissionContextBase(profile,
-                            permission_type,
+                            content::PermissionType::NOTIFICATIONS,
                             CONTENT_SETTINGS_TYPE_NOTIFICATIONS),
-      weak_factory_ui_thread_(this) {
-  DCHECK(permission_type == content::PermissionType::NOTIFICATIONS ||
-         permission_type == content::PermissionType::PUSH_MESSAGING);
-}
+      weak_factory_ui_thread_(this) {}
 
 NotificationPermissionContext::~NotificationPermissionContext() {}
 
-ContentSetting NotificationPermissionContext::GetPermissionStatus(
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) const {
-  // Push messaging is only allowed to be granted on top-level origins.
-  if (permission_type() == content::PermissionType::PUSH_MESSAGING &&
-      requesting_origin != embedding_origin) {
-    return CONTENT_SETTING_BLOCK;
-  }
-
-  return PermissionContextBase::GetPermissionStatus(requesting_origin,
-                                                    embedding_origin);
-}
-
 void NotificationPermissionContext::ResetPermission(
     const GURL& requesting_origin,
     const GURL& embedder_origin) {
   DesktopNotificationProfileUtil::ClearSetting(profile(), requesting_origin);
 }
 
 void NotificationPermissionContext::CancelPermissionRequest(
     content::WebContents* web_contents,
     const PermissionRequestID& id) {
   if (profile()->IsOffTheRecord()) {
@@ skipping 54 matching lines @@
   if (content_setting == CONTENT_SETTING_ALLOW) {
     DesktopNotificationProfileUtil::GrantPermission(profile(),
                                                     requesting_origin);
   } else {
     DesktopNotificationProfileUtil::DenyPermission(profile(),
                                                    requesting_origin);
   }
 }
 
 bool NotificationPermissionContext::IsRestrictedToSecureOrigins() const {
-  return permission_type() == content::PermissionType::PUSH_MESSAGING;
+  return false;
 }