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

chrome/browser/permissions/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 "chrome/browser/permissions/permission_manager.h"
 
 #include "base/callback.h"
 #include "chrome/browser/content_settings/permission_context_base.h"
 #include "chrome/browser/permissions/permission_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/permission_request_id.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"
 
 namespace {
 
 // Helper method to convert ContentSetting to content::PermissionStatus.
 content::PermissionStatus
 ContentSettingToPermissionStatus(ContentSetting setting) {
   switch (setting) {
     case CONTENT_SETTING_ALLOW:
     case CONTENT_SETTING_SESSION_ONLY:
@@ skipping 63 matching lines @@
     : profile_(profile) {
 }
 
 PermissionManager::~PermissionManager() {
   if (!subscriptions_.IsEmpty())
     profile_->GetHostContentSettingsMap()->RemoveObserver(this);
 }
 
 void PermissionManager::RequestPermission(
     content::PermissionType permission,
-    content::WebContents* web_contents,
+    content::RenderFrameHost* render_frame_host,
     int request_id,
     const GURL& requesting_origin,
     bool user_gesture,
     const base::Callback<void(content::PermissionStatus)>& callback) {
   PermissionContextBase* context = PermissionContext::Get(profile_, permission);
   if (!context) {
     callback.Run(content::PERMISSION_STATUS_DENIED);
     return;
   }
 
-  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();
   const PermissionRequestID request(render_process_id,
-                                    render_view_id,
+                                    render_frame_id,
                                     request_id,
                                     requesting_origin);
 
-  context->RequestPermission(web_contents, request, requesting_origin,
-                             user_gesture,
-                             base::Bind(&PermissionStatusCallbackWrapper,
-                                        callback));
+  context->RequestPermission(
+      content::WebContents::FromRenderFrameHost(render_frame_host),
+      request, requesting_origin, user_gesture,
+      base::Bind(&PermissionStatusCallbackWrapper,
+                 callback));
 }
 
 void PermissionManager::CancelPermissionRequest(
     content::PermissionType permission,
-    content::WebContents* web_contents,
+    content::RenderFrameHost* render_frame_host,
     int request_id,
     const GURL& requesting_origin) {
   PermissionContextBase* context = PermissionContext::Get(profile_, permission);
   if (!context)
     return;
 
-  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();
   const PermissionRequestID request(render_process_id,
-                                    render_view_id,
+                                    render_frame_id,
                                     request_id,
                                     requesting_origin);
 
-  context->CancelPermissionRequest(web_contents, request);
+  context->CancelPermissionRequest(
+      content::WebContents::FromRenderFrameHost(render_frame_host), request);
 }
 
 void PermissionManager::ResetPermission(
     content::PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   PermissionContextBase* context = PermissionContext::Get(profile_, permission);
   if (!context)
     return;
 
@@ skipping 86 matching lines @@
     // Add the callback to |callbacks| which will be run after the loop to
     // prevent re-entrance issues.
     callbacks.push_back(
         base::Bind(subscription->callback,
                    ContentSettingToPermissionStatus(new_value)));
   }
 
   for (const auto& callback : callbacks)
     callback.Run();
 }