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..115c042bb44f511b878747f9c272a103976de6a9 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,10 @@ void LayoutTestPermissionManager::RequestPermission( |
permission, requesting_origin, |
WebContents::FromRenderFrameHost(render_frame_host) |
->GetLastCommittedURL().GetOrigin())); |
+ return -1; |
mlamouri (slow - plz ping)
2015/09/16 14:42:57
return PermissionManager::CONSTANT
Lalit Maganti
2015/09/16 16:41:10
Done.
|
} |
-void LayoutTestPermissionManager::CancelPermissionRequest( |
- PermissionType permission, |
- RenderFrameHost* render_frame_host, |
- int request_id, |
- const GURL& requesting_origin) { |
+void LayoutTestPermissionManager::CancelPermissionRequest(int request_id) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
} |