Use upstream libaddressinput in Chrome.

components/autofill/core/browser/autofill_profile.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_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <ostream>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/address.h"
 #include "components/autofill/core/browser/address_i18n.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/contact_info.h"
 #include "components/autofill/core/browser/phone_number.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/components_strings.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_formatter.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_metadata.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::ASCIIToUTF16;
 using base::UTF16ToUTF8;
+using ::i18n::addressinput::AddressData;
+using ::i18n::addressinput::AddressField;
 
 namespace autofill {
 namespace {
 
 // Like |AutofillType::GetStorableType()|, but also returns |NAME_FULL| for
 // first, middle, and last name field types.
 ServerFieldType GetStorableTypeCollapsingNames(ServerFieldType type) {
   ServerFieldType storable_type = AutofillType(type).GetStorableType();
   if (AutofillType(storable_type).group() == NAME)
     return NAME_FULL;
@@ skipping 245 matching lines @@
 void AutofillProfile::SetRawInfo(ServerFieldType type,
                                  const base::string16& value) {
   FormGroup* form_group = MutableFormGroupForType(AutofillType(type));
   if (form_group)
     form_group->SetRawInfo(type, value);
 }
 
 base::string16 AutofillProfile::GetInfo(const AutofillType& type,
                                         const std::string& app_locale) const {
   if (type.html_type() == HTML_TYPE_FULL_ADDRESS) {
-    scoped_ptr< ::i18n::addressinput::AddressData> address_data =
+    scoped_ptr<AddressData> address =
         i18n::CreateAddressDataFromAutofillProfile(*this, app_locale);
-    if (!address_data->HasAllRequiredFields())

[please use gerrit instead, 2014/06/05 22:22:48]

To reduce reviewer burden: Use the has_all_required_fileds.{h,cc} helper in
third_party/libaddressinput/chromium.

[please use gerrit instead, 2014/06/09 23:28:16]

Done.

-      return base::string16();
+
+    // TODO: Think about whether it makes sense to do this special check here in
+    // Chromium, instead of just using the regular address validation feature of
+    // libaddressinput.
+    static const AddressField kFields[] = {
+      ::i18n::addressinput::COUNTRY,
+      ::i18n::addressinput::ADMIN_AREA,
+      ::i18n::addressinput::LOCALITY,
+      ::i18n::addressinput::DEPENDENT_LOCALITY,
+      ::i18n::addressinput::SORTING_CODE,
+      ::i18n::addressinput::POSTAL_CODE,
+      ::i18n::addressinput::STREET_ADDRESS,
+      ::i18n::addressinput::RECIPIENT
+    };
+
+    for (size_t i = 0; i < arraysize(kFields); ++i) {
+      AddressField field = kFields[i];
+      if (address->IsFieldEmpty(field) &&
+          ::i18n::addressinput::IsFieldRequired(field, address->region_code)) {
+        return base::string16();
+      }
+    }
 
     std::vector<std::string> lines;
-    address_data->FormatForDisplay(&lines);
+    ::i18n::addressinput::GetFormattedNationalAddress(*address, &lines);
     return base::UTF8ToUTF16(JoinString(lines, '\n'));
   }
 
   const FormGroup* form_group = FormGroupForType(type);
   if (!form_group)
     return base::string16();
 
   return form_group->GetInfo(type, app_locale);
 }
 
@@ skipping 551 matching lines @@
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))
       << " "
       << profile.language_code()
       << " "
       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill