chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc - Issue 2230203002: chrome: 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: chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc

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

Patch Set: Removed accidental components/ change 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 | « chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker_unittest.cc ('k') | chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc

diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc

index 5866146fde663054fed1b7b4516ab8fbdf14e79a..e6271fe09579f57fcc780f4f79e13db4ea7d672e 100644

--- a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc

+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc

@@ -194,7 +194,7 @@ void DeclarativeContentPageUrlConditionTracker::OnWebContentsNavigation(

content::WebContents* contents,

const content::LoadCommittedDetails& details,

const content::FrameNavigateParams& params) {

- DCHECK(ContainsKey(per_web_contents_tracker_, contents));

+ DCHECK(base::ContainsKey(per_web_contents_tracker_, contents));

per_web_contents_tracker_[contents]->UpdateMatchesForCurrentUrl(true);

}

@@ -208,8 +208,8 @@ bool DeclarativeContentPageUrlConditionTracker::EvaluatePredicate(

DCHECK(loc != per_web_contents_tracker_.end());

const std::set<url_matcher::URLMatcherConditionSet::ID>&

web_contents_id_matches = loc->second->matches();

- return ContainsKey(web_contents_id_matches,

- typed_predicate->url_matcher_condition_set()->id());

+ return base::ContainsKey(web_contents_id_matches,

+ typed_predicate->url_matcher_condition_set()->id());

}

bool DeclarativeContentPageUrlConditionTracker::IsEmpty() const {

@@ -218,7 +218,7 @@ bool DeclarativeContentPageUrlConditionTracker::IsEmpty() const {

void DeclarativeContentPageUrlConditionTracker::DeletePerWebContentsTracker(

content::WebContents* contents) {

- DCHECK(ContainsKey(per_web_contents_tracker_, contents));

+ DCHECK(base::ContainsKey(per_web_contents_tracker_, contents));

per_web_contents_tracker_.erase(contents);

}