extensions/browser/api/declarative_webrequest/webrequest_rules_registry.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_rules_registry.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_webrequest/webrequest_condition.cc ('k') | extensions/browser/api/hid/hid_device_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc

diff --git a/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc b/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc

index 62bf3cc3d37d5030ae8030661c4837d5aeb60023..0fb57d059c3273557f680156acac32057ac3b417 100644

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

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

@@ -130,7 +130,7 @@ std::list<LinkedPtrEventResponseDelta> WebRequestRulesRegistry::CreateDeltas(

if (!rule->tags().empty() && !ignore_tags[extension_id].empty()) {

bool ignore_rule = false;

for (const std::string& tag : rule->tags())

- ignore_rule |= ContainsKey(ignore_tags[extension_id], tag);

+ ignore_rule |= base::ContainsKey(ignore_tags[extension_id], tag);

if (ignore_rule)

continue;

}

@@ -381,7 +381,7 @@ void WebRequestRulesRegistry::AddTriggeredRules(

for (url_matcher::URLMatcherConditionSet::ID url_match : url_matches) {

RuleTriggers::const_iterator rule_trigger = rule_triggers_.find(url_match);

CHECK(rule_trigger != rule_triggers_.end());

- if (!ContainsKey(*result, rule_trigger->second) &&

+ if (!base::ContainsKey(*result, rule_trigger->second) &&

rule_trigger->second->conditions().IsFulfilled(url_match, request_data))

result->insert(rule_trigger->second);

}