Use RenderFrameHost for ::RequestPermission() and ::CancelPermission().

android_webview/browser/aw_permission_manager.cc

 // Copyright 2015 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_permission_manager.h"
 
 #include <string>
 
 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/permission_type.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
-#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 using content::PermissionStatus;
 using content::PermissionType;
 
 namespace android_webview {
 
 class LastRequestResultCache {
  public:
   LastRequestResultCache() : weak_factory_(this) {}
@@ skipping 134 matching lines @@
 
 AwPermissionManager::AwPermissionManager()
     : content::PermissionManager(), result_cache_(new LastRequestResultCache) {
 }
 
 AwPermissionManager::~AwPermissionManager() {
 }
 
 void AwPermissionManager::RequestPermission(
     PermissionType permission,
-    content::WebContents* web_contents,
+    content::RenderFrameHost* render_frame_host,
     int request_id,
     const GURL& origin,
     bool user_gesture,
     const base::Callback<void(PermissionStatus)>& callback) {
-  int render_process_id = web_contents->GetRenderProcessHost()->GetID();
-  int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
+  int render_process_id = render_frame_host->GetProcess()->GetID();
+  int render_frame_id = render_frame_host->GetRoutingID();
   AwBrowserPermissionRequestDelegate* delegate =
       AwBrowserPermissionRequestDelegate::FromID(render_process_id,
-                                                 render_view_id);
+                                                 render_frame_id);
   if (!delegate) {
     DVLOG(0) << "Dropping permission request for "
              << static_cast<int>(permission);
     callback.Run(content::PERMISSION_STATUS_DENIED);
     return;
   }
 
   const GURL& embedding_origin =
-      web_contents->GetLastCommittedURL().GetOrigin();
+      content::WebContents::FromRenderFrameHost(render_frame_host)
+          ->GetLastCommittedURL().GetOrigin();
 
   switch (permission) {
     case PermissionType::GEOLOCATION:
       delegate->RequestGeolocationPermission(
           origin, base::Bind(&CallbackPermisisonStatusWrapper,
                              result_cache_->GetWeakPtr(), callback, permission,
                              origin, embedding_origin));
       break;
     case PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       delegate->RequestProtectedMediaIdentifierPermission(
@@ skipping 10 matching lines @@
       break;
     case PermissionType::NUM:
       NOTREACHED() << "PermissionType::NUM was not expected here.";
       callback.Run(content::PERMISSION_STATUS_DENIED);
       break;
   }
 }
 
 void AwPermissionManager::CancelPermissionRequest(
     PermissionType permission,
-    content::WebContents* web_contents,
+    content::RenderFrameHost* render_frame_host,
     int request_id,
     const GURL& origin) {
   // The caller is canceling (presumably) the most recent request. Assuming the
   // request did not complete, the user did not respond to the requset.
   // Thus, assume we do not know the result.
   const GURL& embedding_origin =
-      web_contents->GetLastCommittedURL().GetOrigin();
+      content::WebContents::FromRenderFrameHost(render_frame_host)
+          ->GetLastCommittedURL().GetOrigin();
   result_cache_->ClearResult(permission, origin, embedding_origin);
 
-  int render_process_id = web_contents->GetRenderProcessHost()->GetID();
-  int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
+  int render_process_id = render_frame_host->GetProcess()->GetID();
+  int render_frame_id = render_frame_host->GetRoutingID();
   AwBrowserPermissionRequestDelegate* delegate =
       AwBrowserPermissionRequestDelegate::FromID(render_process_id,
-                                                 render_view_id);
+                                                 render_frame_id);
   if (!delegate)
     return;
 
   switch (permission) {
     case PermissionType::GEOLOCATION:
       delegate->CancelGeolocationPermissionRequests(origin);
       break;
     case PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       delegate->CancelProtectedMediaIdentifierPermissionRequests(origin);
       break;
@@ skipping 40 matching lines @@
     const GURL& embedding_origin,
     const base::Callback<void(PermissionStatus)>& callback) {
   return -1;
 }
 
 void AwPermissionManager::UnsubscribePermissionStatusChange(
     int subscription_id) {
 }
 
 }  // namespace android_webview