Split GetPermissionStatus into GetPermissionStatusForFrame/Worker

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 38 matching lines @@
       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

[johnme, 2017/06/12 10:18:20]

Now that there's only one non-preferred GetPermissionStatus method and 3
preferred variants, could you remove this "This should be preferred over
GetPermissionStatus" comment, and instead add a comment to GetPermissionStatus
explaining its downsides?

   // the exact context the request is coming from.
   // TODO(raymes): Currently we still pass the |requesting_origin| as a separate
   // parameter because we can't yet guarantee that it matches the last committed
   // origin of the RenderFrameHost. See crbug.com/698985.
   PermissionResult GetPermissionStatusForFrame(
       ContentSettingsType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_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(
       const std::vector<content::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
       bool user_gesture,
       const base::Callback<
           void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
       override;
   void CancelPermissionRequest(int request_id) override;
   void ResetPermission(content::PermissionType permission,
                        const GURL& requesting_origin,
                        const GURL& embedding_origin) override;
-  blink::mojom::PermissionStatus GetPermissionStatus(
+  blink::mojom::PermissionStatus GetPermissionStatusForFrame(
       content::PermissionType permission,
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) override;
+      content::RenderFrameHost* render_frame_host,
+      const GURL& requesting_origin) override;
+  blink::mojom::PermissionStatus GetPermissionStatusForWorker(
+      content::PermissionType permission,
+      const GURL& requesting_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, use the denial reason from
   // GetPermissionStatus in callers to determine whether a permission is
@@ skipping 44 matching lines @@
                      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_