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

chrome/browser/content_settings/tab_specific_content_settings.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/content_settings/tab_specific_content_settings.h"
 
 #include <list>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 31 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
 #include "storage/common/fileapi/file_system_types.h"
 
 using content::BrowserThread;
 using content::NavigationController;
 using content::NavigationEntry;
-using content::RenderViewHost;
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(TabSpecificContentSettings);
 
 namespace {
 
 // Returns the object given a render frame's id.
 TabSpecificContentSettings* GetForFrame(int render_process_id,
                                         int render_frame_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 65 matching lines @@
                     ->GetHostContentSettingsMap());
 }
 
 TabSpecificContentSettings::~TabSpecificContentSettings() {
   FOR_EACH_OBSERVER(
       SiteDataObserver, observer_list_, ContentSettingsDestroyed());
 }
 
 // static
 TabSpecificContentSettings* TabSpecificContentSettings::Get(
-    int render_process_id, int render_view_id) {
+    content::RenderFrameHost* render_frame_host) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  RenderViewHost* view = RenderViewHost::FromID(render_process_id,
-                                                render_view_id);
-  if (!view)
-    return NULL;
-
-  WebContents* web_contents = WebContents::FromRenderViewHost(view);
+  WebContents* web_contents =
+      WebContents::FromRenderFrameHost(render_frame_host);
   if (!web_contents)
-    return NULL;
+    return nullptr;
 
   return TabSpecificContentSettings::FromWebContents(web_contents);
 }
 
 // static
 void TabSpecificContentSettings::CookiesRead(int render_process_id,
                                              int render_frame_id,
                                              const GURL& url,
                                              const GURL& frame_url,
                                              const net::CookieList& cookie_list,
@@ skipping 663 matching lines @@
 
 void TabSpecificContentSettings::GeolocationDidNavigate(
     const content::LoadCommittedDetails& details) {
   geolocation_usages_state_.DidNavigate(GetCommittedDetails(details));
 }
 
 void TabSpecificContentSettings::MidiDidNavigate(
     const content::LoadCommittedDetails& details) {
   midi_usages_state_.DidNavigate(GetCommittedDetails(details));
 }