Add requesting origin param to PermissionManager::GetPermissionStatusForFrame

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 <memory>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 322 matching lines @@
 PermissionResult PermissionManager::GetPermissionStatus(
     ContentSettingsType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   return GetPermissionStatusHelper(permission, nullptr /* render_frame_host */,
                                    requesting_origin, embedding_origin);
 }
 
 PermissionResult PermissionManager::GetPermissionStatusForFrame(
     ContentSettingsType permission,
-    content::RenderFrameHost* render_frame_host) {
+    content::RenderFrameHost* render_frame_host,
+    const GURL& requesting_origin) {
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
   GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
-  return GetPermissionStatusHelper(
-      permission, render_frame_host,
-      render_frame_host->GetLastCommittedURL().GetOrigin(), embedding_origin);
+  return GetPermissionStatusHelper(permission, render_frame_host,
+                                   requesting_origin, embedding_origin);
 }
 
 int PermissionManager::RequestPermission(
     PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     bool user_gesture,
     const base::Callback<void(PermissionStatus)>& callback) {
   ContentSettingsType content_settings_type =
       PermissionTypeToContentSetting(permission);
@@ skipping 178 matching lines @@
   }
   PermissionContextBase* context = GetPermissionContext(permission);
   PermissionResult result = context->GetPermissionStatus(
       nullptr /* render_frame_host */, requesting_origin.GetOrigin(),
       embedding_origin.GetOrigin());
   DCHECK(result.content_setting == CONTENT_SETTING_ALLOW ||
          result.content_setting == CONTENT_SETTING_ASK ||
          result.content_setting == CONTENT_SETTING_BLOCK);
   return result;
 }