Revert of Move JoinString to the base namespace

content/browser/renderer_host/pepper/pepper_tcp_socket.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/pepper/pepper_tcp_socket.h"
 
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 295 matching lines @@
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_COMMON_NAME,
                    new base::StringValue(issuer.common_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_LOCALITY_NAME,
                    new base::StringValue(issuer.locality_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_STATE_OR_PROVINCE_NAME,
                    new base::StringValue(issuer.state_or_province_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_COUNTRY_NAME,
                    new base::StringValue(issuer.country_name));
   fields->SetField(
       PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_NAME,
-      new base::StringValue(base::JoinString(issuer.organization_names, "\n")));
+      new base::StringValue(JoinString(issuer.organization_names, '\n')));
   fields->SetField(
       PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_UNIT_NAME,
-      new base::StringValue(
-          base::JoinString(issuer.organization_unit_names, "\n")));
+      new base::StringValue(JoinString(issuer.organization_unit_names, '\n')));
 
   const net::CertPrincipal& subject = cert.subject();
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_COMMON_NAME,
                    new base::StringValue(subject.common_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_LOCALITY_NAME,
                    new base::StringValue(subject.locality_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_STATE_OR_PROVINCE_NAME,
                    new base::StringValue(subject.state_or_province_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_COUNTRY_NAME,
                    new base::StringValue(subject.country_name));
   fields->SetField(
       PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_NAME,
-      new base::StringValue(
-          base::JoinString(subject.organization_names, "\n")));
+      new base::StringValue(JoinString(subject.organization_names, '\n')));
   fields->SetField(
       PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_UNIT_NAME,
-      new base::StringValue(
-          base::JoinString(subject.organization_unit_names, "\n")));
+      new base::StringValue(JoinString(subject.organization_unit_names, '\n')));
 
   const std::string& serial_number = cert.serial_number();
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SERIAL_NUMBER,
                    base::BinaryValue::CreateWithCopiedBuffer(
                        serial_number.data(), serial_number.length()));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_VALIDITY_NOT_BEFORE,
                    new base::FundamentalValue(cert.valid_start().ToDoubleT()));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_VALIDITY_NOT_AFTER,
                    new base::FundamentalValue(cert.valid_expiry().ToDoubleT()));
   std::string der;
@@ skipping 185 matching lines @@
 
   int net_result = socket_->Write(
       write_buffer_.get(),
       write_buffer_->BytesRemaining(),
       base::Bind(&PepperTCPSocket::OnWriteCompleted, base::Unretained(this)));
   if (net_result != net::ERR_IO_PENDING)
     OnWriteCompleted(net_result);
 }
 
 }  // namespace content