Add PermissionManager::GetPermissionStatusForFrame function

chrome/browser/geolocation/geolocation_permission_context_android.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_android.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 20 matching lines @@
     : GeolocationPermissionContext(profile),
       location_settings_(new LocationSettingsImpl()),
       permission_update_infobar_(nullptr),
       weak_factory_(this) {
 }
 
 GeolocationPermissionContextAndroid::~GeolocationPermissionContextAndroid() {
 }
 
 ContentSetting GeolocationPermissionContextAndroid::GetPermissionStatusInternal(
+    content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     const GURL& embedding_origin) const {
   ContentSetting value =
       GeolocationPermissionContext::GetPermissionStatusInternal(
-          requesting_origin, embedding_origin);
+          render_frame_host, requesting_origin, embedding_origin);
 
   if (value == CONTENT_SETTING_ASK && requesting_origin == embedding_origin) {
     // Consult the DSE Geolocation setting. Note that this only needs to be
     // consulted when the content setting is ASK. In the other cases (ALLOW or
     // BLOCK) checking the setting is redundant, as the setting is kept
     // consistent with the content setting.
     SearchGeolocationService* search_helper =
         SearchGeolocationService::Factory::GetForBrowserContext(profile());
 
     // If the user is incognito, use the DSE Geolocation setting from the
@@ skipping 30 matching lines @@
                                 user_gesture)) {
     PermissionDecided(id, requesting_frame_origin,
                       web_contents->GetLastCommittedURL().GetOrigin(),
                       user_gesture, callback, false /* persist */,
                       CONTENT_SETTING_BLOCK);
     return;
   }
 
   GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
   ContentSetting content_setting =
-      GeolocationPermissionContext::GetPermissionStatus(requesting_frame_origin,
-                                                        embedding_origin)
+      GeolocationPermissionContext::GetPermissionStatus(
+          nullptr /* render_frame_host */, requesting_frame_origin,
+          embedding_origin)
           .content_setting;
   std::vector<ContentSettingsType> content_settings_types;
   content_settings_types.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION);
   if (content_setting == CONTENT_SETTING_ALLOW &&
       PermissionUpdateInfoBarDelegate::ShouldShowPermissionInfobar(
           web_contents, content_settings_types)) {
     permission_update_infobar_ = PermissionUpdateInfoBarDelegate::Create(
         web_contents, content_settings_types,
         base::Bind(
             &GeolocationPermissionContextAndroid
@@ skipping 153 matching lines @@
     // The tab helper can be null in tests.
     if (disclosure_helper)
       disclosure_helper->MaybeShowDisclosure(requesting_origin);
   }
 }
 
 void GeolocationPermissionContextAndroid::SetLocationSettingsForTesting(
     std::unique_ptr<LocationSettings> settings) {
   location_settings_ = std::move(settings);
 }