Clean Identity Manager dependencies in //components

After the IdentityManager code restructing into public and internal APIs
was fixed in https://crbug.com/952788, this CL fixes both build
dependencies and presubmit checks in //components.

Bug: 970268
Change-Id: Ie4ecf25fa054c2f2b14dcd115988678494ae007b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1710316
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#679941}

components/autofill/core/browser/DEPS

@@ -8,25 +8,7 @@ include_rules = [
   "+components/metrics",
   "+components/policy",
   "+components/security_state",
-  "+components/signin/core/browser",
-  # Use identity_manager.h instead of the below files;
-  # see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/dgFLuxqZt1o/iEqkyoQQBwAJ for help and info.
-  "-components/signin/internal/identity_manager/account_fetcher_service.h",
-  "-components/signin/internal/identity_manager/account_info_fetcher.h",
-  "-components/signin/internal/identity_manager/account_tracker_service.h",
-  "-components/signin/internal/identity_manager/child_account_info_fetcher_android.h",
-  "-components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h",
-  "-components/signin/internal/identity_manager/gaia_cookie_manager_service.h",
-  "-components/signin/internal/identity_manager/oauth2_token_service_delegate_android.h",
-  "-components/signin/internal/identity_manager/oauth2_multilogin_helper.h",
-  "-components/signin/internal/identity_manager/oauth2_multilogin_token_fetcher.h",
-  "-components/signin/internal/identity_manager/primary_account_manager.h",
-  "-components/signin/internal/identity_manager/primary_account_policy_manager.h",
-  "-components/signin/internal/identity_manager/profile_oauth2_token_service.h",
-  "-components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos.h",
-  "-components/signin/internal/identity_manager/ubertoken_fetcher_impl.h",
   "+components/signin/public",
-
   "+components/sync",
   "+components/variations",
   "+components/version_info",

components/browser_sync/BUILD.gn

@@ -86,8 +86,6 @@ static_library("test_support") {
     "//base/test:test_support",
     "//components/bookmarks/browser",
     "//components/history/core/browser",
-    "//components/signin/core/browser",
-    "//components/signin/public/base:test_support",
     "//components/sync",
     "//components/sync:test_support",
     "//components/sync_preferences:test_support",

components/invalidation/impl/BUILD.gn

@@ -146,7 +146,6 @@ source_set("unit_tests") {
     "//components/gcm_driver/instance_id:test_support",
     "//components/prefs",
     "//components/prefs:test_support",
-    "//components/signin/public/base:test_support",
     "//components/signin/public/identity_manager:test_support",
     "//components/sync_preferences:test_support",
     "//google_apis:test_support",

components/search_provider_logos/BUILD.gn

@@ -32,7 +32,6 @@ static_library("search_provider_logos") {
     "//components/image_fetcher/core",
     "//components/keyed_service/core",
     "//components/search_engines",
-    "//components/signin/core/browser",
     "//components/signin/public/identity_manager",
     "//net",
     "//services/network/public/cpp",
@@ -96,7 +95,6 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//components/image_fetcher/core",
     "//components/search_engines",
-    "//components/signin/core/browser",
     "//components/signin/public/base:test_support",
     "//components/signin/public/identity_manager:test_support",
     "//components/sync_preferences:test_support",

components/search_provider_logos/DEPS

@@ -2,25 +2,7 @@ include_rules = [
   "+components/image_fetcher/core",
   "+components/keyed_service/core",
   "+components/search_engines",
-  "+components/signin/core/browser",
-  # Use identity_manager.h instead of the below files;
-  # see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/dgFLuxqZt1o/iEqkyoQQBwAJ for help and info.
-  "-components/signin/internal/identity_manager/account_fetcher_service.h",
-  "-components/signin/internal/identity_manager/account_info_fetcher.h",
-  "-components/signin/internal/identity_manager/account_tracker_service.h",
-  "-components/signin/internal/identity_manager/child_account_info_fetcher_android.h",
-  "-components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h",
-  "-components/signin/internal/identity_manager/gaia_cookie_manager_service.h",
-  "-components/signin/internal/identity_manager/oauth2_token_service_delegate_android.h",
-  "-components/signin/internal/identity_manager/oauth2_multilogin_helper.h",
-  "-components/signin/internal/identity_manager/oauth2_multilogin_token_fetcher.h",
-  "-components/signin/internal/identity_manager/primary_account_manager.h",
-  "-components/signin/internal/identity_manager/primary_account_policy_manager.h",
-  "-components/signin/internal/identity_manager/profile_oauth2_token_service.h",
-  "-components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos.h",
-  "-components/signin/internal/identity_manager/ubertoken_fetcher_impl.h",
   "+components/signin/public",
-
   "+components/sync_preferences/testing_pref_service_syncable.h",
   "+net",
   "+services/network/public/cpp",

components/signin/DEPS

@@ -7,7 +7,10 @@ include_rules = [
   "+components/os_crypt",
   "+components/prefs",
   "+components/sync_preferences",
-  "+components/signin",
+  # Subdirectories of //components/signin must explicitly allow deps on each
+  # other based on the conceptual deps structure.
+  "-components/signin",
+  "+components/signin/public",
   "+components/user_manager",
   "+components/webdata/common",
   "+crypto",

components/signin/internal/identity_manager/DEPS

@@ -2,3 +2,15 @@ include_rules = [
   "+chromeos/constants/chromeos_switches.h",
   "+mojo/public",
 ]
+
+specific_include_rules = {
+  "account_tracker_service.cc": [
+    "+components/signin/core/browser/android/jni_headers/AccountTrackerService_jni.h",
+  ],
+  "child_account_info_fetcher_android.cc": [
+    "+components/signin/core/browser/android/jni_headers/ChildAccountInfoFetcher_jni.h",
+  ],
+  "oauth2_token_service_delegate_android.cc": [
+    "+components/signin/core/browser/android/jni_headers/OAuth2TokenService_jni.h",
+  ],
+}

components/signin/ios/browser/DEPS

+specific_include_rules = {
+    "account_consistency_service.mm": [
+      "+components/signin/core/browser/account_reconcilor.h",
+      "+components/signin/core/browser/signin_header_helper.h",
+    ],
+    "account_consistency_service_unittest.mm": [
+      "+components/signin/core/browser/account_reconcilor.h",
+      "+components/signin/core/browser/account_reconcilor_delegate.h",
+    ],
+}

components/signin/public/identity_manager/DEPS

+include_rules = [
+  "+components/signin/internal",
+]

components/sync/driver/BUILD.gn

@@ -112,7 +112,6 @@ jumbo_static_library("driver") {
     "//components/invalidation/impl:feature_list",
     "//components/keyed_service/core",
     "//components/prefs",
-    "//components/signin/core/browser",
     "//components/signin/public/identity_manager",
     "//components/version_info",
     "//components/version_info:generate_version_info",

components/sync/driver/DEPS

@@ -5,25 +5,7 @@ include_rules = [
   "+components/policy",
   "+components/pref_registry",
   "+components/prefs",
-  "+components/signin/core/browser",
-  # Use identity_manager.h instead of the below files;
-  # see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/dgFLuxqZt1o/iEqkyoQQBwAJ for help and info.
-  "-components/signin/internal/identity_manager/account_fetcher_service.h",
-  "-components/signin/internal/identity_manager/account_info_fetcher.h",
-  "-components/signin/internal/identity_manager/account_tracker_service.h",
-  "-components/signin/internal/identity_manager/child_account_info_fetcher_android.h",
-  "-components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h",
-  "-components/signin/internal/identity_manager/gaia_cookie_manager_service.h",
-  "-components/signin/internal/identity_manager/oauth2_token_service_delegate_android.h",
-  "-components/signin/internal/identity_manager/oauth2_multilogin_helper.h",
-  "-components/signin/internal/identity_manager/oauth2_multilogin_token_fetcher.h",
-  "-components/signin/internal/identity_manager/primary_account_manager.h",
-  "-components/signin/internal/identity_manager/primary_account_policy_manager.h",
-  "-components/signin/internal/identity_manager/profile_oauth2_token_service.h",
-  "-components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos.h",
-  "-components/signin/internal/identity_manager/ubertoken_fetcher_impl.h",
   "+components/signin/public",
-
   "+components/sync/base",
   "+components/sync/engine",
   "+components/sync/engine_impl",

components/test/BUILD.gn

@@ -16,7 +16,6 @@ source_set("test_support") {
   deps = [
     "//components/content_settings/core/common",
     "//components/gcm_driver:gcm_driver",
-    "//components/signin/core/browser",
     "//mojo/core/embedder",
     "//net",
     "//testing/gtest",

components/unified_consent/BUILD.gn

@@ -20,7 +20,7 @@ static_library("unified_consent") {
     "//components/autofill/core/common",
     "//components/browser_sync",
     "//components/pref_registry",
-    "//components/signin/core/browser",
+    "//components/prefs",
     "//components/signin/public/identity_manager",
     "//components/sync",
     "//components/sync_preferences",