Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(991)

Unified Diff: extensions/common/permissions/permissions_data.cc

Issue 2873133006: Removed unecessary thread owner check. We just care about whether the lock was acquired. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..245040e6f542b703b342ffced51d3348ea3cc37b 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -158,10 +158,9 @@ const URLPatternSet PermissionsData::policy_blocked_hosts() const {
}
const URLPatternSet& PermissionsData::PolicyBlockedHostsUnsafe() const {
- DCHECK(!thread_checker_ || thread_checker_->CalledOnValidThread());
+ runtime_lock_.AssertAcquired();
if (uses_default_policy_host_restrictions)
return default_policy_blocked_hosts();
- runtime_lock_.AssertAcquired();
return policy_blocked_hosts_unsafe_;
}
@@ -171,10 +170,9 @@ const URLPatternSet PermissionsData::policy_allowed_hosts() const {
}
const URLPatternSet& PermissionsData::PolicyAllowedHostsUnsafe() const {
- DCHECK(!thread_checker_ || thread_checker_->CalledOnValidThread());
+ runtime_lock_.AssertAcquired();
if (uses_default_policy_host_restrictions)
return default_policy_allowed_hosts();
- runtime_lock_.AssertAcquired();
return policy_allowed_hosts_unsafe_;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698