| 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..b06a0a60eedd292aec2c69ac002c1ec55910c234 100644
|
| --- a/extensions/common/permissions/permissions_data.h
|
| +++ b/extensions/common/permissions/permissions_data.h
|
| @@ -263,12 +263,12 @@ class PermissionsData {
|
| base::AutoLock auto_lock(runtime_lock_);
|
| return GetTabSpecificPermissions(tab_id);
|
| }
|
| +#endif
|
|
|
| - bool IsRuntimeBlockedHostForTesting(const GURL& url) const {
|
| + bool IsRuntimeBlockedHost(const GURL& url) const {
|
| base::AutoLock auto_lock(runtime_lock_);
|
| - return IsRuntimeBlockedHost(url);
|
| + return IsRuntimeBlockedHostUnsafe(url);
|
| }
|
| -#endif
|
|
|
| private:
|
| // Gets the tab-specific host permissions of |tab_id|, or NULL if there
|
| @@ -296,7 +296,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.
|
|
|