| Index: chrome/browser/ssl/ssl_error_info.cc
|
| diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc
|
| index 4a9060ac2afc2c93f7fffff31640ad23f2b31776..a35ffd8f5f361ede99bda3f77f5b030c595c881f 100644
|
| --- a/chrome/browser/ssl/ssl_error_info.cc
|
| +++ b/chrome/browser/ssl/ssl_error_info.cc
|
| @@ -58,8 +58,7 @@ SSLErrorInfo SSLErrorInfo::CreateError(ErrorType error_type,
|
| l10n_util::GetStringFUTF16(IDS_CERT_ERROR_COMMON_NAME_INVALID_DETAILS,
|
| UTF8ToUTF16(request_url.host()),
|
| net::EscapeForHTML(
|
| - UTF8ToUTF16(dns_names[i])),
|
| - UTF8ToUTF16(request_url.host()));
|
| + UTF8ToUTF16(dns_names[i])));
|
| short_description = l10n_util::GetStringUTF16(
|
| IDS_CERT_ERROR_COMMON_NAME_INVALID_DESCRIPTION);
|
| extra_info.push_back(
|
| @@ -78,9 +77,7 @@ SSLErrorInfo SSLErrorInfo::CreateError(ErrorType error_type,
|
| title = l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXPIRED_TITLE);
|
| details = l10n_util::GetStringFUTF16(
|
| IDS_CERT_ERROR_EXPIRED_DETAILS,
|
| - UTF8ToUTF16(request_url.host()),
|
| - UTF8ToUTF16(request_url.host()),
|
| - base::TimeFormatFriendlyDateAndTime(base::Time::Now()));
|
| + UTF8ToUTF16(request_url.host()));
|
| short_description =
|
| l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXPIRED_DESCRIPTION);
|
| extra_info.push_back(l10n_util::GetStringUTF16(
|
| @@ -92,9 +89,7 @@ SSLErrorInfo SSLErrorInfo::CreateError(ErrorType error_type,
|
| title = l10n_util::GetStringUTF16(IDS_CERT_ERROR_NOT_YET_VALID_TITLE);
|
| details = l10n_util::GetStringFUTF16(
|
| IDS_CERT_ERROR_NOT_YET_VALID_DETAILS,
|
| - UTF8ToUTF16(request_url.host()),
|
| - UTF8ToUTF16(request_url.host()),
|
| - base::TimeFormatFriendlyDateAndTime(base::Time::Now()));
|
| + UTF8ToUTF16(request_url.host()));
|
| short_description =
|
| l10n_util::GetStringUTF16(IDS_CERT_ERROR_NOT_YET_VALID_DESCRIPTION);
|
| extra_info.push_back(
|
| @@ -144,8 +139,10 @@ SSLErrorInfo SSLErrorInfo::CreateError(ErrorType error_type,
|
| IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DESCRIPTION);
|
| break;
|
| case CERT_UNABLE_TO_CHECK_REVOCATION:
|
| - title = l10n_util::GetStringUTF16(
|
| - IDS_CERT_ERROR_UNABLE_TO_CHECK_REVOCATION_TITLE);
|
| + // TODO(felt): Hasn't this been deprecated?
|
| + title = l10n_util::GetStringFUTF16(
|
| + IDS_CERT_ERROR_UNABLE_TO_CHECK_REVOCATION_TITLE,
|
| + UTF8ToUTF16(request_url.host()));
|
| details = l10n_util::GetStringUTF16(
|
| IDS_CERT_ERROR_UNABLE_TO_CHECK_REVOCATION_DETAILS);
|
| short_description = l10n_util::GetStringUTF16(
|
|
|