ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 662 matching lines @@
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
       return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;
 #endif
     default:
       NOTREACHED() << "Unknown content setting for permission " << permission;
       return CONTENT_SETTINGS_TYPE_DEFAULT;
   }
 }
 
+void OnRequestPermission(
+    const base::Callback<void(content::PermissionStatus)>& callback,
+    ContentSetting content_setting) {
+  callback.Run(ContentSettingToPermissionStatus(content_setting));
+}
+
 }  // namespace
 
 namespace chrome {
 
 ChromeContentBrowserClient::ChromeContentBrowserClient()
     : prerender_tracker_(NULL),
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
       v8_natives_fd_(-1),
       v8_snapshot_fd_(-1),
 #endif  // OS_POSIX && !OS_MACOSX
@@ skipping 1234 matching lines @@
   return NULL;
 #endif
 }
 
 void ChromeContentBrowserClient::RequestPermission(
     content::PermissionType permission,
     content::WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame,
     bool user_gesture,
-    const base::Callback<void(bool)>& result_callback) {
+    const base::Callback<void(content::PermissionStatus)>& result_callback) {
   int render_process_id = web_contents->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
   const PermissionRequestID request_id(render_process_id,
                                        render_view_id,
                                        bridge_id,
                                        requesting_frame);
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   PermissionContextBase* context = GetPermissionContext(profile, permission);
 
   if (!context)
     return;
 
   context->RequestPermission(web_contents, request_id, requesting_frame,
-                             user_gesture, result_callback);
+                             user_gesture,
+                             base::Bind(&OnRequestPermission, result_callback));
 }
 
 content::PermissionStatus ChromeContentBrowserClient::GetPermissionStatus(
     content::PermissionType permission,
     content::BrowserContext* browser_context,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   DCHECK(browser_context);
   Profile* profile = Profile::FromBrowserContext(browser_context);
   PermissionContextBase* context = GetPermissionContext(profile, permission);
@@ skipping 682 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome