[iOS][Credential-Provider] Move account validator to not be shared

This moves the account validator to the extension files, as this
is not going to be shared anymore.

Bug: 1066803
Change-Id: Iae0d77117b236b109d6fb5ec125cb47a4e0f77f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218075
Auto-Submit: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773142}

ios/build/chrome_build.gni

@@ -19,7 +19,7 @@ declare_args() {
 
   # Label of the target providing implementation for AccountVerificationProvider.
   # Overridden when using the Google-internal repository to build Chrome on iOS.
-  ios_account_verification_provider_target = "//ios/chrome/common/credential_provider:account_verification_provider_implementation"
+  ios_account_verification_provider_target = "//ios/chrome/credential_provider_extension:account_verification_provider_implementation"
 
   # Enable use of SceneDelegate-driven startup flow in
   # Info.plist.

ios/chrome/common/credential_provider/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("//build/buildflag_header.gni")
 import("//build/config/ios/ios_sdk.gni")
-import("//ios/build/chrome_build.gni")
 
 source_set("credential_provider") {
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -39,29 +38,6 @@ source_set("ui") {
   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" ]
-}
-
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true

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",
@@ -62,7 +63,6 @@ ios_appex_bundle("credential_provider_extension") {
     "//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" ]
 
@@ -156,3 +156,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" ]
+}

ios/chrome/common/credential_provider/account_verification_provider.h → ios/chrome/credential_provider_extension/account_verification_provider.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_COMMON_CREDENTIAL_PROVIDER_ACCOUNT_VERIFICATION_PROVIDER_H_
-#define IOS_CHROME_COMMON_CREDENTIAL_PROVIDER_ACCOUNT_VERIFICATION_PROVIDER_H_
+#ifndef IOS_CHROME_CREDENTIAL_PROVIDER_EXTENSION_ACCOUNT_VERIFICATION_PROVIDER_H_
+#define IOS_CHROME_CREDENTIAL_PROVIDER_EXTENSION_ACCOUNT_VERIFICATION_PROVIDER_H_
 
 #import <Foundation/Foundation.h>
 
@@ -30,4 +30,4 @@
 @interface AccountVerificationProvider : NSObject <AccountVerificationProvider>
 @end
 
-#endif  // IOS_CHROME_COMMON_CREDENTIAL_PROVIDER_ACCOUNT_VERIFICATION_PROVIDER_H_
+#endif  // IOS_CHROME_CREDENTIAL_PROVIDER_EXTENSION_ACCOUNT_VERIFICATION_PROVIDER_H_

ios/chrome/common/credential_provider/account_verification_provider.mm → ios/chrome/credential_provider_extension/account_verification_provider.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/common/credential_provider/account_verification_provider.h"
+#import "ios/chrome/credential_provider_extension/account_verification_provider.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."