Use ContentSetting in chrome/ instead of PermissionStatus

chrome/browser/permissions/permission_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
 
 #include <unordered_map>
 
 #include "base/callback_forward.h"
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/permission_manager.h"
 
 class PermissionContextBase;
+struct PermissionResult;
 class Profile;
 
 namespace content {
 enum class PermissionType;
 };  // namespace content
 
 class PermissionManager : public KeyedService,
                           public content::PermissionManager,
                           public content_settings::Observer {
  public:
   static PermissionManager* Get(Profile* profile);
 
   explicit PermissionManager(Profile* profile);
   ~PermissionManager() override;
 
   // Callers from within chrome/ should use the methods which take the
   // ContentSettingsType enum. The methods which take PermissionType values
   // are for the content::PermissionManager overrides and shouldn't be used
   // from chrome/.
 
-  int RequestPermission(
-      ContentSettingsType permission,
-      content::RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin,
-      bool user_gesture,
-      const base::Callback<void(blink::mojom::PermissionStatus)>& callback);
+  int RequestPermission(ContentSettingsType permission,
+                        content::RenderFrameHost* render_frame_host,
+                        const GURL& requesting_origin,
+                        bool user_gesture,
+                        const base::Callback<void(ContentSetting)>& callback);
   int RequestPermissions(
       const std::vector<ContentSettingsType>& permissions,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
       bool user_gesture,
-      const base::Callback<
-          void(const std::vector<blink::mojom::PermissionStatus>&)>& callback);
+      const base::Callback<void(const std::vector<ContentSetting>&)>& callback);
 
-  blink::mojom::PermissionStatus GetPermissionStatus(
-      ContentSettingsType permission,
-      const GURL& requesting_origin,
-      const GURL& embedding_origin);
+  PermissionResult GetPermissionStatus(ContentSettingsType permission,
+                                       const GURL& requesting_origin,
+                                       const GURL& embedding_origin);
 
   // content::PermissionManager implementation.
   int RequestPermission(
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
       bool user_gesture,
       const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
       override;
   int RequestPermissions(
@@ skipping 13 matching lines @@
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
   int SubscribePermissionStatusChange(
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
       const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
       override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
-  // TODO(raymes): Rather than exposing this, expose a denial reason from
-  // GetPermissionStatus so that callers can determine whether a permission is
+  // TODO(raymes): Rather than exposing this, use the denial reason from
+  // GetPermissionStatus in callers to determine whether a permission is
   // denied due to the kill switch.
   bool IsPermissionKillSwitchOn(ContentSettingsType);
 
  private:
   friend class GeolocationPermissionContextTests;
 
   class PendingRequest;
   using PendingRequestsMap = IDMap<std::unique_ptr<PendingRequest>>;
 
   struct Subscription;
   using SubscriptionsMap = IDMap<std::unique_ptr<Subscription>>;
 
   PermissionContextBase* GetPermissionContext(ContentSettingsType type);
 
   // Called when a permission was decided for a given PendingRequest. The
   // PendingRequest is identified by its |request_id| and the permission is
   // identified by its |permission_id|. If the PendingRequest contains more than
   // one permission, it will wait for the remaining permissions to be resolved.
   // When all the permissions have been resolved, the PendingRequest's callback
   // is run.
-  void OnPermissionsRequestResponseStatus(
-      int request_id,
-      int permission_id,
-      blink::mojom::PermissionStatus status);
+  void OnPermissionsRequestResponseStatus(int request_id,
+                                          int permission_id,
+                                          ContentSetting status);
 
   // content_settings::Observer implementation.
   void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,
                                const ContentSettingsPattern& secondary_pattern,
                                ContentSettingsType content_type,
                                std::string resource_identifier) override;
 
   Profile* profile_;
   PendingRequestsMap pending_requests_;
   SubscriptionsMap subscriptions_;
 
   std::unordered_map<ContentSettingsType,
                      std::unique_ptr<PermissionContextBase>,
                      ContentSettingsTypeHash>
       permission_contexts_;
 
   base::WeakPtrFactory<PermissionManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionManager);
 };
 
 #endif // CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_