Reland of "Use address_data.h from upstream libaddressinput".

chrome/browser/ui/autofill/data_model_wrapper.cc

 // Copyright (c) 2012 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/data_model_wrapper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "components/autofill/core/browser/address_i18n.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_formatter.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace autofill {
 
 DataModelWrapper::~DataModelWrapper() {}
 
 void DataModelWrapper::FillInputs(DetailInputs* inputs) {
   for (size_t i = 0; i < inputs->size(); ++i) {
     (*inputs)[i].initial_value =
@@ skipping 17 matching lines @@
       GetInfoForDisplay(AutofillType(PHONE_HOME_WHOLE_NUMBER));
   if (phone.empty())
     return false;
 
   // Format the address.
   scoped_ptr< ::i18n::addressinput::AddressData> address_data =
       i18n::CreateAddressData(
           base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)));
   address_data->language_code = GetLanguageCode();
   std::vector<std::string> lines;
-  address_data->FormatForDisplay(&lines);
+  ::i18n::addressinput::GetFormattedNationalAddress(*address_data, &lines);
 
   // Email and phone number aren't part of address formatting.
   base::string16 non_address_info;
   base::string16 email = GetInfoForDisplay(AutofillType(EMAIL_ADDRESS));
   if (!email.empty())
     non_address_info += base::ASCIIToUTF16("\n") + email;
 
   non_address_info += base::ASCIIToUTF16("\n") + phone;
 
-  // The separator is locale-specific.
-  std::string compact_separator =
-      ::i18n::addressinput::GetCompactAddressLinesSeparator(GetLanguageCode());
-  *vertically_compact =
-      base::UTF8ToUTF16(JoinString(lines, compact_separator)) +
-          non_address_info;
-  *horizontally_compact = base::UTF8ToUTF16(JoinString(lines, "\n")) +
-      non_address_info;
+  std::string line_address;
+  ::i18n::addressinput::GetFormattedNationalAddressLine(*address_data,
+                                                        &line_address);
+  *vertically_compact = base::UTF8ToUTF16(line_address) + non_address_info;
+  *horizontally_compact =
+      base::UTF8ToUTF16(JoinString(lines, "\n")) + non_address_info;
 
   return true;
 }
 
 bool DataModelWrapper::FillFormStructure(
     const std::vector<ServerFieldType>& types,
     const FormStructure::InputFieldComparator& compare,
     FormStructure* form_structure) const {
   return form_structure->FillFields(
       types,
@@ skipping 289 matching lines @@
 
 base::string16 I18nAddressDataWrapper::GetInfo(const AutofillType& type) const {
   ::i18n::addressinput::AddressField field;
   if (!i18ninput::FieldForType(type.GetStorableType(), &field))
     return base::string16();
 
   if (field == ::i18n::addressinput::STREET_ADDRESS)
     return base::string16();
 
   if (field == ::i18n::addressinput::COUNTRY) {
-    return AutofillCountry(address_->country_code,
+    return AutofillCountry(address_->region_code,
                            g_browser_process->GetApplicationLocale()).name();
   }
 
   return base::UTF8ToUTF16(address_->GetFieldValue(field));
 }
 
 const std::string& I18nAddressDataWrapper::GetLanguageCode() const {
   return address_->language_code;
 }
 
 }  // namespace autofill