ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

content/shell/browser/shell_content_browser_client.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/browser/shell_content_browser_client.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_util.h"
@@ skipping 269 matching lines @@
 #else
   return NULL;
 #endif
 }
 
 QuotaPermissionContext*
 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();
 }
 
 net::NetLog* ShellContentBrowserClient::GetNetLog() {
   return shell_browser_main_parts_->net_log();
 }
 
 bool ShellContentBrowserClient::ShouldSwapProcessesForRedirect(
@@ skipping 113 matching lines @@
 ShellBrowserContext*
 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
     BrowserContext* content_browser_context) {
   if (content_browser_context == browser_context())
     return browser_context();
   DCHECK_EQ(content_browser_context, off_the_record_browser_context());
   return off_the_record_browser_context();
 }
 
 }  // namespace content