permissions: handle request ids for permissions in permission manager

content/shell/browser/shell_permission_manager.cc

Index: content/shell/browser/shell_permission_manager.cc
diff --git a/content/shell/browser/shell_permission_manager.cc b/content/shell/browser/shell_permission_manager.cc
index fffcfa560c3baf9dd26e7e39c876492fc2650b7e..5869e3a94adf8e4420413e6c9fcf9dd16eac714c 100644
--- a/content/shell/browser/shell_permission_manager.cc
+++ b/content/shell/browser/shell_permission_manager.cc
@@ -16,22 +16,18 @@ ShellPermissionManager::ShellPermissionManager()
 ShellPermissionManager::~ShellPermissionManager() {
 }
 
-void ShellPermissionManager::RequestPermission(
+int ShellPermissionManager::RequestPermission(
     PermissionType permission,
     RenderFrameHost* render_frame_host,
-    int request_id,
     const GURL& requesting_origin,
     bool user_gesture,
     const base::Callback<void(PermissionStatus)>& callback) {
   callback.Run(permission == PermissionType::GEOLOCATION
                    ? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_DENIED);
+  return kNoPendingRequestOrSubscription;
 }
 
-void ShellPermissionManager::CancelPermissionRequest(
-    PermissionType permission,
-    RenderFrameHost* render_frame_host,
-    int request_id,
-    const GURL& requesting_origin) {
+void ShellPermissionManager::CancelPermissionRequest(int request_id) {
 }
 
 void ShellPermissionManager::ResetPermission(
@@ -58,7 +54,7 @@ int ShellPermissionManager::SubscribePermissionStatusChange(
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     const base::Callback<void(PermissionStatus)>& callback) {
-  return -1;
+  return kNoPendingRequestOrSubscription;
 }
 
 void ShellPermissionManager::UnsubscribePermissionStatusChange(