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

third_party/libaddressinput/libaddressinput.gyp

 # 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.
 {
   'variables': {
     # TODO(rouslan): Use the src/ directory. http://crbug.com/327046
     'libaddressinput_dir': 'chromium',
   },
   'target_defaults': {
     'conditions': [
@@ skipping 56 matching lines @@
     # This target provides basic functionality which is cooked into the build.
     {
       # GN version: //third_party/libaddressinput:util
       'target_name': 'libaddressinput_util',
       'type': 'static_library',
       'include_dirs': [
         '<(libaddressinput_dir)/cpp/include/',
         '<(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',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/scoped_ptr.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/template_util.h',
         '<(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',
         '<(libaddressinput_dir)/cpp/src/util/string_util.h',
       ],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
         '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
@@ skipping 17 matching lines @@
       'type': 'static_library',
       'include_dirs': [
         '<(libaddressinput_dir)/cpp/include/',
         '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/',
       ],
       'sources': [
         'chromium/chrome_downloader_impl.cc',
         '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',
         '<(libaddressinput_dir)/cpp/src/country_rules_aggregator.h',
         '<(libaddressinput_dir)/cpp/src/fallback_data_store.cc',
         '<(libaddressinput_dir)/cpp/src/fallback_data_store.h',
         '<(libaddressinput_dir)/cpp/src/grit.h',
         '<(libaddressinput_dir)/cpp/src/retriever.cc',
         '<(libaddressinput_dir)/cpp/src/retriever.h',
         '<(libaddressinput_dir)/cpp/src/ruleset.cc',
@@ skipping 30 matching lines @@
       # GN version: //third_party/libaddressinput:libaddressinput_unittests
       'target_name': 'libaddressinput_unittests',
       'type': '<(gtest_target_type)',
       'include_dirs': [
         '<(DEPTH)',
         '<(libaddressinput_dir)/cpp/src/',
         '<(DEPTH)/testing/gtest/include/',
         '<(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',
         '<(libaddressinput_dir)/cpp/test/countryinfo_example_addresses_test.cc',
         '<(libaddressinput_dir)/cpp/test/fake_downloader.cc',
         '<(libaddressinput_dir)/cpp/test/fake_downloader.h',
         '<(libaddressinput_dir)/cpp/test/fake_downloader_test.cc',
         '<(libaddressinput_dir)/cpp/test/fake_storage.cc',
         '<(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',
         '<(libaddressinput_dir)/cpp/test/storage_test_runner.cc',
         '<(libaddressinput_dir)/cpp/test/storage_test_runner.h',
         '<(libaddressinput_dir)/cpp/test/util/json_test.cc',
         '<(libaddressinput_dir)/cpp/test/util/md5_unittest.cc',
         '<(libaddressinput_dir)/cpp/test/util/scoped_ptr_unittest.cc',
         '<(libaddressinput_dir)/cpp/test/util/stl_util_unittest.cc',
         '<(libaddressinput_dir)/cpp/test/util/string_util_test.cc',
         '<(libaddressinput_dir)/cpp/test/util/trie_test.cc',
       ],
       'defines': [
         'TEST_DATA_DIR="third_party/libaddressinput/src/testdata"',
       ],
       'dependencies': [
         'libaddressinput',
         'libaddressinput_strings',
         '<(DEPTH)/base/base.gyp:base_prefs',
         '<(DEPTH)/base/base.gyp:run_all_unittests',
         '<(DEPTH)/net/net.gyp:net_test_support',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
     },
   ],
 }