[Payments] Normalize addresses before passing them to merchants.

third_party/libaddressinput/BUILD.gn

Index: third_party/libaddressinput/BUILD.gn
diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn
index ad21974e4ddd83a16c8c8641b9e38e1a5851ec3b..5eaa8607baddf54f481c3e8261542aac0dc6c7e7 100644
--- a/third_party/libaddressinput/BUILD.gn
+++ b/third_party/libaddressinput/BUILD.gn
@@ -77,125 +77,123 @@ static_library("util") {
   ]
 }
 
-if (!is_android || use_aura) {
-  # This target provides more complicated functionality like pinging servers
-  # for validation rules.
-  static_library("libaddressinput") {
-    sources = [
-      "chromium/chrome_address_validator.cc",
-      "chromium/chrome_metadata_source.cc",
-      "chromium/chrome_storage_impl.cc",
-      "chromium/fallback_data_store.cc",
-      "chromium/input_suggester.cc",
-      "chromium/string_compare.cc",
-      "chromium/trie.cc",
-      "src/cpp/src/address_input_helper.cc",
-      "src/cpp/src/address_normalizer.cc",
-      "src/cpp/src/address_problem.cc",
-      "src/cpp/src/address_validator.cc",
-      "src/cpp/src/null_storage.cc",
-      "src/cpp/src/ondemand_supplier.cc",
-      "src/cpp/src/ondemand_supply_task.cc",
-      "src/cpp/src/post_box_matchers.cc",
-      "src/cpp/src/preload_supplier.cc",
-      "src/cpp/src/region_data.cc",
-      "src/cpp/src/region_data_builder.cc",
-      "src/cpp/src/retriever.cc",
-      "src/cpp/src/rule_retriever.cc",
-      "src/cpp/src/util/md5.cc",
-      "src/cpp/src/validating_storage.cc",
-      "src/cpp/src/validating_util.cc",
-      "src/cpp/src/validation_task.cc",
-    ]
-
-    configs -= [ "//build/config/compiler:chromium_code" ]
-    configs += [ "//build/config/compiler:no_chromium_code" ]
-
-    public_configs = [ ":libaddressinput_config" ]
-
-    deps = [
-      ":strings",
-      ":util",
-      "//base",
-      "//base:i18n",
-      "//components/prefs",
-      "//net",
-      "//third_party/icu",
-      "//third_party/re2",
-    ]
-  }
+# This target provides more complicated functionality like pinging servers
+# for validation rules.
+static_library("libaddressinput") {
+  sources = [
+    "chromium/chrome_address_validator.cc",
+    "chromium/chrome_metadata_source.cc",
+    "chromium/chrome_storage_impl.cc",
+    "chromium/fallback_data_store.cc",
+    "chromium/input_suggester.cc",
+    "chromium/string_compare.cc",
+    "chromium/trie.cc",
+    "src/cpp/src/address_input_helper.cc",
+    "src/cpp/src/address_normalizer.cc",
+    "src/cpp/src/address_problem.cc",
+    "src/cpp/src/address_validator.cc",
+    "src/cpp/src/null_storage.cc",
+    "src/cpp/src/ondemand_supplier.cc",
+    "src/cpp/src/ondemand_supply_task.cc",
+    "src/cpp/src/post_box_matchers.cc",
+    "src/cpp/src/preload_supplier.cc",
+    "src/cpp/src/region_data.cc",
+    "src/cpp/src/region_data_builder.cc",
+    "src/cpp/src/retriever.cc",
+    "src/cpp/src/rule_retriever.cc",
+    "src/cpp/src/util/md5.cc",
+    "src/cpp/src/validating_storage.cc",
+    "src/cpp/src/validating_util.cc",
+    "src/cpp/src/validation_task.cc",
+  ]
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+
+  public_configs = [ ":libaddressinput_config" ]
 
-  test("libaddressinput_unittests") {
-    sources = [
-      "chromium/addressinput_util_unittest.cc",
-      "chromium/chrome_address_validator_unittest.cc",
-      "chromium/chrome_metadata_source_unittest.cc",
-      "chromium/chrome_storage_impl_unittest.cc",
-      "chromium/fallback_data_store_unittest.cc",
-      "chromium/storage_test_runner.cc",
-      "chromium/string_compare_unittest.cc",
-      "chromium/trie_unittest.cc",
-      "src/cpp/test/address_data_test.cc",
-      "src/cpp/test/address_field_test.cc",
-      "src/cpp/test/address_field_util_test.cc",
-      "src/cpp/test/address_formatter_test.cc",
-      "src/cpp/test/address_input_helper_test.cc",
-      "src/cpp/test/address_metadata_test.cc",
-      "src/cpp/test/address_normalizer_test.cc",
-      "src/cpp/test/address_problem_test.cc",
-      "src/cpp/test/address_ui_test.cc",
-      "src/cpp/test/address_validator_test.cc",
-      "src/cpp/test/fake_storage.cc",
-      "src/cpp/test/fake_storage_test.cc",
-      "src/cpp/test/format_element_test.cc",
-      "src/cpp/test/language_test.cc",
-      "src/cpp/test/localization_test.cc",
-      "src/cpp/test/lookup_key_test.cc",
-      "src/cpp/test/mock_source.cc",
-      "src/cpp/test/null_storage_test.cc",
-      "src/cpp/test/ondemand_supply_task_test.cc",
-      "src/cpp/test/post_box_matchers_test.cc",
-      "src/cpp/test/preload_supplier_test.cc",
-      "src/cpp/test/region_data_builder_test.cc",
-      "src/cpp/test/region_data_constants_test.cc",
-      "src/cpp/test/region_data_test.cc",
-      "src/cpp/test/retriever_test.cc",
-      "src/cpp/test/rule_retriever_test.cc",
-      "src/cpp/test/rule_test.cc",
-      "src/cpp/test/supplier_test.cc",
-      "src/cpp/test/testdata_source.cc",
-      "src/cpp/test/testdata_source_test.cc",
-      "src/cpp/test/util/json_test.cc",
-      "src/cpp/test/util/md5_unittest.cc",
-      "src/cpp/test/util/scoped_ptr_unittest.cc",
-      "src/cpp/test/util/string_compare_test.cc",
-      "src/cpp/test/util/string_split_unittest.cc",
-      "src/cpp/test/util/string_util_test.cc",
-      "src/cpp/test/validating_storage_test.cc",
-      "src/cpp/test/validating_util_test.cc",
-      "src/cpp/test/validation_task_test.cc",
-    ]
-
-    if (is_ios) {
-      # TODO(rouslan): This tests uses ASSERT_DEATH which is not supported on
-      # iOS. Re-enable once http://crbug.com/595645 is fixed.
-      sources -= [ "src/cpp/test/address_data_test.cc" ]
-    }
-
-    configs -= [ "//build/config/compiler:chromium_code" ]
-    configs += [ "//build/config/compiler:no_chromium_code" ]
-
-    defines = [ "TEST_DATA_DIR=\"third_party/libaddressinput/src/testdata\"" ]
-
-    include_dirs = [ "src/cpp/src" ]
-
-    deps = [
-      ":libaddressinput",
-      ":strings",
-      "//base/test:run_all_unittests",
-      "//components/prefs",
-      "//net:test_support",
-      "//testing/gtest",
-    ]
+  deps = [
+    ":strings",
+    ":util",
+    "//base",
+    "//base:i18n",
+    "//components/prefs",
+    "//net",
+    "//third_party/icu",
+    "//third_party/re2",
+  ]
+}
+
+test("libaddressinput_unittests") {
+  sources = [
+    "chromium/addressinput_util_unittest.cc",
+    "chromium/chrome_address_validator_unittest.cc",
+    "chromium/chrome_metadata_source_unittest.cc",
+    "chromium/chrome_storage_impl_unittest.cc",
+    "chromium/fallback_data_store_unittest.cc",
+    "chromium/storage_test_runner.cc",
+    "chromium/string_compare_unittest.cc",
+    "chromium/trie_unittest.cc",
+    "src/cpp/test/address_data_test.cc",
+    "src/cpp/test/address_field_test.cc",
+    "src/cpp/test/address_field_util_test.cc",
+    "src/cpp/test/address_formatter_test.cc",
+    "src/cpp/test/address_input_helper_test.cc",
+    "src/cpp/test/address_metadata_test.cc",
+    "src/cpp/test/address_normalizer_test.cc",
+    "src/cpp/test/address_problem_test.cc",
+    "src/cpp/test/address_ui_test.cc",
+    "src/cpp/test/address_validator_test.cc",
+    "src/cpp/test/fake_storage.cc",
+    "src/cpp/test/fake_storage_test.cc",
+    "src/cpp/test/format_element_test.cc",
+    "src/cpp/test/language_test.cc",
+    "src/cpp/test/localization_test.cc",
+    "src/cpp/test/lookup_key_test.cc",
+    "src/cpp/test/mock_source.cc",
+    "src/cpp/test/null_storage_test.cc",
+    "src/cpp/test/ondemand_supply_task_test.cc",
+    "src/cpp/test/post_box_matchers_test.cc",
+    "src/cpp/test/preload_supplier_test.cc",
+    "src/cpp/test/region_data_builder_test.cc",
+    "src/cpp/test/region_data_constants_test.cc",
+    "src/cpp/test/region_data_test.cc",
+    "src/cpp/test/retriever_test.cc",
+    "src/cpp/test/rule_retriever_test.cc",
+    "src/cpp/test/rule_test.cc",
+    "src/cpp/test/supplier_test.cc",
+    "src/cpp/test/testdata_source.cc",
+    "src/cpp/test/testdata_source_test.cc",
+    "src/cpp/test/util/json_test.cc",
+    "src/cpp/test/util/md5_unittest.cc",
+    "src/cpp/test/util/scoped_ptr_unittest.cc",
+    "src/cpp/test/util/string_compare_test.cc",
+    "src/cpp/test/util/string_split_unittest.cc",
+    "src/cpp/test/util/string_util_test.cc",
+    "src/cpp/test/validating_storage_test.cc",
+    "src/cpp/test/validating_util_test.cc",
+    "src/cpp/test/validation_task_test.cc",
+  ]
+
+  if (is_ios) {
+    # TODO(rouslan): This tests uses ASSERT_DEATH which is not supported on
+    # iOS. Re-enable once http://crbug.com/595645 is fixed.
+    sources -= [ "src/cpp/test/address_data_test.cc" ]
   }
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+
+  defines = [ "TEST_DATA_DIR=\"src/third_party/libaddressinput/src/testdata\"" ]
+
+  include_dirs = [ "src/cpp/src" ]
+
+  deps = [
+    ":libaddressinput",
+    ":strings",
+    "//base/test:run_all_unittests",
+    "//components/prefs",
+    "//net:test_support",
+    "//testing/gtest",
+  ]
 }