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

Unified Diff: content/browser/renderer_host/pepper/pepper_socket_utils.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 months 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
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,
« no previous file with comments | « content/browser/gpu/gpu_data_manager_impl_private.cc ('k') | content/browser/renderer_host/pepper/pepper_tcp_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698