Chromium Code Reviews| Index: extensions/browser/api/declarative_webrequest/webrequest_condition.cc |
| diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc |
| index 7e41f1228ece01b3c3ee8573b9fc0b4f6f0fc621..aacc29a4aa847120f1a9109f7562cd53569df21b 100644 |
| --- a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc |
| +++ b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc |
| @@ -99,12 +99,15 @@ bool WebRequestCondition::IsFulfilled( |
| // Check URL attributes if present. |
| if (url_matcher_conditions_.get() && |
| - !ContainsKey(request_data.url_match_ids, url_matcher_conditions_->id())) |
| + !base::ContainsKey(request_data.url_match_ids, |
| + url_matcher_conditions_->id())) { |
| return false; |
| + } |
| if (first_party_url_matcher_conditions_.get() && |
| - !ContainsKey(request_data.first_party_url_match_ids, |
| - first_party_url_matcher_conditions_->id())) |
| + !base::ContainsKey(request_data.first_party_url_match_ids, |
| + first_party_url_matcher_conditions_->id())) { |
| return false; |
| + } |
|
Finnur
2016/08/11 10:19:47
For a long time, we've asked people to not add bra
Sami
2016/08/12 12:25:03
Oh, I thought it was an oversight. Reverted to the
|
| // All condition attributes must be fulfilled for a fulfilled condition. |
| for (WebRequestConditionAttributes::const_iterator i = |