ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

content/shell/browser/shell_content_browser_client.cc

Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index a73fc9eb20adc67794db671b11429e9357357bdf..927fdd7cc73d1aa61427ca4b1ede9e9f71290980 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -287,6 +287,25 @@ ShellContentBrowserClient::CreateQuotaPermissionContext() {
   return new ShellQuotaPermissionContext();
 }
 
+void ShellContentBrowserClient::RequestPermission(
+    PermissionType permission,
+    WebContents* web_contents,
+    int bridge_id,
+    const GURL& requesting_frame,
+    bool user_gesture,
+    const base::Callback<void(PermissionStatus)>& callback) {
+  // Some Geolocation tests on Android are still expecting to have the
+  // permission granted. See https://crbug.com/463514.
+  if (permission == PERMISSION_GEOLOCATION) {
+    callback.Run(PERMISSION_STATUS_GRANTED);
+    return;
+  }
+
+  ContentBrowserClient::RequestPermission(
+      permission, web_contents, bridge_id,
+      requesting_frame, user_gesture, callback);
+}
+
 SpeechRecognitionManagerDelegate*
     ShellContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
   return new ShellSpeechRecognitionManagerDelegate();