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

Unified Diff: content/browser/renderer_host/pepper/pepper_tcp_socket.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_tcp_socket.cc
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc
index 8d590f77adb757f7399ef217db37aa6c1c5920f3..16b19b23bb8dc2baba85b37697ffc8c7dabfc66a 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc
+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc
@@ -313,10 +313,11 @@ bool PepperTCPSocket::GetCertificateFields(
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,
@@ -329,10 +330,12 @@ bool PepperTCPSocket::GetCertificateFields(
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/renderer_host/pepper/pepper_socket_utils.cc ('k') | content/browser/renderer_host/websocket_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698