| 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 e354f7b700e33da8ca06c6c1fafdba0363b2f31b..fbd2e6e8118c502b75422f3d77328edea24333b7 100644
|
| --- a/content/shell/browser/layout_test/layout_test_permission_manager.cc
|
| +++ b/content/shell/browser/layout_test/layout_test_permission_manager.cc
|
| @@ -76,11 +76,28 @@ int LayoutTestPermissionManager::RequestPermission(
|
| return kNoPendingOperation;
|
| }
|
|
|
| -void LayoutTestPermissionManager::CancelPermissionRequest(
|
| - PermissionType permission,
|
| - RenderFrameHost* render_frame_host,
|
| - int request_id,
|
| - const GURL& requesting_origin) {
|
| +int LayoutTestPermissionManager::RequestPermissions(
|
| + const std::vector<PermissionType>& permissions,
|
| + content::RenderFrameHost* render_frame_host,
|
| + const GURL& requesting_origin,
|
| + bool user_gesture,
|
| + const base::Callback<void(
|
| + const std::vector<PermissionStatus>&)>& callback) {
|
| + DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| +
|
| + const GURL& embedding_origin =
|
| + WebContents::FromRenderFrameHost(render_frame_host)
|
| + ->GetLastCommittedURL().GetOrigin();
|
| + std::vector<PermissionStatus> result;
|
| + for (const auto& permission : permissions) {
|
| + result.push_back(GetPermissionStatus(
|
| + permission, requesting_origin, embedding_origin));
|
| + }
|
| + callback.Run(result);
|
| + return kNoPendingOperation;
|
| +}
|
| +
|
| +void LayoutTestPermissionManager::CancelPermissionRequest(int request_id) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| }
|
|
|
|
|