Use language-specific street address line separators

components/autofill/core/browser/autofill_field.cc

Index: components/autofill/core/browser/autofill_field.cc
diff --git a/components/autofill/core/browser/autofill_field.cc b/components/autofill/core/browser/autofill_field.cc
index 3fec668f3c76a5ac2fafe459bbaf27fb767da343..967e83631a4ffc6d762dc6d5e133841f7ad8f56e 100644
--- a/components/autofill/core/browser/autofill_field.cc
+++ b/components/autofill/core/browser/autofill_field.cc
@@ -15,6 +15,8 @@
 #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 base::ASCIIToUTF16;
@@ -354,18 +356,22 @@ bool FillMonthControl(const base::string16& value, FormFieldData* field) {
   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.
 void FillStreetAddress(const base::string16& value,
+                       const std::string& value_language_code,
                        FormFieldData* field) {
   if (field->form_control_type == "textarea") {
     field->value = value;
     return;
   }
 
-  const base::string16& separator =
-      l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_LINE_SEPARATOR);
-  base::ReplaceChars(value, base::ASCIIToUTF16("\n"), separator, &field->value);
+  ::i18n::addressinput::AddressData address_data;
+  address_data.language_code = value_language_code;
+  base::SplitString(base::UTF16ToUTF8(value), '\n', &address_data.address_line);
+  std::string line;
+  ::i18n::addressinput::GetStreetAddressLinesAsSingleLine(address_data, &line);
+  field->value = base::UTF8ToUTF16(line);
 }
 
 std::string Hash32Bit(const std::string& str) {
@@ -462,6 +468,7 @@ bool AutofillField::IsFieldFillable() const {
 // static
 bool AutofillField::FillFormField(const AutofillField& field,
                                   const base::string16& value,
+                                  const std::string& value_language_code,

[Evan Stade, 2014/07/17 17:25:31]

s/value_language_code/address_language_code

[please use gerrit instead, 2014/07/17 23:42:10]

Done.

                                   const std::string& app_locale,
                                   FormFieldData* field_data) {
   AutofillType type = field.Type();
@@ -474,7 +481,7 @@ bool AutofillField::FillFormField(const AutofillField& field,
   } else if (field_data->form_control_type == "month") {
     return FillMonthControl(value, field_data);
   } else if (type.GetStorableType() == ADDRESS_HOME_STREET_ADDRESS) {
-    FillStreetAddress(value, field_data);
+    FillStreetAddress(value, value_language_code, field_data);
     return true;
   }