Retry r259150: Determine language code and type of format for address.

chrome/browser/ui/autofill/autofill_dialog_i18n_input.cc

 // Copyright 2014 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/autofill/autofill_dialog_i18n_input.h"
 
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/browser_process.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "grit/component_strings.h"
 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_field.h"
 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui_component.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 12 matching lines @@
     return DetailInput::SHORT;
   DCHECK_EQ(hint, AddressUiComponent::HINT_LONG);
   return DetailInput::LONG;
 }
 
 }  // namespace
 
 void BuildAddressInputs(common::AddressType address_type,
                         const std::string& country_code,
                         DetailInputs* inputs) {
+  // TODO(rouslan): Store the language code for the autofill profile.
+  // http://crbug.com/354955
   std::vector<AddressUiComponent> components(
-      ::i18n::addressinput::BuildComponents(country_code));
+      ::i18n::addressinput::BuildComponents(
+          country_code, g_browser_process->GetApplicationLocale(), NULL));
 
   const bool billing = address_type == common::ADDRESS_TYPE_BILLING;
 
   for (size_t i = 0; i < components.size(); ++i) {
     const AddressUiComponent& component = components[i];
     if (component.field == ::i18n::addressinput::ORGANIZATION) {
       // TODO(dbeam): figure out when we actually need this.
       continue;
     }
 
@@ skipping 182 matching lines @@
       get_info.Run(AutofillType(ADDRESS_HOME_ZIP)));
   base::SplitString(
       UTF16ToUTF8(get_info.Run(AutofillType(ADDRESS_HOME_STREET_ADDRESS))),
       '\n',
       &address_data->address_lines);
 }
 
 bool CountryIsFullySupported(const std::string& country_code) {
   DCHECK_EQ(2U, country_code.size());
   std::vector< ::i18n::addressinput::AddressUiComponent> components =
-      ::i18n::addressinput::BuildComponents(country_code);
+      ::i18n::addressinput::BuildComponents(
+          country_code, g_browser_process->GetApplicationLocale(), NULL);
   for (size_t i = 0; i < components.size(); ++i) {
     if (components[i].field == ::i18n::addressinput::DEPENDENT_LOCALITY)
       return false;
   }
   return true;
 }
 
 }  // namespace i18ninput
 }  // namespace autofill