summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl/ssl_tab_helper.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 23:24:23 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 23:24:23 +0000
commitf911df5f3947379800704cb2b0193b0976336b22 (patch)
treed08ecc8ee4bb4580794294e59d702c1c0d7c0424 /chrome/browser/ssl/ssl_tab_helper.cc
parent04338722eaee6d09b761353fb6e937b41933ff5e (diff)
downloadchromium_src-f911df5f3947379800704cb2b0193b0976336b22.zip
chromium_src-f911df5f3947379800704cb2b0193b0976336b22.tar.gz
chromium_src-f911df5f3947379800704cb2b0193b0976336b22.tar.bz2
Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
BUG=330556 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/120983002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl/ssl_tab_helper.cc')
-rw-r--r--chrome/browser/ssl/ssl_tab_helper.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/ssl/ssl_tab_helper.cc b/chrome/browser/ssl/ssl_tab_helper.cc
index 5aec77c..51612f4 100644
--- a/chrome/browser/ssl/ssl_tab_helper.cc
+++ b/chrome/browser/ssl/ssl_tab_helper.cc
@@ -219,7 +219,8 @@ void SSLTabHelper::OnVerifyClientCertificateError(
GetAddCertData(handler.get())->ShowInfoBar(
l10n_util::GetStringFUTF16(IDS_ADD_CERT_ERR_INVALID_CERT,
base::IntToString16(-error_code),
- ASCIIToUTF16(net::ErrorToString(error_code))),
+ base::ASCIIToUTF16(
+ net::ErrorToString(error_code))),
NULL);
}
@@ -234,7 +235,8 @@ void SSLTabHelper::OnAddClientCertificateSuccess(
// TODO(evanm): GetDisplayName should return UTF-16.
GetAddCertData(handler.get())->ShowInfoBar(
l10n_util::GetStringFUTF16(IDS_ADD_CERT_SUCCESS_INFOBAR_LABEL,
- UTF8ToUTF16(cert->issuer().GetDisplayName())),
+ base::UTF8ToUTF16(
+ cert->issuer().GetDisplayName())),
cert);
}
@@ -245,7 +247,8 @@ void SSLTabHelper::OnAddClientCertificateError(
GetAddCertData(handler.get())->ShowInfoBar(
l10n_util::GetStringFUTF16(IDS_ADD_CERT_ERR_FAILED,
base::IntToString16(-error_code),
- ASCIIToUTF16(net::ErrorToString(error_code))),
+ base::ASCIIToUTF16(
+ net::ErrorToString(error_code))),
NULL);
}