summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorgroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-18 22:33:04 +0000
committergroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-18 22:33:04 +0000
commit7d3cbc90c089bb3ba5cb81a5abdc0846d5826def (patch)
tree8ad0db2d4581c8e935ed1b07c6b4147a5350a204 /crypto
parentbb192b87059a76b89fbc20ad08347c28656e838d (diff)
downloadchromium_src-7d3cbc90c089bb3ba5cb81a5abdc0846d5826def.zip
chromium_src-7d3cbc90c089bb3ba5cb81a5abdc0846d5826def.tar.gz
chromium_src-7d3cbc90c089bb3ba5cb81a5abdc0846d5826def.tar.bz2
[Cleanup] Remove StringPrintf from global namespace
use of StringPrintf now requires prefixing with base:: or a per-scope using directive TBR'd: abodenha: chrome/service brettw: content, third_party, webkit darin: base, chrome/browser, chrome/renderer dgarret: courgette enne: cc fischmann: media gbillock: sql joi: google_apis,components rsleevi: net, crypto sky: chrome/test thestig: printing, chrome/common, tsepez: ipc wez: remoting yfriedman: testing/android NOTRY=true R=brettw@chromium.org TBR=joi@chromium.org, rsleevi@chromium.org, enne@chromium.org, thestig@chromium.org, darin@chromium.org, abodenha@chromium.org, sky@chromium.org, dgarret@chromium.org, tsepez@chromium.org, fishman@chromium.org, wez@chromium.org, gbillock@chromium.org, yfriedman@chromium.org BUG= Review URL: https://codereview.chromium.org/12767006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
-rw-r--r--crypto/nss_util.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index a53fa40..0d4b1141 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -73,7 +73,7 @@ std::string GetNSSErrorMessage() {
PRInt32 copied = PR_GetErrorText(error_text.get());
result = std::string(error_text.get(), copied);
} else {
- result = StringPrintf("NSS error code: %d", PR_GetError());
+ result = base::StringPrintf("NSS error code: %d", PR_GetError());
}
return result;
}
@@ -482,7 +482,7 @@ class NSSInitSingleton {
// Initialize with a persistent database (likely, ~/.pki/nssdb).
// Use "sql:" which can be shared by multiple processes safely.
std::string nss_config_dir =
- StringPrintf("sql:%s", database_dir.value().c_str());
+ base::StringPrintf("sql:%s", database_dir.value().c_str());
#if defined(OS_CHROMEOS)
status = NSS_Init(nss_config_dir.c_str());
#else
@@ -586,7 +586,7 @@ class NSSInitSingleton {
SECMODModule* LoadModule(const char* name,
const char* library_path,
const char* params) {
- std::string modparams = StringPrintf(
+ std::string modparams = base::StringPrintf(
"name=\"%s\" library=\"%s\" %s",
name, library_path, params ? params : "");
@@ -608,8 +608,8 @@ class NSSInitSingleton {
static PK11SlotInfo* OpenUserDB(const base::FilePath& path,
const char* description) {
const std::string modspec =
- StringPrintf("configDir='sql:%s' tokenDescription='%s'",
- path.value().c_str(), description);
+ base::StringPrintf("configDir='sql:%s' tokenDescription='%s'",
+ path.value().c_str(), description);
PK11SlotInfo* db_slot = SECMOD_OpenUserDB(modspec.c_str());
if (db_slot) {
if (PK11_NeedUserInit(db_slot))