Add PermissionManager::GetPermissionStatusForFrame function

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"
@@ skipping 37 matching lines @@
       const std::vector<ContentSettingsType>& permissions,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
       bool user_gesture,
       const base::Callback<void(const std::vector<ContentSetting>&)>& callback);
 
   PermissionResult GetPermissionStatus(ContentSettingsType permission,
                                        const GURL& requesting_origin,
                                        const GURL& embedding_origin);
 
+  // Returns the permission status for a given frame. This should be preferred
+  // over GetPermissionStatus as additional checks can be performed when we know
+  // the exact context the request is coming from.
+  PermissionResult GetPermissionStatusForFrame(
+      ContentSettingsType permission,
+      content::RenderFrameHost* render_frame_host);
+
   // 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(
       const std::vector<content::PermissionType>& permissions,
@@ skipping 44 matching lines @@
   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;
 
+  PermissionResult GetPermissionStatusHelper(

[dominickn, 2017/03/02 06:54:33]

This is a little strangely named (I expect a Helper to be a class). Not really
sure what a better name here is though.

[benwells, 2017/03/02 07:33:05]

Maybe GetPermissonStatusInternal?

[raymes, 2017/03/07 02:31:15]

I'd like to avoid GetPermissonStatusInternal because we use it in a different
way in PermissionContextBase and I think having a different name will lead to
less confusion.

I think a helper function is a reasonably well understood term. For example it
looks like Bjarne Stroustrup uses the term in his books. If you think of a
better name though I'm happy to change it :)

+      ContentSettingsType permission,
+      content::RenderFrameHost* render_frame_host,
+      const GURL& requesting_origin,
+      const GURL& embedding_origin);
+
   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_