diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 09:03:15 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 09:03:15 +0000 |
| commit | 05aab99c37809726da162f19dfa0702a61857a8d (patch) | |
| tree | fdcf72a3b2202eabb345ccc6a39287860e708b18 /chrome/third_party | |
| parent | 2f1c6d806a644e6765ef7142931af351443055db (diff) | |
| download | chromium_src-05aab99c37809726da162f19dfa0702a61857a8d.zip chromium_src-05aab99c37809726da162f19dfa0702a61857a8d.tar.gz chromium_src-05aab99c37809726da162f19dfa0702a61857a8d.tar.bz2 | |
Add base:: to string16s in chrome/.
TBR=sky@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/94013004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/third_party')
| -rw-r--r-- | chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp index bcea88e..42a0f62 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, |