2 files changed, 43 insertions, 1 deletions
diff --git a/chromium/ios/chrome/credential_provider_extension/BUILD.gn b/chromium/ios/chrome/credential_provider_extension/BUILD.gn
index 52ffbb6049d..d95238e9938 100644
--- a/chromium/ios/chrome/credential_provider_extension/BUILD.gn
+++ b/chromium/ios/chrome/credential_provider_extension/BUILD.gn
@@ -50,6 +50,7 @@ ios_appex_bundle("credential_provider_extension") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":account_verification_provider",
     ":metrics_util",
     ":password_util",
     ":reauthentication_handler",
@@ -59,10 +60,10 @@ ios_appex_bundle("credential_provider_extension") {
     "//ios/chrome/common/credential_provider",
     "//ios/chrome/common/credential_provider:ui",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/confirmation_alert",
     "//ios/chrome/common/ui/reauthentication",
     "//ios/chrome/credential_provider_extension/resources",
     "//ios/chrome/credential_provider_extension/ui",
-    ios_account_verification_provider_target,
   ]
   bundle_deps_filter = [ "//third_party/icu:icudata" ]
 
@@ -78,6 +79,7 @@ ios_appex_bundle("credential_provider_extension") {
     "CHROME_CHANNEL_SCHEME=$url_channel_scheme",
     "CHROMIUM_SHORT_NAME=$chromium_short_name",
     "CREDENTIAL_PROVIDER_EXTENSION_BUNDLE_ID=$chromium_bundle_id.CredentialProviderExtension",
+    "CHROMIUM_BUNDLE_ID=$chromium_bundle_id",
   ]
 
   entitlements_target = ":entitlements"
@@ -98,6 +100,22 @@ generate_localizable_strings("system_strings") {
   deps = [ _packed_resources_target ]
 }
 
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "metrics_util_unittest.mm",
+    "password_util_unittest.mm",
+  ]
+  deps = [
+    ":metrics_util",
+    ":password_util",
+    "//base",
+    "//ios/chrome/common/app_group",
+    "//testing/gtest",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("reauthentication_handler") {
   sources = [
     "reauthentication_handler.h",
@@ -140,3 +158,26 @@ source_set("metrics_util") {
   ]
   libs = [ "Foundation.framework" ]
 }
+
+source_set("account_verification_provider") {
+  public_deps = [ ":account_verification_provider_header" ]
+  deps = [ ios_account_verification_provider_target ]
+  assert_no_deps = [ "//ios/chrome/browser/*" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  libs = [ "Foundation.framework" ]
+}
+
+source_set("account_verification_provider_header") {
+  sources = [ "account_verification_provider.h" ]
+  assert_no_deps = [ "//ios/chrome/browser/*" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  libs = [ "Foundation.framework" ]
+}
+
+source_set("account_verification_provider_implementation") {
+  sources = [ "account_verification_provider.mm" ]
+  deps = [ ":account_verification_provider_header" ]
+  assert_no_deps = [ "//ios/chrome/browser/*" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  libs = [ "Foundation.framework" ]
+}
diff --git a/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn b/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn
index 1daeeb66f5f..473500732d1 100644
--- a/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn
+++ b/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn
@@ -33,6 +33,7 @@ source_set("ui") {
     "//ios/chrome/common/credential_provider:ui",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/confirmation_alert",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ios/chrome/common/ui/util",
     "//ios/chrome/credential_provider_extension:metrics_util",
     "//ios/chrome/credential_provider_extension:password_util",