extensions/browser/api/declarative/deduping_factory.h - 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/deduping_factory.h

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/declarative_rule_unittest.cc ('k') | extensions/browser/api/declarative/rules_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/declarative/deduping_factory.h

diff --git a/extensions/browser/api/declarative/deduping_factory.h b/extensions/browser/api/declarative/deduping_factory.h

index 1cc32318ec5907b5ea5db9000c437146c18531e3..53c75c47f929b037cb71e901ee38107672d40f6d 100644

--- a/extensions/browser/api/declarative/deduping_factory.h

+++ b/extensions/browser/api/declarative/deduping_factory.h

@@ -106,7 +106,7 @@ void DedupingFactory<BaseClassT>::RegisterFactoryMethod(

const std::string& instance_type,

typename DedupingFactory<BaseClassT>::Parameterized parameterized,

FactoryMethod factory_method) {

- DCHECK(!ContainsKey(factory_methods_, instance_type));

+ DCHECK(!base::ContainsKey(factory_methods_, instance_type));

factory_methods_[instance_type] = factory_method;

if (parameterized == IS_PARAMETERIZED)

parameterized_types_.insert(instance_type);

@@ -133,7 +133,7 @@ scoped_refptr<const BaseClassT> DedupingFactory<BaseClassT>::Instantiate(

// We can take a shortcut for objects that are not parameterized. For those

// only a single instance may ever exist so we can simplify the creation

// logic.

- if (!ContainsKey(parameterized_types_, instance_type)) {

+ if (!base::ContainsKey(parameterized_types_, instance_type)) {

if (prototypes.empty()) {

scoped_refptr<const BaseClassT> new_object =

(*factory_method)(instance_type, value, error, bad_message);