Split GetPermissionStatus into GetPermissionStatusForFrame/Worker

chrome/browser/permissions/permission_manager.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/permissions/permission_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 301 matching lines @@
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   return GetPermissionStatusHelper(permission, nullptr /* render_frame_host */,
                                    requesting_origin, embedding_origin);
 }
 
 PermissionResult PermissionManager::GetPermissionStatusForFrame(
     ContentSettingsType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin) {
+  DCHECK(render_frame_host);
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
   GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
   return GetPermissionStatusHelper(permission, render_frame_host,
                                    requesting_origin, embedding_origin);
 }
 
 int PermissionManager::RequestPermission(
     PermissionType permission,
     content::RenderFrameHost* render_frame_host,
@@ skipping 76 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   PermissionContextBase* context =
       GetPermissionContext(PermissionTypeToContentSetting(permission));
   if (!context)
     return;
 
   context->ResetPermission(requesting_origin.GetOrigin(),
                            embedding_origin.GetOrigin());
 }
 
-PermissionStatus PermissionManager::GetPermissionStatus(
+PermissionStatus PermissionManager::GetPermissionStatusForFrame(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
+    content::RenderFrameHost* render_frame_host,
+    const GURL& requesting_origin) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   PermissionResult result =
-      GetPermissionStatus(PermissionTypeToContentSetting(permission),
-                          requesting_origin, embedding_origin);
+      GetPermissionStatusForFrame(PermissionTypeToContentSetting(permission),
+                                  render_frame_host, requesting_origin);
 
   // TODO(benwells): split this into two functions, GetPermissionStatus and
   // GetPermissionStatusForPermissionsAPI.
   PermissionContextBase* context =
       GetPermissionContext(PermissionTypeToContentSetting(permission));
-  if (context) {
-    result = context->UpdatePermissionStatusWithDeviceStatus(
-        result, requesting_origin, embedding_origin);
-  }
+  result = context->UpdatePermissionStatusWithDeviceStatus(
+      result, requesting_origin,
+      content::WebContents::FromRenderFrameHost(render_frame_host)
+          ->GetLastCommittedURL()
+          .GetOrigin());
 
   return ContentSettingToPermissionStatus(result.content_setting);
 }
+
+PermissionStatus PermissionManager::GetPermissionStatusForWorker(
+    PermissionType permission,
+    const GURL& requesting_origin) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  PermissionContextBase* context =
+      GetPermissionContext(PermissionTypeToContentSetting(permission));
+  if (!context->IsAllowedInWorkers())
+    return blink::mojom::PermissionStatus::DENIED;
+
+  PermissionResult result =
+      GetPermissionStatus(PermissionTypeToContentSetting(permission),
+                          requesting_origin, requesting_origin);
+
+  result = context->UpdatePermissionStatusWithDeviceStatus(
+      result, requesting_origin, requesting_origin);
+
+  // Workers can never prompt the user, so we return blocked in that case.

[benwells, 2017/05/30 06:49:12]

Did this mapping of ASK -> DENIED happen for workers before?

[benwells, 2017/05/31 01:48:10]

^^^ still valid.

+  if (result.content_setting == CONTENT_SETTING_ASK)
+    return blink::mojom::PermissionStatus::DENIED;
+
+  return ContentSettingToPermissionStatus(result.content_setting);
+}
 
 int PermissionManager::SubscribePermissionStatusChange(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     const base::Callback<void(PermissionStatus)>& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (subscriptions_.IsEmpty())
     HostContentSettingsMapFactory::GetForProfile(profile_)->AddObserver(this);
 
@@ skipping 74 matching lines @@
     const GURL& embedding_origin) {
   PermissionContextBase* context = GetPermissionContext(permission);
   PermissionResult result = context->GetPermissionStatus(
       render_frame_host, requesting_origin.GetOrigin(),
       embedding_origin.GetOrigin());
   DCHECK(result.content_setting == CONTENT_SETTING_ALLOW ||
          result.content_setting == CONTENT_SETTING_ASK ||
          result.content_setting == CONTENT_SETTING_BLOCK);
   return result;
 }