Store the language code for the address in autofill profile.

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"
@@ skipping 20 matching lines @@
   if (hint == AddressUiComponent::HINT_SHORT)
     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
+                        DetailInputs* inputs,
+                        std::string* language_code) {
   std::vector<AddressUiComponent> components(
       ::i18n::addressinput::BuildComponents(
-          country_code, g_browser_process->GetApplicationLocale(), NULL));
+          country_code, g_browser_process->GetApplicationLocale(),
+          language_code));
 
   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 193 matching lines @@
           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