Replace PermissionType in chrome/ with ContentSettingsType

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"
 #include "base/location.h"
 #include "base/rand_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/timer/timer.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.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"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "url/gurl.h"
 
 namespace {
 
 // At most one of these is attached to each WebContents. It allows posting
 // delayed tasks whose timer only counts down whilst the WebContents is visible
 // (and whose timer is reset whenever the WebContents stops being visible).
@@ skipping 122 matching lines @@
   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)
-    : PermissionContextBase(profile,
-                            permission_type,
-                            CONTENT_SETTINGS_TYPE_NOTIFICATIONS),
+    ContentSettingsType content_settings_type)
+    : PermissionContextBase(profile, content_settings_type),
       weak_factory_ui_thread_(this) {
-  DCHECK(permission_type == content::PermissionType::NOTIFICATIONS ||
-         permission_type == content::PermissionType::PUSH_MESSAGING);
+  DCHECK(content_settings_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS ||
+         content_settings_type == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING);
 }
 
 NotificationPermissionContext::~NotificationPermissionContext() {}
 
 ContentSetting NotificationPermissionContext::GetPermissionStatusInternal(
     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) {
+  if (content_settings_type() == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING
+          && requesting_origin != embedding_origin) {
     return CONTENT_SETTING_BLOCK;
   }
 
-  return PermissionContextBase::GetPermissionStatusInternal(requesting_origin,
-                                                            embedding_origin);
+  return HostContentSettingsMapFactory::GetForProfile(profile())

[dominickn, 2017/02/03 21:42:28]

What was the motivation for not calling
PermissionContextBase::GetPermissionStatusInternal?

[Timothy Loh, 2017/02/03 22:14:14]

content_settings_type_ can be set to either NOTIFICATIONS or PUSH_MESSAGING but
when we call into the HostContentSettingsMap we want to use NOTIFICATIONS.

+      ->GetContentSetting(requesting_origin, embedding_origin,
+                          CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string());
 }
 
 void NotificationPermissionContext::ResetPermission(
     const GURL& requesting_origin,
     const GURL& embedder_origin) {
   DesktopNotificationProfileUtil::ClearSetting(profile(), requesting_origin);
 }
 
 void NotificationPermissionContext::CancelPermissionRequest(
     content::WebContents* web_contents,
@@ skipping 56 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 content_settings_type() == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING;
 }