Revert of Use language-specific street address line separators

components/autofill/core/browser/autofill_manager.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_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 532 matching lines @@
           unique_id, &data_model, &variant, &is_credit_card) ||
       !GetCachedFormAndField(form, field, &form_structure, &autofill_field))
     return;
 
   DCHECK(form_structure);
   DCHECK(autofill_field);
 
   FormData result = form;
 
   base::string16 profile_full_name;
-  std::string profile_language_code;
   if (!is_credit_card) {
     profile_full_name = data_model->GetInfo(
         AutofillType(NAME_FULL), app_locale_);
-    profile_language_code =
-        static_cast<const AutofillProfile*>(data_model)->language_code();
   }
 
   // If the relevant section is auto-filled, we should fill |field| but not the
   // rest of the form.
   if (SectionIsAutofilled(*form_structure, form, autofill_field->section())) {
     for (std::vector<FormFieldData>::iterator iter = result.fields.begin();
          iter != result.fields.end(); ++iter) {
       if ((*iter) == field) {
         base::string16 value = data_model->GetInfoForVariant(
             autofill_field->Type(), variant, app_locale_);
-        if (AutofillField::FillFormField(*autofill_field,
-                                         value,
-                                         profile_language_code,
-                                         app_locale_,
-                                         &(*iter))) {
+        if (AutofillField::FillFormField(
+            *autofill_field, value, app_locale_, &(*iter))) {
           // Mark the cached field as autofilled, so that we can detect when a
           // user edits an autofilled field (for metrics).
           autofill_field->is_autofilled = true;
 
           // Mark the field as autofilled when a non-empty value is assigned to
           // it. This allows the renderer to distinguish autofilled fields from
           // fields with non-empty values, such as select-one fields.
           iter->is_autofilled = true;
 
           if (!is_credit_card && !value.empty())
@@ skipping 35 matching lines @@
       // Must match ForEachMatchingFormField() in form_autofill_util.cc.
       // Only notify autofilling of empty fields and the field that initiated
       // the filling (note that "select-one" controls may not be empty but will
       // still be autofilled).
       bool should_notify =
           !is_credit_card &&
           !value.empty() &&
           (result.fields[i] == field ||
            result.fields[i].form_control_type == "select-one" ||
            result.fields[i].value.empty());
-      if (AutofillField::FillFormField(*cached_field,
-                                       value,
-                                       profile_language_code,
-                                       app_locale_,
-                                       &result.fields[i])) {
+      if (AutofillField::FillFormField(
+          *cached_field, value, app_locale_, &result.fields[i])) {
         // Mark the cached field as autofilled, so that we can detect when a
         // user edits an autofilled field (for metrics).
         form_structure->field(i)->is_autofilled = true;
 
         // Mark the field as autofilled when a non-empty value is assigned to
         // it. This allows the renderer to distinguish autofilled fields from
         // fields with non-empty values, such as select-one fields.
         result.fields[i].is_autofilled = true;
 
         if (should_notify)
@@ skipping 576 matching lines @@
     return false;
 
   // Disregard forms that we wouldn't ever autofill in the first place.
   if (!form.ShouldBeParsed())
     return false;
 
   return true;
 }
 
 }  // namespace autofill