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

Unified Diff: components/url_matcher/url_matcher.cc

Issue 2231753002: components: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more call site 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
Index: components/url_matcher/url_matcher.cc
diff --git a/components/url_matcher/url_matcher.cc b/components/url_matcher/url_matcher.cc
index b4a9d2122423f18333e8f6119bbe8c4f164a308d..8e5cd9ebfdc7b16f982a4356ec10955981e3cc7f 100644
--- a/components/url_matcher/url_matcher.cc
+++ b/components/url_matcher/url_matcher.cc
@@ -222,7 +222,7 @@ bool URLMatcherCondition::IsMatch(
const std::set<StringPattern::ID>& matching_patterns,
const GURL& url) const {
DCHECK(string_pattern_);
- if (!ContainsKey(matching_patterns, string_pattern_->id()))
+ if (!base::ContainsKey(matching_patterns, string_pattern_->id()))
return false;
// The criteria HOST_CONTAINS, PATH_CONTAINS, QUERY_CONTAINS are based on
// a substring match on the raw URL. In case of a match, we need to verify
@@ -262,9 +262,9 @@ const char kQuerySeparator = '&';
URLMatcherConditionFactory::URLMatcherConditionFactory() : id_counter_(0) {}
URLMatcherConditionFactory::~URLMatcherConditionFactory() {
- STLDeleteElements(&substring_pattern_singletons_);
- STLDeleteElements(&regex_pattern_singletons_);
- STLDeleteElements(&origin_and_path_regex_pattern_singletons_);
+ base::STLDeleteElements(&substring_pattern_singletons_);
+ base::STLDeleteElements(&regex_pattern_singletons_);
+ base::STLDeleteElements(&origin_and_path_regex_pattern_singletons_);
}
std::string URLMatcherConditionFactory::CanonicalizeURLForComponentSearches(
@@ -465,7 +465,7 @@ void URLMatcherConditionFactory::ForgetUnusedPatterns(
const std::set<StringPattern::ID>& used_patterns) {
PatternSingletons::iterator i = substring_pattern_singletons_.begin();
while (i != substring_pattern_singletons_.end()) {
- if (ContainsKey(used_patterns, (*i)->id())) {
+ if (base::ContainsKey(used_patterns, (*i)->id())) {
++i;
} else {
delete *i;
@@ -474,7 +474,7 @@ void URLMatcherConditionFactory::ForgetUnusedPatterns(
}
i = regex_pattern_singletons_.begin();
while (i != regex_pattern_singletons_.end()) {
- if (ContainsKey(used_patterns, (*i)->id())) {
+ if (base::ContainsKey(used_patterns, (*i)->id())) {
++i;
} else {
delete *i;
@@ -483,7 +483,7 @@ void URLMatcherConditionFactory::ForgetUnusedPatterns(
}
i = origin_and_path_regex_pattern_singletons_.begin();
while (i != origin_and_path_regex_pattern_singletons_.end()) {
- if (ContainsKey(used_patterns, (*i)->id())) {
+ if (base::ContainsKey(used_patterns, (*i)->id())) {
++i;
} else {
delete *i;
@@ -784,7 +784,7 @@ bool URLMatcherConditionSet::IsMatch(
for (QueryConditions::const_iterator i = query_conditions_.begin();
i != query_conditions_.end();
++i) {
- if (!ContainsKey(matching_patterns, i->string_pattern()->id()))
+ if (!base::ContainsKey(matching_patterns, i->string_pattern()->id()))
return false;
}
for (QueryConditions::const_iterator i = query_conditions_.begin();
« no previous file with comments | « components/url_matcher/regex_set_matcher_unittest.cc ('k') | components/user_prefs/tracked/segregated_pref_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698