| 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 21300f30e3c44f13d11f453dbe925c573692426e..a0a07f8dd8b67fa53a5f1646fb8a72a7f27b9b43 100644
|
| --- a/content/shell/browser/layout_test/layout_test_permission_manager.cc
|
| +++ b/content/shell/browser/layout_test/layout_test_permission_manager.cc
|
| @@ -61,10 +61,9 @@ LayoutTestPermissionManager::LayoutTestPermissionManager()
|
| LayoutTestPermissionManager::~LayoutTestPermissionManager() {
|
| }
|
|
|
| -void LayoutTestPermissionManager::RequestPermission(
|
| +int LayoutTestPermissionManager::RequestPermission(
|
| PermissionType permission,
|
| RenderFrameHost* render_frame_host,
|
| - int request_id,
|
| const GURL& requesting_origin,
|
| bool user_gesture,
|
| const base::Callback<void(PermissionStatus)>& callback) {
|
| @@ -74,13 +73,12 @@ void LayoutTestPermissionManager::RequestPermission(
|
| permission, requesting_origin,
|
| WebContents::FromRenderFrameHost(render_frame_host)
|
| ->GetLastCommittedURL().GetOrigin()));
|
| + return -1;
|
| }
|
|
|
| void LayoutTestPermissionManager::CancelPermissionRequest(
|
| - PermissionType permission,
|
| RenderFrameHost* render_frame_host,
|
| - int request_id,
|
| - const GURL& requesting_origin) {
|
| + int request_id) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| }
|
|
|
|
|