[Payments] Add timeout to the address_normalizer.

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 5eaa8607baddf54f481c3e8261542aac0dc6c7e7..d31da21a81d77bbc0b61fbc114090e6756596d4e 100644
--- a/third_party/libaddressinput/BUILD.gn
+++ b/third_party/libaddressinput/BUILD.gn
@@ -124,6 +124,27 @@ static_library("libaddressinput") {
   ]
 }
 
+# This target provides utilities for tests of libaddressinput.
+source_set("libaddressinput_test_support") {

[Mathieu, 2017/02/22 02:01:31]

"test_support" is enough, because the name of the library is already in the path
when you reference it

[sebsg, 2017/02/22 17:04:18]

Done.

+  testonly = true
+  sources = [
+    "src/cpp/test/fake_storage.cc",
+    "src/cpp/test/mock_source.cc",
+    "src/cpp/test/testdata_source.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",
+  ]
+}
+
 test("libaddressinput_unittests") {
   sources = [
     "chromium/addressinput_util_unittest.cc",
@@ -144,13 +165,11 @@ test("libaddressinput_unittests") {
     "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",
@@ -162,7 +181,6 @@ test("libaddressinput_unittests") {
     "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",
@@ -184,12 +202,11 @@ test("libaddressinput_unittests") {
   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",
+    ":libaddressinput_test_support",
     ":strings",
     "//base/test:run_all_unittests",
     "//components/prefs",