Use ContentSetting in chrome/ instead of PermissionStatus

chrome/browser/push_messaging/push_messaging_service_impl.cc

 // Copyright 2014 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/push_messaging/push_messaging_service_impl.h"
 
 #include <vector>
 
 #include "base/barrier_closure.h"
 #include "base/base64url.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/gcm/instance_id/instance_id_profile_service.h"
 #include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
 #include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_result.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
 #include "chrome/browser/push_messaging/push_messaging_constants.h"
 #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
 #include "chrome/browser/push_messaging/push_messaging_service_observer.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
@@ skipping 56 matching lines @@
   UMA_HISTOGRAM_ENUMERATION("PushMessaging.UnregistrationGCMResult", result,
                             gcm::GCMClient::LAST_RESULT + 1);
 }
 
 void RecordUnsubscribeIIDResult(InstanceID::Result result) {
   UMA_HISTOGRAM_ENUMERATION("PushMessaging.UnregistrationIIDResult", result,
                             InstanceID::LAST_RESULT + 1);
 }
 
 blink::WebPushPermissionStatus ToPushPermission(
-    blink::mojom::PermissionStatus permission_status) {
-  switch (permission_status) {
-    case blink::mojom::PermissionStatus::GRANTED:
+    ContentSetting content_setting) {
+  switch (content_setting) {
+    case CONTENT_SETTING_ALLOW:
       return blink::WebPushPermissionStatusGranted;
-    case blink::mojom::PermissionStatus::DENIED:
+    case CONTENT_SETTING_BLOCK:
       return blink::WebPushPermissionStatusDenied;
-    case blink::mojom::PermissionStatus::ASK:
+    case CONTENT_SETTING_ASK:
       return blink::WebPushPermissionStatusPrompt;
+    default:
+      break;
   }
   NOTREACHED();
   return blink::WebPushPermissionStatusDenied;
 }
 
 void UnregisterCallbackToClosure(const base::Closure& closure,
                                  content::PushUnregistrationStatus status) {
   DCHECK(!closure.is_null());
   closure.Run();
 }
@@ skipping 379 matching lines @@
   blink::WebPushPermissionStatus permission_status =
       GetPermissionStatus(requesting_origin, options.user_visible_only);
 
   if (permission_status != blink::WebPushPermissionStatusGranted) {
     SubscribeEndWithError(register_callback,
                           content::PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
     return;
   }
 
   DoSubscribe(app_identifier, options, register_callback,
-              blink::mojom::PermissionStatus::GRANTED);
+              CONTENT_SETTING_ALLOW);
 }
 
 blink::WebPushPermissionStatus PushMessagingServiceImpl::GetPermissionStatus(
     const GURL& origin,
     bool user_visible) {
   if (!user_visible)
     return blink::WebPushPermissionStatusDenied;
 
   // Because the Push API is tied to Service Workers, many usages of the API
   // won't have an embedding origin at all. Only consider the requesting
   // |origin| when checking whether permission to use the API has been granted.
-  return ToPushPermission(PermissionManager::Get(profile_)->GetPermissionStatus(
-      CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, origin, origin));
+  return ToPushPermission(
+      PermissionManager::Get(profile_)
+          ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, origin,
+                                origin)
+          .content_setting);
 }
 
 bool PushMessagingServiceImpl::SupportNonVisibleMessages() {
   return false;
 }
 
 void PushMessagingServiceImpl::DoSubscribe(
     const PushMessagingAppIdentifier& app_identifier,
     const content::PushSubscriptionOptions& options,
     const RegisterCallback& register_callback,
-    blink::mojom::PermissionStatus permission_status) {
-  if (permission_status != blink::mojom::PermissionStatus::GRANTED) {
+    ContentSetting content_setting) {
+  if (content_setting != CONTENT_SETTING_ALLOW) {
     SubscribeEndWithError(register_callback,
                           content::PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
     return;
   }
 
   IncreasePushSubscriptionCount(1, true /* is_pending */);
 
   GetInstanceIDDriver()
       ->GetInstanceID(app_identifier.app_id())
       ->GetToken(NormalizeSenderInfo(options.sender_info), kGCMScope,
@@ skipping 437 matching lines @@
 }
 
 instance_id::InstanceIDDriver* PushMessagingServiceImpl::GetInstanceIDDriver()
     const {
   instance_id::InstanceIDProfileService* instance_id_profile_service =
       instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile_);
   CHECK(instance_id_profile_service);
   CHECK(instance_id_profile_service->driver());
   return instance_id_profile_service->driver();
 }