Index: content/browser/renderer_host/pepper/pepper_socket_utils.cc |
diff --git a/content/browser/renderer_host/pepper/pepper_socket_utils.cc b/content/browser/renderer_host/pepper/pepper_socket_utils.cc |
index 45d35ce4160cf14f653cbb1879bc0d00a607e031..718eec2f0971ba85873ce279798780f3c1978f5d 100644 |
--- a/content/browser/renderer_host/pepper/pepper_socket_utils.cc |
+++ b/content/browser/renderer_host/pepper/pepper_socket_utils.cc |
@@ -81,10 +81,11 @@ bool GetCertificateFields(const net::X509Certificate& cert, |
new base::StringValue(issuer.country_name)); |
fields->SetField( |
PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_NAME, |
- new base::StringValue(JoinString(issuer.organization_names, '\n'))); |
+ new base::StringValue(base::JoinString(issuer.organization_names, "\n"))); |
fields->SetField( |
PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_UNIT_NAME, |
- new base::StringValue(JoinString(issuer.organization_unit_names, '\n'))); |
+ new base::StringValue( |
+ base::JoinString(issuer.organization_unit_names, "\n"))); |
const net::CertPrincipal& subject = cert.subject(); |
fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_COMMON_NAME, |
@@ -97,10 +98,12 @@ bool GetCertificateFields(const net::X509Certificate& cert, |
new base::StringValue(subject.country_name)); |
fields->SetField( |
PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_NAME, |
- new base::StringValue(JoinString(subject.organization_names, '\n'))); |
+ new base::StringValue( |
+ base::JoinString(subject.organization_names, "\n"))); |
fields->SetField( |
PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_UNIT_NAME, |
- new base::StringValue(JoinString(subject.organization_unit_names, '\n'))); |
+ new base::StringValue( |
+ base::JoinString(subject.organization_unit_names, "\n"))); |
const std::string& serial_number = cert.serial_number(); |
fields->SetField(PP_X509CERTIFICATE_PRIVATE_SERIAL_NUMBER, |