Revert of Use language-specific street address line separators

chrome/browser/ui/android/autofill/autofill_dialog_controller_android.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 "chrome/browser/ui/android/autofill/autofill_dialog_controller_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 97 matching lines @@
       (section == SECTION_SHIPPING && !full_wallet->shipping_address())) {
     return;
   }
 
   base::Callback<base::string16(const AutofillType&)> get_info =
       base::Bind(&FullWallet::GetInfo,
                  base::Unretained(full_wallet),
                  g_browser_process->GetApplicationLocale());
 
   std::vector<ServerFieldType> types = common::TypesFromInputs(inputs);
-  form_structure.FillFields(
-      types,
-      compare,
-      get_info,
-      section == SECTION_CC_BILLING
-          ? full_wallet->billing_address()->language_code()
-          : full_wallet->shipping_address()->language_code(),
-      g_browser_process->GetApplicationLocale());
+  form_structure.FillFields(types,
+                            compare,
+                            get_info,
+                            g_browser_process->GetApplicationLocale());
 }
 
 void FillOutputForSection(
     DialogSection section,
     FormStructure& form_structure,
     FullWallet* full_wallet,
     const base::string16& email_address) {
   DCHECK(section == SECTION_CC_BILLING || section == SECTION_SHIPPING);
   DetailInputs inputs;
   if (section == SECTION_CC_BILLING)
@@ skipping 206 matching lines @@
           form_structure_);
 
   bool request_shipping_address = false;
   {
     DetailInputs inputs;
     BuildShippingInputs(&inputs);
     request_shipping_address = form_structure_.FillFields(
         common::TypesFromInputs(inputs),
         base::Bind(common::ServerTypeMatchesField, SECTION_SHIPPING),
         base::Bind(NullGetInfo),
-        std::string(),
         g_browser_process->GetApplicationLocale());
   }
 
   bool last_used_choice_is_autofill = false;
   base::string16 last_used_account_name;
   std::string last_used_billing;
   std::string last_used_shipping;
   std::string last_used_credit_card;
   {
     const base::DictionaryValue* defaults =
@@ skipping 168 matching lines @@
 
 void AutofillDialogControllerAndroid::LogOnCancelMetrics() {
   GetMetricLogger().LogDialogUiDuration(
       base::Time::Now() - dialog_shown_timestamp_,
       AutofillMetrics::DIALOG_CANCELED);
 
   GetMetricLogger().LogDialogUiEvent(AutofillMetrics::DIALOG_UI_CANCELED);
 }
 
 }  // namespace autofill