| Index: extensions/common/permissions/permissions_data.cc
|
| diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
|
| index 2002b2946108b2c9e4ef0f28854a53e3cbf7abe9..7d4a6c2f8d427de28456e72722c749832f461d21 100644
|
| --- a/extensions/common/permissions/permissions_data.cc
|
| +++ b/extensions/common/permissions/permissions_data.cc
|
| @@ -282,7 +282,7 @@ URLPatternSet PermissionsData::GetEffectiveHostPermissions() const {
|
| bool PermissionsData::HasHostPermission(const GURL& url) const {
|
| base::AutoLock auto_lock(runtime_lock_);
|
| return active_permissions_unsafe_->HasExplicitAccessToOrigin(url) &&
|
| - !IsRuntimeBlockedHost(url);
|
| + !IsRuntimeBlockedHostUnsafe(url);
|
| }
|
|
|
| bool PermissionsData::HasEffectiveAccessToAllHosts() const {
|
| @@ -414,7 +414,7 @@ bool PermissionsData::HasTabSpecificPermissionToExecuteScript(
|
| return false;
|
| }
|
|
|
| -bool PermissionsData::IsRuntimeBlockedHost(const GURL& url) const {
|
| +bool PermissionsData::IsRuntimeBlockedHostUnsafe(const GURL& url) const {
|
| runtime_lock_.AssertAcquired();
|
| return PolicyBlockedHostsUnsafe().MatchesURL(url) &&
|
| !PolicyAllowedHostsUnsafe().MatchesURL(url);
|
| @@ -433,7 +433,7 @@ PermissionsData::AccessType PermissionsData::CanRunOnPage(
|
| return ACCESS_DENIED;
|
|
|
| if (extension->location() != Manifest::COMPONENT &&
|
| - extension->permissions_data()->IsRuntimeBlockedHost(document_url)) {
|
| + extension->permissions_data()->IsRuntimeBlockedHostUnsafe(document_url)) {
|
| if (error)
|
| *error = extension_misc::kPolicyBlockedScripting;
|
| return ACCESS_DENIED;
|
|
|