extensions/browser/api/declarative_webrequest/webrequest_condition.cc - Issue 2236443003: extensions: Use stl utilities from the base namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/api/declarative_webrequest/webrequest_condition.cc

Issue 2236443003: extensions: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Don't add braces Created 4 years, 4 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 | « extensions/browser/api/declarative/rules_registry.cc ('k') | extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..0da88268f689dc0931d43dd828394946359604dd 100644

--- a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc

+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc

@@ -99,11 +99,12 @@ 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;

// All condition attributes must be fulfilled for a fulfilled condition.