Use upstream libaddressinput in Chrome.

components/autofill/core/browser/address_i18n.cc

Index: components/autofill/core/browser/address_i18n.cc
diff --git a/components/autofill/core/browser/address_i18n.cc b/components/autofill/core/browser/address_i18n.cc
index 91349fb9893cb13ad4a5365b8bacc53f950b40bf..29227005c805f0ec8d0c25572e74a96d1e75a234 100644
--- a/components/autofill/core/browser/address_i18n.cc
+++ b/components/autofill/core/browser/address_i18n.cc
@@ -11,7 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
 
 namespace autofill {
 namespace i18n {
@@ -33,7 +33,7 @@ scoped_ptr<AddressData> CreateAddressData(
   scoped_ptr<AddressData> address_data(new AddressData());
   address_data->recipient = base::UTF16ToUTF8(
       get_info.Run(AutofillType(NAME_FULL)));
-  address_data->country_code = base::UTF16ToUTF8(
+  address_data->region_code = base::UTF16ToUTF8(
       get_info.Run(AutofillType(HTML_TYPE_COUNTRY_CODE, HTML_MODE_NONE)));
   address_data->administrative_area = base::UTF16ToUTF8(
       get_info.Run(AutofillType(ADDRESS_HOME_STATE)));
@@ -49,7 +49,7 @@ scoped_ptr<AddressData> CreateAddressData(
       base::UTF16ToUTF8(
           get_info.Run(AutofillType(ADDRESS_HOME_STREET_ADDRESS))),
       '\n',
-      &address_data->address_lines);
+      &address_data->address_line);
   return address_data.Pass();
 }