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

Unified Diff: chrome/browser/extensions/install_verifier.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/install_signer.cc ('k') | chrome/browser/extensions/menu_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/install_verifier.cc
diff --git a/chrome/browser/extensions/install_verifier.cc b/chrome/browser/extensions/install_verifier.cc
index 6d10cff1355f478c095b1f70331b783965fe9c1e..ac25d7fa5ca2d0fed4820b2409fb756d67c63b2e 100644
--- a/chrome/browser/extensions/install_verifier.cc
+++ b/chrome/browser/extensions/install_verifier.cc
@@ -271,12 +271,12 @@ base::Time InstallVerifier::SignatureTimestamp() {
}
bool InstallVerifier::IsKnownId(const std::string& id) const {
- return signature_.get() && (ContainsKey(signature_->ids, id) ||
- ContainsKey(signature_->invalid_ids, id));
+ return signature_.get() && (base::ContainsKey(signature_->ids, id) ||
+ base::ContainsKey(signature_->invalid_ids, id));
}
bool InstallVerifier::IsInvalid(const std::string& id) const {
- return ((signature_.get() && ContainsKey(signature_->invalid_ids, id)));
+ return ((signature_.get() && base::ContainsKey(signature_->invalid_ids, id)));
}
void InstallVerifier::VerifyExtension(const std::string& extension_id) {
@@ -328,8 +328,8 @@ void InstallVerifier::RemoveMany(const ExtensionIdSet& ids) {
bool found_any = false;
for (ExtensionIdSet::const_iterator i = ids.begin(); i != ids.end(); ++i) {
- if (ContainsKey(signature_->ids, *i) ||
- ContainsKey(signature_->invalid_ids, *i)) {
+ if (base::ContainsKey(signature_->ids, *i) ||
+ base::ContainsKey(signature_->invalid_ids, *i)) {
found_any = true;
break;
}
@@ -406,7 +406,8 @@ bool InstallVerifier::MustRemainDisabled(const Extension* extension,
bool verified = true;
MustRemainDisabledOutcome outcome = VERIFIED;
- if (ContainsKey(InstallSigner::GetForcedNotFromWebstore(), extension->id())) {
+ if (base::ContainsKey(InstallSigner::GetForcedNotFromWebstore(),
+ extension->id())) {
verified = false;
outcome = FORCED_NOT_VERIFIED;
} else if (!IsFromStore(*extension)) {
@@ -421,7 +422,7 @@ bool InstallVerifier::MustRemainDisabled(const Extension* extension,
outcome = NO_SIGNATURE;
} else if (!IsVerified(extension->id())) {
if (signature_.get() &&
- !ContainsKey(signature_->invalid_ids, extension->id())) {
+ !base::ContainsKey(signature_->invalid_ids, extension->id())) {
outcome = NOT_VERIFIED_BUT_UNKNOWN_ID;
} else {
verified = false;
@@ -548,8 +549,8 @@ void InstallVerifier::GarbageCollect() {
}
bool InstallVerifier::IsVerified(const std::string& id) const {
- return ((signature_.get() && ContainsKey(signature_->ids, id)) ||
- ContainsKey(provisional_, id));
+ return ((signature_.get() && base::ContainsKey(signature_->ids, id)) ||
+ base::ContainsKey(provisional_, id));
}
void InstallVerifier::BeginFetch() {
@@ -568,7 +569,7 @@ void InstallVerifier::BeginFetch() {
if (operation.type == InstallVerifier::REMOVE) {
for (ExtensionIdSet::const_iterator i = operation.ids.begin();
i != operation.ids.end(); ++i) {
- if (ContainsKey(ids_to_sign, *i))
+ if (base::ContainsKey(ids_to_sign, *i))
ids_to_sign.erase(*i);
}
} else { // All other operation types are some form of "ADD".
« no previous file with comments | « chrome/browser/extensions/install_signer.cc ('k') | chrome/browser/extensions/menu_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698