[Payments] Add timeout to the address_normalizer.

third_party/libaddressinput/BUILD.gn

 # Copyright 2014 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.
 
 import("//testing/test.gni")
 import("//build/config/locales.gni")
 import("//tools/grit/grit_rule.gni")
 
 config("no-newline-eof-warning") {
   if (is_clang) {
@@ skipping 106 matching lines @@
     ":util",
     "//base",
     "//base:i18n",
     "//components/prefs",
     "//net",
     "//third_party/icu",
     "//third_party/re2",
   ]
 }
 
+# This target provides utilities for tests of libaddressinput.
+source_set("libaddressinput_unittests_utils") {

[please use gerrit instead, 2017/02/21 17:15:20]

Let's name this target "test_support", which is a common pattern in Chrome code.

[sebsg, 2017/02/21 18:31:00]

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",
+    ":strings",
+    "//base/test:run_all_unittests",
+    "//components/prefs",
+    "//net:test_support",
+    "//testing/gtest",
+  ]
+}
+
 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",
+    ":libaddressinput_unittests_utils",
     ":strings",
     "//base/test:run_all_unittests",
     "//components/prefs",
     "//net:test_support",
     "//testing/gtest",
   ]
 }