| Index: extensions/common/permissions/permissions_data.h
|
| diff --git a/extensions/common/permissions/permissions_data.h b/extensions/common/permissions/permissions_data.h
|
| index a619590a29d8b32c0c3980d36dcd6620ffe11d66..c1c5de2dcc5e0e9c381e892daf7b575c61577953 100644
|
| --- a/extensions/common/permissions/permissions_data.h
|
| +++ b/extensions/common/permissions/permissions_data.h
|
| @@ -258,15 +258,16 @@ class PermissionsData {
|
| // methods instead (e.g. CanAccessPage()).
|
| const URLPatternSet policy_allowed_hosts() const;
|
|
|
| -#if defined(UNIT_TEST)
|
| - const PermissionSet* GetTabSpecificPermissionsForTesting(int tab_id) const {
|
| + // Check if a specific URL is blocked by policy from extension use at runtime.
|
| + bool IsRuntimeBlockedHost(const GURL& url) const {
|
| base::AutoLock auto_lock(runtime_lock_);
|
| - return GetTabSpecificPermissions(tab_id);
|
| + return IsRuntimeBlockedHostUnsafe(url);
|
| }
|
|
|
| - bool IsRuntimeBlockedHostForTesting(const GURL& url) const {
|
| +#if defined(UNIT_TEST)
|
| + const PermissionSet* GetTabSpecificPermissionsForTesting(int tab_id) const {
|
| base::AutoLock auto_lock(runtime_lock_);
|
| - return IsRuntimeBlockedHost(url);
|
| + return GetTabSpecificPermissions(tab_id);
|
| }
|
| #endif
|
|
|
| @@ -296,7 +297,8 @@ class PermissionsData {
|
| std::string* error) const;
|
|
|
| // Check if a specific URL is blocked by policy from extension use at runtime.
|
| - bool IsRuntimeBlockedHost(const GURL& url) const;
|
| + // You must acquire the runtime_lock_ before calling.
|
| + bool IsRuntimeBlockedHostUnsafe(const GURL& url) const;
|
|
|
| // Same as policy_blocked_hosts but instead returns a reference.
|
| // You must acquire runtime_lock_ before calling this.
|
|
|