Move JoinString to the base namespace

components/autofill/core/browser/address.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/address.h"
 
 #include <stddef.h>
 #include <algorithm>
 
 #include "base/basictypes.h"
@@ skipping 53 matching lines @@
     case ADDRESS_HOME_ZIP:
       return zip_code_;
 
     case ADDRESS_HOME_SORTING_CODE:
       return sorting_code_;
 
     case ADDRESS_HOME_COUNTRY:
       return base::ASCIIToUTF16(country_code_);
 
     case ADDRESS_HOME_STREET_ADDRESS:
-      return JoinString(street_address_, '\n');
+      return base::JoinString(street_address_, base::ASCIIToUTF16("\n"));
 
     default:
       NOTREACHED();
       return base::string16();
   }
 }
 
 void Address::SetRawInfo(ServerFieldType type, const base::string16& value) {
   DCHECK_EQ(ADDRESS_HOME, AutofillType(type).group());
   switch (type) {
@@ skipping 126 matching lines @@
   supported_types->insert(ADDRESS_HOME_COUNTRY);
 }
 
 void Address::TrimStreetAddress() {
   while (!street_address_.empty() && street_address_.back().empty()) {
     street_address_.pop_back();
   }
 }
 
 }  // namespace autofill