Normalizes the state and city of the selected address before sending the information to the merchant.

BUG=641051

Review-Url: https://codereview.chromium.org/2338283003
Cr-Commit-Position: refs/heads/master@{#423162}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 5f2673a..d25dcef 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -78,6 +78,8 @@
     "autofill/personal_data_manager_factory.h",
     "autofill/risk_util.cc",
     "autofill/risk_util.h",
+    "autofill/validation_rules_storage_factory.cc",
+    "autofill/validation_rules_storage_factory.h",
     "background_sync/background_sync_controller_factory.cc",
     "background_sync/background_sync_controller_factory.h",
     "background_sync/background_sync_controller_impl.cc",
@@ -2533,10 +2535,7 @@
       "//third_party/libaddressinput:util",
     ]
 
-    deps -= [
-      "//components/storage_monitor",
-      "//third_party/libaddressinput",
-    ]
+    deps -= [ "//components/storage_monitor" ]
     if (use_seccomp_bpf) {
       defines += [ "USE_SECCOMP_BPF" ]
       deps += [ "//sandbox/linux:seccomp_bpf" ]
@@ -2546,8 +2545,6 @@
     sources += [
       "accessibility/invert_bubble_prefs.cc",
       "accessibility/invert_bubble_prefs.h",
-      "autofill/validation_rules_storage_factory.cc",
-      "autofill/validation_rules_storage_factory.h",
       "background/background_contents.cc",
       "background/background_contents.h",
       "banners/app_banner_infobar_delegate_desktop.cc",