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

chrome/browser/geolocation/geolocation_permission_context.cc

 // Copyright 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/geolocation/geolocation_permission_context.h"
 
 #include "base/bind.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/common/permission_request_id.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/geolocation_provider.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 
 
 GeolocationPermissionContext::GeolocationPermissionContext(
     Profile* profile)
     : PermissionContextBase(profile, CONTENT_SETTINGS_TYPE_GEOLOCATION),
       extensions_context_(profile) {
 }
 
 GeolocationPermissionContext::~GeolocationPermissionContext() {
@@ skipping 38 matching lines @@
     if (extensions_context_.CancelPermissionRequest(
         web_contents, id.bridge_id()))
       return;
     PermissionContextBase::CancelPermissionRequest(web_contents, id);
 }
 
 void GeolocationPermissionContext::UpdateTabContext(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     bool allowed) {
-  // WebContents may have gone away (or not exists for extension).
   TabSpecificContentSettings* content_settings =
-      TabSpecificContentSettings::Get(id.render_process_id(),
-                                      id.render_view_id());
+      TabSpecificContentSettings::GetForFrame(id.render_process_id(),
+                                              id.render_frame_id());
+
+  // WebContents might not exist (extensions) or no longer exist. In which case,
+  // TabSpecificContentSettings will be null.
   if (content_settings)
     content_settings->OnGeolocationPermissionSet(
         requesting_frame.GetOrigin(), allowed);
 
   if (allowed) {
     content::GeolocationProvider::GetInstance()
         ->UserDidOptIntoLocationServices();
   }
 }
 
 bool GeolocationPermissionContext::IsRestrictedToSecureOrigins() const {
   return false;
 }