ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

android_webview/browser/aw_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 "android_webview/browser/aw_content_browser_client.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
 #include "android_webview/browser/aw_contents_client_bridge_base.h"
@@ skipping 121 matching lines @@
   }
   void SaveAccessToken(const GURL& server_url,
                        const base::string16& access_token) override {}
 
  private:
   ~AwAccessTokenStore() override {}
 
   DISALLOW_COPY_AND_ASSIGN(AwAccessTokenStore);
 };
 
-}  // namespace
+void CallbackPermisisonStatusWrapper(
+    const base::Callback<void(content::PermissionStatus)>& callback,
+    bool allowed) {
+  callback.Run(allowed ? content::PERMISSION_STATUS_GRANTED
+                       : content::PERMISSION_STATUS_DENIED);
+}
+
+}  // anonymous namespace
 
 std::string AwContentBrowserClient::GetAcceptLangsImpl() {
   // Start with the currnet locale.
   std::string langs = base::android::GetDefaultLocale();
 
   // If we're not en-US, add in en-US which will be
   // used with a lower q-value.
   if (base::StringToLowerASCII(langs) != "en-us") {
     langs += ",en-US";
   }
@@ skipping 220 matching lines @@
     callback.Run(NULL);
   }
 }
 
 void AwContentBrowserClient::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)>& callback) {
   int render_process_id = web_contents->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
   GURL origin = requesting_frame.GetOrigin();
   AwBrowserPermissionRequestDelegate* delegate =
       AwBrowserPermissionRequestDelegate::FromID(render_process_id,
                                                  render_view_id);
   switch (permission) {
     case content::PERMISSION_GEOLOCATION:
       if (!delegate) {
         DVLOG(0) << "Dropping GeolocationPermission request";
-        result_callback.Run(false);
+        callback.Run(content::PERMISSION_STATUS_DENIED);
         return;
       }
-      delegate->RequestGeolocationPermission(origin, result_callback);
+      delegate->RequestGeolocationPermission(
+          origin, base::Bind(&CallbackPermisisonStatusWrapper, callback));
       break;
     case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
       if (!delegate) {
         DVLOG(0) << "Dropping ProtectedMediaIdentifierPermission request";
-        result_callback.Run(false);
+        callback.Run(content::PERMISSION_STATUS_DENIED);
         return;
       }
-      delegate->RequestProtectedMediaIdentifierPermission(origin,
-                                                          result_callback);
+      delegate->RequestProtectedMediaIdentifierPermission(
+          origin, base::Bind(&CallbackPermisisonStatusWrapper, callback));
       break;
     case content::PERMISSION_MIDI_SYSEX:
     case content::PERMISSION_NOTIFICATIONS:
     case content::PERMISSION_PUSH_MESSAGING:
       NOTIMPLEMENTED() << "RequestPermission not implemented for "
                        << permission;
       break;
     case content::PERMISSION_NUM:
       NOTREACHED() << "Invalid RequestPermission for " << permission;
       break;
@@ skipping 132 matching lines @@
   return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
 }
 #endif
 
 content::DevToolsManagerDelegate*
 AwContentBrowserClient::GetDevToolsManagerDelegate() {
   return new AwDevToolsManagerDelegate();
 }
 
 }  // namespace android_webview