Revert of Use language-specific street address line separators

components/autofill/core/browser/autofill_field.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/autofill_field.h"
 
 #include "base/logging.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/phone_number.h"
 #include "components/autofill/core/browser/state_names.h"
 #include "grit/components_strings.h"
-#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
-#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_formatter.h"
 #include "ui/base/l10n/l10n_util.h"
 
-using ::i18n::addressinput::AddressData;
-using ::i18n::addressinput::GetStreetAddressLinesAsSingleLine;
 using base::ASCIIToUTF16;
 using base::StringToInt;
 
 namespace autofill {
 namespace {
 
 const char* const kMonthsAbbreviated[] = {
   NULL,  // Padding so index 1 = month 1 = January.
   "Jan", "Feb", "Mar", "Apr", "May", "Jun",
   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
@@ skipping 317 matching lines @@
     return false;
 
   // HTML5 input="month" expects zero-padded months.
   if (month.size() == 1)
     month = ASCIIToUTF16("0") + month;
 
   field->value = year + ASCIIToUTF16("-") + month;
   return true;
 }
 
-// Fills |field| with the street address in |value|. Translates newlines into
+// Fills |field| with the street address in |value|.  Translates newlines into
 // equivalent separators when necessary, i.e. when filling a single-line field.
-// The separators depend on |address_language_code|.
 void FillStreetAddress(const base::string16& value,
-                       const std::string& address_language_code,
                        FormFieldData* field) {
   if (field->form_control_type == "textarea") {
     field->value = value;
     return;
   }
 
-  AddressData address_data;
-  address_data.language_code = address_language_code;
-  base::SplitString(base::UTF16ToUTF8(value), '\n', &address_data.address_line);
-  std::string line;
-  GetStreetAddressLinesAsSingleLine(address_data, &line);
-  field->value = base::UTF8ToUTF16(line);
+  const base::string16& separator =
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_LINE_SEPARATOR);
+  base::ReplaceChars(value, base::ASCIIToUTF16("\n"), separator, &field->value);
 }
 
 std::string Hash32Bit(const std::string& str) {
   std::string hash_bin = base::SHA1HashString(str);
   DCHECK_EQ(20U, hash_bin.length());
 
   uint32 hash32 = ((hash_bin[0] & 0xFF) << 24) |
                   ((hash_bin[1] & 0xFF) << 16) |
                   ((hash_bin[2] & 0xFF) << 8) |
                    (hash_bin[3] & 0xFF);
@@ skipping 76 matching lines @@
   return Hash32Bit(field_string);
 }
 
 bool AutofillField::IsFieldFillable() const {
   return should_autocomplete && !Type().IsUnknown();
 }
 
 // static
 bool AutofillField::FillFormField(const AutofillField& field,
                                   const base::string16& value,
-                                  const std::string& address_language_code,
                                   const std::string& app_locale,
                                   FormFieldData* field_data) {
   AutofillType type = field.Type();
 
   if (type.GetStorableType() == PHONE_HOME_NUMBER) {
     FillPhoneNumberField(field, value, field_data);
     return true;
   } else if (field_data->form_control_type == "select-one") {
     return FillSelectControl(type, value, app_locale, field_data);
   } else if (field_data->form_control_type == "month") {
     return FillMonthControl(value, field_data);
   } else if (type.GetStorableType() == ADDRESS_HOME_STREET_ADDRESS) {
-    FillStreetAddress(value, address_language_code, field_data);
+    FillStreetAddress(value, field_data);
     return true;
   }
 
   field_data->value = value;
   return true;
 }
 
 }  // namespace autofill