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

Unified Diff: chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years 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/test/perf/startup_test.cc ('k') | chrome/tools/convert_dict/convert_dict_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
index bcea88e61c00ad9c4c11587b48e1f973fde59603..42a0f62f2a0988a953eb469df7b5fda3144be207 100644
--- a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
+++ b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
@@ -446,7 +446,7 @@ std::string ProcessBasicConstraints(SECItem* extension_data) {
rv = l10n_util::GetStringUTF8(IDS_CERT_X509_BASIC_CONSTRAINT_IS_NOT_CA);
rv += '\n';
if (value.pathLenConstraint != -1) {
- string16 depth;
+ base::string16 depth;
if (value.pathLenConstraint == CERT_UNLIMITED_PATH_CONSTRAINT) {
depth = l10n_util::GetStringUTF16(
IDS_CERT_X509_BASIC_CONSTRAINT_PATH_LEN_UNLIMITED);
@@ -827,8 +827,8 @@ std::string ProcessAuthInfoAccess(SECItem* extension_data) {
while (*aia != NULL) {
desc = *aia++;
- string16 location_str = UTF8ToUTF16(ProcessGeneralName(arena.get(),
- desc->location));
+ base::string16 location_str =
+ UTF8ToUTF16(ProcessGeneralName(arena.get(), desc->location));
switch (SECOID_FindOIDTag(&desc->method)) {
case SEC_OID_PKIX_OCSP:
rv += l10n_util::GetStringFUTF8(IDS_CERT_OCSP_RESPONDER_FORMAT,
« no previous file with comments | « chrome/test/perf/startup_test.cc ('k') | chrome/tools/convert_dict/convert_dict_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698