Move IdentityManager java classes to //component/signin/public/android

This is the first step of moving most of the signin java files to a
unique directory and gn component: //component/signin/public/android.
This moves only the //components/signin/*/identity_manager/android
classes. Will follow the relevant //components/signin/core ones.

Bug: 934688
Change-Id: I7b75a5b51b992b311ebf1133d7595a77f6ccd458
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1814929
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Auto-Submit: Pâris Meuleman <pmeuleman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726727}

chrome/android/BUILD.gn

@@ -307,7 +307,7 @@ android_library("chrome_java") {
     "//components/safe_browsing/android:safe_browsing_java",
     "//components/search_engines/android:java",
     "//components/signin/core/browser/android:java",
-    "//components/signin/public/identity_manager/android:java",
+    "//components/signin/public/android:java",
     "//components/spellcheck/browser/android:java",
     "//components/sync/android:sync_java",
     "//components/sync/protocol:protocol_java",
@@ -830,7 +830,7 @@ android_library("chrome_test_java") {
     "//components/signin/core/browser/android:java",
     "//components/signin/core/browser/android:signin_java_test_support",
     "//components/signin/core/browser/android:signin_javatests",
-    "//components/signin/public/identity_manager/android:java",
+    "//components/signin/public/android:java",
     "//components/sync:sync_java_test_support",
     "//components/sync/android:sync_java",
     "//components/sync/android:sync_javatests",

chrome/android/DEPS

@@ -11,7 +11,7 @@ include_rules = [
   "+components/invalidation",
   "+components/policy",
   "+components/signin/core/browser/android",
-  "+components/signin/public/identity_manager/android",
+  "+components/signin/public/android",
   "+components/spellcheck/browser",
   "+components/viz/common/java",
   "+jni",

chrome/android/features/autofill_assistant/BUILD.gn

@@ -43,7 +43,7 @@ android_library("java") {
     "//components/browser_ui/modaldialog/android:java",
     "//components/policy/android:policy_java",
     "//components/signin/core/browser/android:java",
-    "//components/signin/public/identity_manager/android:java",
+    "//components/signin/public/android:java",
     "//components/url_formatter/android:url_formatter_java",
     "//content/public/android:content_java",
     "//mojo/public/java:bindings_java",

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

@@ -25,8 +25,8 @@ import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.components.signin.AccountIdProvider;
 import org.chromium.components.signin.AccountTrackerService;
 import org.chromium.components.signin.ChromeSigninController;
+import org.chromium.components.signin.base.CoreAccountInfo;
 import org.chromium.components.signin.identitymanager.ClearAccountsAction;
-import org.chromium.components.signin.identitymanager.CoreAccountInfo;
 import org.chromium.components.signin.identitymanager.IdentityManager;
 import org.chromium.components.signin.identitymanager.IdentityMutator;
 import org.chromium.components.signin.metrics.SigninAccessPoint;

chrome/android/javatests/src/org/chromium/chrome/browser/signin/IdentityManagerIntegrationTest.java

@@ -20,8 +20,8 @@ import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
 import org.chromium.components.signin.AccountIdProvider;
 import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.components.signin.ChromeSigninController;
-import org.chromium.components.signin.identitymanager.CoreAccountId;
-import org.chromium.components.signin.identitymanager.CoreAccountInfo;
+import org.chromium.components.signin.base.CoreAccountId;
+import org.chromium.components.signin.base.CoreAccountInfo;
 import org.chromium.components.signin.identitymanager.IdentityManager;
 import org.chromium.components.signin.identitymanager.IdentityMutator;
 import org.chromium.components.signin.test.util.AccountHolder;

chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java

@@ -34,8 +34,8 @@ import org.chromium.base.test.DisableNativeTestRule;
 import org.chromium.base.test.util.JniMocker;
 import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.components.signin.AccountTrackerService;
-import org.chromium.components.signin.identitymanager.CoreAccountId;
-import org.chromium.components.signin.identitymanager.CoreAccountInfo;
+import org.chromium.components.signin.base.CoreAccountId;
+import org.chromium.components.signin.base.CoreAccountInfo;
 import org.chromium.components.signin.identitymanager.IdentityManager;
 import org.chromium.components.signin.identitymanager.IdentityMutator;
 import org.chromium.components.signin.metrics.SigninAccessPoint;

chrome/test/android/BUILD.gn

@@ -201,7 +201,7 @@ android_library("chrome_java_test_support") {
     "//components/policy/android:policy_java_test_support",
     "//components/signin/core/browser/android:java",
     "//components/signin/core/browser/android:signin_java_test_support",
-    "//components/signin/public/identity_manager/android:java",
+    "//components/signin/public/android:java",
     "//components/sync/android:sync_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",

chrome/test/android/DEPS

@@ -4,6 +4,3 @@ include_rules = [
   "+components/sync/test/android/javatests/src/org/chromium/components/sync/test/util",
 ]
 
-specific_include_rules = {
-  "SigninTestUtil.java": ["+components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/OAuth2TokenService.java"]
-}

components/BUILD.gn

@@ -324,7 +324,7 @@ test("components_unittests") {
       "//components/policy/android:policy_java",
       "//components/signin/core/browser",
       "//components/signin/core/browser/android:java",
-      "//components/signin/public/identity_manager/android:java",
+      "//components/signin/public/android:java",
       "//components/spellcheck/browser/android:java",
       "//components/variations/android:variations_java",
       "//content/public/android:content_java",

components/invalidation/impl/BUILD.gn

@@ -244,7 +244,7 @@ if (is_android) {
       "//base:base_java",
       "//base:jni_java",
       "//components/signin/core/browser/android:java",
-      "//components/signin/public/identity_manager/android:java",
+      "//components/signin/public/android:java",
       "//components/sync/android:sync_java",
       "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
       "//third_party/cacheinvalidation:cacheinvalidation_javalib",

components/signin/internal/identity_manager/BUILD.gn

@@ -73,9 +73,9 @@ source_set("identity_manager") {
 
   if (is_android) {
     deps += [
-      "android:jni_headers",
       "//components/signin/core/browser/android:jni_headers",
       "//components/signin/internal/base",
+      "//components/signin/public/android:jni_headers",
     ]
   }
 

components/signin/internal/identity_manager/DEPS

@@ -14,4 +14,7 @@ specific_include_rules = {
   "child_account_info_fetcher_android.cc": [
     "+components/signin/core/browser/android/jni_headers/ChildAccountInfoFetcher_jni.h",
   ],
+  "profile_oauth2_token_service_delegate_android.cc": [
+    "+components/signin/public/android/jni_headers/ProfileOAuth2TokenServiceDelegate_jni.h",
+  ]
 }

components/signin/internal/identity_manager/android/BUILD.gn

-import("//build/config/android/rules.gni")
-
-generate_jni("jni_headers") {
-  namespace = "signin"
-  sources = [
-    "//components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/CoreAccountId.java",
-    "//components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/CoreAccountInfo.java",
-    "//components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/IdentityManager.java",
-    "//components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/IdentityMutator.java",
-    "//components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegate.java",
-  ]
-}

components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc

@@ -14,7 +14,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
-#include "components/signin/internal/identity_manager/android/jni_headers/ProfileOAuth2TokenServiceDelegate_jni.h"
+#include "components/signin/public/android/jni_headers/ProfileOAuth2TokenServiceDelegate_jni.h"
 #include "components/signin/public/base/account_consistency_method.h"
 #include "components/signin/public/identity_manager/account_info.h"
 #include "google_apis/gaia/gaia_auth_util.h"

components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.h

@@ -72,8 +72,8 @@ class ProfileOAuth2TokenServiceDelegateAndroid
       const base::Optional<CoreAccountId>& primary_account_id) override;
 
   // Resumes the reload of accounts once the account seeding is complete.
-  // TODO(crbug.com/934688) Once OAuth2TokenService.java is internalized, use
-  // CoreAccountId instead of String.
+  // TODO(crbug.com/934688) Once ProfileOAuth2TokenServiceDelegate.java is
+  // internalized, use CoreAccountId instead of String.
   void ReloadAllAccountsWithPrimaryAccountAfterSeeding(
       JNIEnv* env,
       const base::android::JavaParamRef<jstring>& account_id);

components/signin/public/identity_manager/android/BUILD.gn → components/signin/public/android/BUILD.gn

@@ -7,7 +7,7 @@ android_library("java") {
     "//components/signin/core/browser/android:java",
     "//net/android:net_java",
     "//third_party/android_deps:android_support_v4_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:com_android_support_support_annotations_java",
   ]
 
   srcjar_deps = [
@@ -16,8 +16,8 @@ android_library("java") {
   ]
 
   java_files = [
-    "java/src/org/chromium/components/signin/identitymanager/CoreAccountId.java",
-    "java/src/org/chromium/components/signin/identitymanager/CoreAccountInfo.java",
+    "java/src/org/chromium/components/signin/base/CoreAccountId.java",
+    "java/src/org/chromium/components/signin/base/CoreAccountInfo.java",
     "java/src/org/chromium/components/signin/identitymanager/IdentityManager.java",
     "java/src/org/chromium/components/signin/identitymanager/IdentityMutator.java",
     "java/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegate.java",
@@ -26,20 +26,13 @@ android_library("java") {
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
-android_library("javatests") {
-  testonly = true
-  deps = [
-    ":java",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//components/signin/core/browser/android:java",
-    "//components/signin/core/browser/android:signin_java_test_support",
-    "//third_party/android_deps:com_android_support_support_annotations_java",
-    "//third_party/android_support_test_runner:rules_java",
-    "//third_party/android_support_test_runner:runner_java",
-    "//third_party/jsr-305:jsr_305_javalib",
-    "//third_party/junit",
+generate_jni("jni_headers") {
+  namespace = "signin"
+  sources = [
+    "java/src/org/chromium/components/signin/base/CoreAccountId.java",
+    "java/src/org/chromium/components/signin/base/CoreAccountInfo.java",
+    "java/src/org/chromium/components/signin/identitymanager/IdentityManager.java",
+    "java/src/org/chromium/components/signin/identitymanager/IdentityMutator.java",
+    "java/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegate.java",
   ]
-
-  java_files = [ "javatests/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegateTest.java" ]
 }

components/signin/public/identity_manager/android/DEPS → components/signin/public/android/DEPS

 specific_include_rules = {
   "CoreAccountInfo.java": [
-    "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerFacade.java"
+    "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerFacade.java",
   ],
   "IdentityManager.java": [
     "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerFacade.java",
   ],
   "ProfileOAuth2TokenServiceDelegate.java": [
-    "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerFacade.java",
     "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountTrackerService.java",
-    "+components/signin/core/browser/android/java/src/org/chromium/components/signin/ChromeSigninController.java",
+    "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerFacade.java",
     "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AuthException.java",
+    "+components/signin/core/browser/android/java/src/org/chromium/components/signin/ChromeSigninController.java",
   ],
   "ProfileOAuth2TokenServiceDelegateTest.java": [
     "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerFacade.java",

components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/CoreAccountId.java → components/signin/public/android/java/src/org/chromium/components/signin/base/CoreAccountId.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.components.signin.identitymanager;
+package org.chromium.components.signin.base;
 
 import androidx.annotation.NonNull;
 

components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/CoreAccountInfo.java → components/signin/public/android/java/src/org/chromium/components/signin/base/CoreAccountInfo.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.components.signin.identitymanager;
+package org.chromium.components.signin.base;
 
 import android.accounts.Account;
 

components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/IdentityManager.java → components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/IdentityManager.java

@@ -14,6 +14,8 @@ import org.chromium.base.ObserverList;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.components.signin.AccountManagerFacade;
+import org.chromium.components.signin.base.CoreAccountId;
+import org.chromium.components.signin.base.CoreAccountInfo;
 
 /**
  * IdentityManager provides access to native IdentityManager's public API to java components.

components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/IdentityMutator.java → components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/IdentityMutator.java

@@ -8,6 +8,7 @@ import androidx.annotation.Nullable;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
+import org.chromium.components.signin.base.CoreAccountId;
 import org.chromium.components.signin.metrics.SignoutDelete;
 import org.chromium.components.signin.metrics.SignoutReason;
 

components/signin/public/identity_manager/android/java/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegate.java → components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegate.java

@@ -71,8 +71,8 @@ public final class ProfileOAuth2TokenServiceDelegate
     private final AccountManagerFacade mAccountManagerFacade;
 
     private boolean mPendingUpdate;
-    // TODO(crbug.com/934688) Once OAuth2TokenService.java is internalized, use CoreAccountId
-    // instead of String.
+    // TODO(crbug.com/934688) Once ProfileOAuth2TokenServiceDelegate.java is internalized, use
+    // CoreAccountId instead of String.
     private String mPendingUpdateAccountId;
 
     @VisibleForTesting

components/signin/public/identity_manager/BUILD.gn

@@ -66,8 +66,7 @@ source_set("identity_manager") {
   }
 
   if (is_android) {
-    deps +=
-        [ "//components/signin/internal/identity_manager/android:jni_headers" ]
+    deps += [ "//components/signin/public/android:jni_headers" ]
   }
 
   allow_circular_includes_from = [

components/signin/public/identity_manager/account_info.cc

@@ -7,8 +7,8 @@
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_string.h"
-#include "components/signin/internal/identity_manager/android/jni_headers/CoreAccountId_jni.h"
-#include "components/signin/internal/identity_manager/android/jni_headers/CoreAccountInfo_jni.h"
+#include "components/signin/public/android/jni_headers/CoreAccountId_jni.h"
+#include "components/signin/public/android/jni_headers/CoreAccountInfo_jni.h"
 #endif
 
 namespace {

components/signin/public/identity_manager/identity_manager.cc

@@ -23,8 +23,8 @@
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_string.h"
-#include "components/signin/internal/identity_manager/android/jni_headers/IdentityManager_jni.h"
 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_delegate.h"
+#include "components/signin/public/android/jni_headers/IdentityManager_jni.h"
 #endif
 
 #if BUILDFLAG(ENABLE_DICE_SUPPORT)
@@ -436,8 +436,7 @@ IdentityManager::GetAccountsWithRefreshTokens(JNIEnv* env) const {
 
   base::android::ScopedJavaLocalRef<jclass> coreaccountinfo_clazz =
       base::android::GetClass(
-          env,
-          "org/chromium/components/signin/identitymanager/CoreAccountInfo");
+          env, "org/chromium/components/signin/base/CoreAccountInfo");
   base::android::ScopedJavaLocalRef<jobjectArray> array(
       env, env->NewObjectArray(accounts.size(), coreaccountinfo_clazz.obj(),
                                nullptr));

components/signin/public/identity_manager/identity_mutator.cc

@@ -11,7 +11,7 @@
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_string.h"
-#include "components/signin/internal/identity_manager/android/jni_headers/IdentityMutator_jni.h"
+#include "components/signin/public/android/jni_headers/IdentityMutator_jni.h"
 #include "components/signin/public/identity_manager/account_info.h"
 #endif
 

services/BUILD.gn

@@ -52,7 +52,7 @@ test("services_unittests") {
 
   if (is_android) {
     deps += [
-      "//components/signin/public/identity_manager/android:java",
+      "//components/signin/public/android:java",
       "//services/data_decoder/public/cpp/android:safe_json_java",
       "//services/device:java",
       "//services/identity:java",