| Index: content/shell/browser/layout_test/layout_test_permission_manager.h
|
| diff --git a/content/shell/browser/layout_test/layout_test_permission_manager.h b/content/shell/browser/layout_test/layout_test_permission_manager.h
|
| index 8a135b4e69157fe24422e06de8a21ce1df069a9d..498423e0e0e02b372b9452347fab1697098113ca 100644
|
| --- a/content/shell/browser/layout_test/layout_test_permission_manager.h
|
| +++ b/content/shell/browser/layout_test/layout_test_permission_manager.h
|
| @@ -42,10 +42,13 @@ class LayoutTestPermissionManager : public PermissionManager {
|
| void ResetPermission(PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
| - blink::mojom::PermissionStatus GetPermissionStatus(
|
| - PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) override;
|
| + blink::mojom::PermissionStatus GetPermissionStatusForFrame(
|
| + content::PermissionType permission,
|
| + content::RenderFrameHost* render_frame_host,
|
| + const GURL& requesting_origin) override;
|
| + blink::mojom::PermissionStatus GetPermissionStatusForWorker(
|
| + content::PermissionType permission,
|
| + const GURL& requesting_origin) override;
|
| int SubscribePermissionStatusChange(
|
| PermissionType permission,
|
| const GURL& requesting_origin,
|
| @@ -89,6 +92,11 @@ class LayoutTestPermissionManager : public PermissionManager {
|
| void OnPermissionChanged(const PermissionDescription& permission,
|
| blink::mojom::PermissionStatus status);
|
|
|
| + blink::mojom::PermissionStatus GetPermissionStatus(
|
| + PermissionType permission,
|
| + const GURL& requesting_origin,
|
| + const GURL& embedding_origin);
|
| +
|
| // Mutex for permissions access. Unfortunately, the permissions can be
|
| // accessed from the IO thread because of Notifications' synchronous IPC.
|
| base::Lock permissions_lock_;
|
|
|