Index: content/shell/browser/layout_test/layout_test_permission_manager.cc |
diff --git a/content/shell/browser/layout_test/layout_test_permission_manager.cc b/content/shell/browser/layout_test/layout_test_permission_manager.cc |
index 8bdfb751027e327c3837dc6b3e005356df5762bd..342be18cababc341736d904f6223ca6efaf236a8 100644 |
--- a/content/shell/browser/layout_test/layout_test_permission_manager.cc |
+++ b/content/shell/browser/layout_test/layout_test_permission_manager.cc |
@@ -120,20 +120,22 @@ void LayoutTestPermissionManager::ResetPermission( |
permissions_.erase(it); |
} |
-blink::mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus( |
+blink::mojom::PermissionStatus |
+LayoutTestPermissionManager::GetPermissionStatusForFrame( |
PermissionType permission, |
- const GURL& requesting_origin, |
- const GURL& embedding_origin) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) || |
- BrowserThread::CurrentlyOn(BrowserThread::IO)); |
- |
- base::AutoLock lock(permissions_lock_); |
+ content::RenderFrameHost* render_frame_host, |
+ const GURL& requesting_origin) { |
+ return GetPermissionStatus(permission, requesting_origin, |
+ WebContents::FromRenderFrameHost(render_frame_host) |
+ ->GetLastCommittedURL() |
+ .GetOrigin()); |
+} |
- auto it = permissions_.find( |
- PermissionDescription(permission, requesting_origin, embedding_origin)); |
- if (it == permissions_.end()) |
- return blink::mojom::PermissionStatus::DENIED; |
- return it->second; |
+blink::mojom::PermissionStatus |
+LayoutTestPermissionManager::GetPermissionStatusForWorker( |
+ PermissionType permission, |
+ const GURL& requesting_origin) { |
+ return GetPermissionStatus(permission, requesting_origin, requesting_origin); |
} |
int LayoutTestPermissionManager::SubscribePermissionStatusChange( |
@@ -218,4 +220,20 @@ void LayoutTestPermissionManager::OnPermissionChanged( |
callback.Run(); |
} |
+blink::mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus( |
+ PermissionType permission, |
+ const GURL& requesting_origin, |
+ const GURL& embedding_origin) { |
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) || |
+ BrowserThread::CurrentlyOn(BrowserThread::IO)); |
+ |
+ base::AutoLock lock(permissions_lock_); |
+ |
+ auto it = permissions_.find( |
+ PermissionDescription(permission, requesting_origin, embedding_origin)); |
+ if (it == permissions_.end()) |
+ return blink::mojom::PermissionStatus::DENIED; |
+ return it->second; |
+} |
+ |
} // namespace content |