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

third_party/libaddressinput/libaddressinput.gyp

Index: third_party/libaddressinput/libaddressinput.gyp
diff --git a/third_party/libaddressinput/libaddressinput.gyp b/third_party/libaddressinput/libaddressinput.gyp
index bc6e447445fe5bca9ba03d67ad51793281fa8806..e9d185256551b3498f54137aaf1d84058b342ee5 100644
--- a/third_party/libaddressinput/libaddressinput.gyp
+++ b/third_party/libaddressinput/libaddressinput.gyp
@@ -74,10 +74,15 @@
         '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/',
       ],
       'sources': [
+        'chromium/addressinput_util.cc',
+        'chromium/addressinput_util.h',
         'chromium/canonicalize_string.cc',
         'chromium/json.cc',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_data.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_field.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_formatter.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_metadata.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_problem.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/util/basictypes.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/basictypes.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/move.h',
@@ -86,11 +91,18 @@
         '<(libaddressinput_dir)/cpp/include/libaddressinput/util/scoped_ptr.h',
         '<(libaddressinput_dir)/cpp/src/address_data.cc',
         '<(libaddressinput_dir)/cpp/src/address_field.cc',
+        '<(libaddressinput_dir)/cpp/src/address_formatter.cc',
+        '<(libaddressinput_dir)/cpp/src/address_metadata.cc',
+        '<(libaddressinput_dir)/cpp/src/address_problem.cc',
+        '<(libaddressinput_dir)/cpp/src/language.cc',
+        '<(libaddressinput_dir)/cpp/src/language.h',
         '<(libaddressinput_dir)/cpp/src/region_data_constants.cc',
         '<(libaddressinput_dir)/cpp/src/region_data_constants.h',
         '<(libaddressinput_dir)/cpp/src/rule.cc',
         '<(libaddressinput_dir)/cpp/src/rule.h',
         '<(libaddressinput_dir)/cpp/src/util/canonicalize_string.h',
+        '<(libaddressinput_dir)/cpp/src/util/cctype_tolower_equal.cc',
+        '<(libaddressinput_dir)/cpp/src/util/cctype_tolower_equal.h',
         '<(libaddressinput_dir)/cpp/src/util/json.h',
         '<(libaddressinput_dir)/cpp/src/util/stl_util.h',
         '<(libaddressinput_dir)/cpp/src/util/string_util.cc',
@@ -128,12 +140,10 @@
         'chromium/chrome_downloader_impl.h',
         'chromium/chrome_storage_impl.cc',
         'chromium/chrome_storage_impl.h',
-        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_problem.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_ui_component.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_ui.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_validator.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/load_rules_delegate.h',
-        '<(libaddressinput_dir)/cpp/src/address_problem.cc',
         '<(libaddressinput_dir)/cpp/src/address_ui.cc',
         '<(libaddressinput_dir)/cpp/src/address_validator.cc',
         '<(libaddressinput_dir)/cpp/src/country_rules_aggregator.cc',
@@ -184,10 +194,13 @@
         '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/',
       ],
       'sources': [
+        'chromium/addressinput_util_unittest.cc',
         'chromium/chrome_downloader_impl_unittest.cc',
         'chromium/chrome_rule_test.cc',
         'chromium/chrome_storage_impl_unittest.cc',
         '<(libaddressinput_dir)/cpp/test/address_data_test.cc',
+        '<(libaddressinput_dir)/cpp/test/address_formatter_test.cc',
+        '<(libaddressinput_dir)/cpp/test/address_metadata_test.cc',
         '<(libaddressinput_dir)/cpp/test/address_ui_test.cc',
         '<(libaddressinput_dir)/cpp/test/address_validator_test.cc',
         '<(libaddressinput_dir)/cpp/test/country_rules_aggregator_test.cc',
@@ -199,6 +212,7 @@
         '<(libaddressinput_dir)/cpp/test/fake_storage.h',
         '<(libaddressinput_dir)/cpp/test/fake_storage_test.cc',
         '<(libaddressinput_dir)/cpp/test/fallback_data_store_test.cc',
+        '<(libaddressinput_dir)/cpp/test/language_test.cc',
         '<(libaddressinput_dir)/cpp/test/region_data_constants_test.cc',
         '<(libaddressinput_dir)/cpp/test/retriever_test.cc',
         '<(libaddressinput_dir)/cpp/test/rule_test.cc',