Revert of Move JoinString to the base namespace

components/autofill/core/browser/contact_info.cc

 // Copyright 2013 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 "components/autofill/core/browser/contact_info.h"
 
 #include <stddef.h>
 #include <ostream>
 #include <string>
 
@@ skipping 107 matching lines @@
   while (name_tokens.size() >= 1 &&
          ContainsString(family_name_prefixes,
                         arraysize(family_name_prefixes),
                         name_tokens.back())) {
     reverse_family_tokens.push_back(name_tokens.back());
     name_tokens.pop_back();
   }
 
   std::vector<base::string16> family_tokens(reverse_family_tokens.rbegin(),
                                             reverse_family_tokens.rend());
-  parts.family = base::JoinString(family_tokens, base::ASCIIToUTF16(" "));
+  parts.family = JoinString(family_tokens, base::char16(' '));
 
   // Take the last remaining token as the middle name (if there are at least 2
   // tokens).
   if (name_tokens.size() >= 2) {
     parts.middle = name_tokens.back();
     name_tokens.pop_back();
   }
 
   // Remainder is given name.
-  parts.given = base::JoinString(name_tokens, base::ASCIIToUTF16(" "));
+  parts.given = JoinString(name_tokens, base::char16(' '));
 
   return parts;
 }
 
 }  // namespace
 
 NameInfo::NameInfo() {}
 
 NameInfo::NameInfo(const NameInfo& info) : FormGroup() {
   *this = info;
@@ skipping 106 matching lines @@
   std::vector<base::string16> full_name;
   if (!given_.empty())
     full_name.push_back(given_);
 
   if (!middle_.empty())
     full_name.push_back(middle_);
 
   if (!family_.empty())
     full_name.push_back(family_);
 
-  return base::JoinString(full_name, base::ASCIIToUTF16(" "));
+  return JoinString(full_name, ' ');
 }
 
 base::string16 NameInfo::MiddleInitial() const {
   if (middle_.empty())
     return base::string16();
 
   base::string16 middle_name(middle_);
   base::string16 initial;
   initial.push_back(middle_name[0]);
   return initial;
@@ skipping 72 matching lines @@
   return base::string16();
 }
 
 void CompanyInfo::SetRawInfo(ServerFieldType type,
                              const base::string16& value) {
   DCHECK_EQ(COMPANY_NAME, type);
   company_name_ = value;
 }
 
 }  // namespace autofill