[Signin][Android] Move AccountManagerFacade.java and dependants to ../../../public/android

This CL is a second step towards reorganizing //components/signin java files, this one moves the files from core/browser/android to public/android when relevant.

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

chrome/android/BUILD.gn

@@ -380,7 +380,7 @@ android_library("chrome_java") {
     "//components/security_state/content/android:java",
     "//components/security_state/core:security_state_enums_java",
     "//components/signin/core/browser/android:java",
-    "//components/signin/public/android:java",
+    "//components/signin/public/android:signin_java",
     "//components/spellcheck/browser/android:java",
     "//components/subresource_filter/android:java",
     "//components/sync/android:sync_java",
@@ -915,8 +915,8 @@ android_library("chrome_test_java") {
     "//components/security_state/core:security_state_enums_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/android:java",
+    "//components/signin/public/android:javatests",
+    "//components/signin/public/android:signin_java",
     "//components/sync:sync_java_test_support",
     "//components/sync/android:sync_java",
     "//components/sync/android:sync_javatests",

chrome/android/features/autofill_assistant/BUILD.gn

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

chrome/test/BUILD.gn

@@ -6142,7 +6142,7 @@ if (is_android) {
     deps = [
       "//chrome/android:chrome_all_java",
       "//chrome/test/android:chrome_java_test_support",
-      "//components/signin/public/android:java",
+      "//components/signin/public/android:signin_java",
       "//content/public/test/android:content_java_test_support",
       "//third_party/junit",
     ]

chrome/test/android/BUILD.gn

@@ -226,7 +226,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/android:java",
+    "//components/signin/public/android:signin_java",
     "//components/sync/android:sync_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",

components/BUILD.gn

@@ -332,7 +332,7 @@ test("components_unittests") {
       "//components/policy/android:policy_java",
       "//components/signin/core/browser",
       "//components/signin/core/browser/android:java",
-      "//components/signin/public/android:java",
+      "//components/signin/public/android:signin_java",
       "//components/spellcheck/browser/android:java",
       "//components/url_formatter/android:native_java_unittests_java",
       "//components/variations/android:variations_java",
@@ -740,7 +740,7 @@ if (is_android) {
       "//components/gcm_driver/android:components_gcm_driver_junit_tests",
       "//components/permissions/android:components_permissions_junit_tests",
       "//components/policy/android:components_policy_junit_tests",
-      "//components/signin/core/browser/android:components_signin_junit_tests",
+      "//components/signin/public/android:components_signin_junit_tests",
       "//components/variations/android:components_variations_junit_tests",
     ]
   }

components/signin/core/browser/android/BUILD.gn

@@ -2,108 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# TODO(crbug.com/934688) Remove this file once other repository dependencies are updated.
 import("//build/config/android/rules.gni")
-
-generate_jni("jni_headers") {
-  sources = [
-    "java/src/org/chromium/components/signin/AccountManagerFacadeProvider.java",
-    "java/src/org/chromium/components/signin/AccountTrackerService.java",
-    "java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java",
-  ]
+java_group("java") {
+  deps = [ "//components/signin/public/android:signin_java" ]
 }
 
-android_library("java") {
-  deps = [
-    "$google_play_services_package:google_play_services_auth_base_java",
-    "$google_play_services_package:google_play_services_base_java",
-    "$google_play_services_package:google_play_services_basement_java",
-    "//base:base_java",
-    "//base:jni_java",
-    "//net/android:net_java",
-    "//third_party/android_deps:android_support_v4_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//ui/android:ui_java",
-  ]
-
-  sources = [
-    "java/src/org/chromium/components/signin/AccountManagerDelegate.java",
-    "java/src/org/chromium/components/signin/AccountManagerDelegateException.java",
-    "java/src/org/chromium/components/signin/AccountManagerFacade.java",
-    "java/src/org/chromium/components/signin/AccountManagerFacadeImpl.java",
-    "java/src/org/chromium/components/signin/AccountManagerFacadeProvider.java",
-    "java/src/org/chromium/components/signin/AccountManagerResult.java",
-    "java/src/org/chromium/components/signin/AccountTrackerService.java",
-    "java/src/org/chromium/components/signin/AccountUtils.java",
-    "java/src/org/chromium/components/signin/AccountsChangeObserver.java",
-    "java/src/org/chromium/components/signin/AuthException.java",
-    "java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java",
-    "java/src/org/chromium/components/signin/ChildAccountStatus.java",
-    "java/src/org/chromium/components/signin/ChromeSigninController.java",
-    "java/src/org/chromium/components/signin/GmsAvailabilityException.java",
-    "java/src/org/chromium/components/signin/GmsJustUpdatedException.java",
-    "java/src/org/chromium/components/signin/MutableObservableValue.java",
-    "java/src/org/chromium/components/signin/ObservableValue.java",
-    "java/src/org/chromium/components/signin/ProfileDataSource.java",
-    "java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java",
-    "java/src/org/chromium/components/signin/util/PatternMatcher.java",
-  ]
-
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-}
-
-java_library("components_signin_junit_tests") {
-  # Platform checks are broken for Robolectric. See https://crbug.com/1071638.
-  bypass_platform_checks = true
+java_group("signin_java_test_support") {
   testonly = true
-  sources = [
-    "junit/src/org/chromium/components/signin/test/AccountManagerFacadeRobolectricTest.java",
-    "junit/src/org/chromium/components/signin/test/ObservableValueTest.java",
-    "junit/src/org/chromium/components/signin/test/PatternMatcherTest.java",
-  ]
-  deps = [
-    ":java",
-    ":signin_java_test_support",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//base:base_junit_test_support",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/junit",
-  ]
-}
-
-android_library("signin_javatests") {
-  testonly = true
-  deps = [
-    ":java",
-    ":signin_java_test_support",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:androidx_test_monitor_java",
-    "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
-    "//third_party/android_support_test_runner:rules_java",
-    "//third_party/android_support_test_runner:runner_java",
-    "//third_party/junit",
-  ]
-
-  sources = [ "javatests/src/org/chromium/components/signin/test/AccountManagerFacadeTest.java" ]
-}
-
-android_library("signin_java_test_support") {
-  testonly = true
-  deps = [
-    ":java",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
-    "//third_party/junit",
-  ]
-
-  sources = [
-    "javatests/src/org/chromium/components/signin/test/util/AccountHolder.java",
-    "javatests/src/org/chromium/components/signin/test/util/AccountManagerTestRule.java",
-    "javatests/src/org/chromium/components/signin/test/util/FakeAccountManagerDelegate.java",
-    "javatests/src/org/chromium/components/signin/test/util/FakeProfileDataSource.java",
-  ]
+  deps = [ "//components/signin/public/android:signin_java_test_support" ]
 }

components/signin/core/browser/android/DEPS

+include_rules = [
+  "+components/signin/public/android",
+]

components/signin/internal/base/BUILD.gn

@@ -12,7 +12,7 @@ source_set("base") {
     ]
     deps = [
       "//base",
-      "//components/signin/core/browser/android:jni_headers",
+      "//components/signin/public/android:jni_headers",
     ]
   }
 }

components/signin/internal/base/DEPS

@@ -3,6 +3,6 @@ include_rules = [
 
 specific_include_rules = {
   "account_manager_facade_android.cc": [
-    "+components/signin/core/browser/android/jni_headers/AccountManagerFacadeProvider_jni.h",
+    "+components/signin/public/android/jni_headers/AccountManagerFacadeProvider_jni.h",
   ],
 }

components/signin/internal/base/account_manager_facade_android.cc

@@ -4,10 +4,10 @@
 
 #include "components/signin/internal/base/account_manager_facade_android.h"
 
-#include "components/signin/core/browser/android/jni_headers/AccountManagerFacadeProvider_jni.h"
+#include "components/signin/public/android/jni_headers/AccountManagerFacadeProvider_jni.h"
 
 base::android::ScopedJavaLocalRef<jobject>
 AccountManagerFacadeAndroid::GetJavaObject() {
-  return Java_AccountManagerFacadeProvider_getInstance(
+  return signin::Java_AccountManagerFacadeProvider_getInstance(
       base::android::AttachCurrentThread());
 }

components/signin/internal/identity_manager/BUILD.gn

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

components/signin/internal/identity_manager/DEPS

@@ -9,10 +9,10 @@ include_rules = [
 
 specific_include_rules = {
   "account_tracker_service.cc": [
-    "+components/signin/core/browser/android/jni_headers/AccountTrackerService_jni.h",
+    "+components/signin/public/android/jni_headers/AccountTrackerService_jni.h",
   ],
   "child_account_info_fetcher_android.cc": [
-    "+components/signin/core/browser/android/jni_headers/ChildAccountInfoFetcher_jni.h",
+    "+components/signin/public/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/account_tracker_service.cc

@@ -32,7 +32,7 @@
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_array.h"
-#include "components/signin/core/browser/android/jni_headers/AccountTrackerService_jni.h"
+#include "components/signin/public/android/jni_headers/AccountTrackerService_jni.h"
 #endif
 
 namespace {
@@ -104,7 +104,8 @@ AccountTrackerService::AccountTrackerService() {
 #if defined(OS_ANDROID)
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> java_ref =
-      Java_AccountTrackerService_create(env, reinterpret_cast<intptr_t>(this));
+      signin::Java_AccountTrackerService_create(
+          env, reinterpret_cast<intptr_t>(this));
   java_ref_.Reset(env, java_ref.obj());
 #endif
 }

components/signin/internal/identity_manager/child_account_info_fetcher_android.cc

@@ -9,9 +9,9 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/memory/ptr_util.h"
-#include "components/signin/core/browser/android/jni_headers/ChildAccountInfoFetcher_jni.h"
 #include "components/signin/internal/identity_manager/account_fetcher_service.h"
 #include "components/signin/internal/identity_manager/account_tracker_service.h"
+#include "components/signin/public/android/jni_headers/ChildAccountInfoFetcher_jni.h"
 
 using base::android::JavaParamRef;
 
@@ -32,7 +32,7 @@ ChildAccountInfoFetcherAndroid::Create(AccountFetcherService* service,
 }
 
 void ChildAccountInfoFetcherAndroid::InitializeForTests() {
-  Java_ChildAccountInfoFetcher_initializeForTests(
+  signin::Java_ChildAccountInfoFetcher_initializeForTests(
       base::android::AttachCurrentThread());
 }
 
@@ -41,17 +41,20 @@ ChildAccountInfoFetcherAndroid::ChildAccountInfoFetcherAndroid(
     const CoreAccountId& account_id,
     const std::string& account_name) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  j_child_account_info_fetcher_.Reset(Java_ChildAccountInfoFetcher_create(
-      env, reinterpret_cast<jlong>(service),
-      base::android::ConvertUTF8ToJavaString(env, account_id.ToString()),
-      base::android::ConvertUTF8ToJavaString(env, account_name)));
+  j_child_account_info_fetcher_.Reset(
+      signin::Java_ChildAccountInfoFetcher_create(
+          env, reinterpret_cast<jlong>(service),
+          base::android::ConvertUTF8ToJavaString(env, account_id.ToString()),
+          base::android::ConvertUTF8ToJavaString(env, account_name)));
 }
 
 ChildAccountInfoFetcherAndroid::~ChildAccountInfoFetcherAndroid() {
-  Java_ChildAccountInfoFetcher_destroy(base::android::AttachCurrentThread(),
-                                       j_child_account_info_fetcher_);
+  signin::Java_ChildAccountInfoFetcher_destroy(
+      base::android::AttachCurrentThread(), j_child_account_info_fetcher_);
 }
 
+namespace signin {
+
 // TODO(crbug.com/1028580) Pass |j_account_id| as a
 // org.chromium.components.signin.identitymanager.CoreAccountId and convert it
 // to CoreAccountId using ConvertFromJavaCoreAccountId.
@@ -67,3 +70,4 @@ void JNI_ChildAccountInfoFetcher_SetIsChildAccount(
           base::android::ConvertJavaStringToUTF8(env, j_account_id)),
       is_child_account);
 }
+}  // namespace signin

components/signin/public/android/BUILD.gn

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
 import("//build/config/android/rules.gni")
 
-android_library("java") {
+
+# TODO(crbug.com/934688) Rename the following to java once
+# //components/signin/core/browser/android:java is deleted.
+android_library("signin_java") {
   deps = [
+    "$google_play_services_package:google_play_services_auth_base_java",
+    "$google_play_services_package:google_play_services_base_java",
     "//base:base_java",
     "//base:jni_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",
@@ -16,11 +24,31 @@ android_library("java") {
   ]
 
   sources = [
+    "java/src/org/chromium/components/signin/AccountManagerDelegate.java",
+    "java/src/org/chromium/components/signin/AccountManagerDelegateException.java",
+    "java/src/org/chromium/components/signin/AccountManagerFacade.java",
+    "java/src/org/chromium/components/signin/AccountManagerFacadeImpl.java",
+    "java/src/org/chromium/components/signin/AccountManagerFacadeProvider.java",
+    "java/src/org/chromium/components/signin/AccountManagerResult.java",
+    "java/src/org/chromium/components/signin/AccountTrackerService.java",
+    "java/src/org/chromium/components/signin/AccountUtils.java",
+    "java/src/org/chromium/components/signin/AccountsChangeObserver.java",
+    "java/src/org/chromium/components/signin/AuthException.java",
+    "java/src/org/chromium/components/signin/ChildAccountStatus.java",
+    "java/src/org/chromium/components/signin/ChromeSigninController.java",
+    "java/src/org/chromium/components/signin/GmsAvailabilityException.java",
+    "java/src/org/chromium/components/signin/GmsJustUpdatedException.java",
+    "java/src/org/chromium/components/signin/MutableObservableValue.java",
+    "java/src/org/chromium/components/signin/ObservableValue.java",
+    "java/src/org/chromium/components/signin/ProfileDataSource.java",
+    "java/src/org/chromium/components/signin/SystemAccountManagerDelegate.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/ChildAccountInfoFetcher.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/src/org/chromium/components/signin/util/PatternMatcher.java",
   ]
 
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -29,10 +57,71 @@ android_library("java") {
 generate_jni("jni_headers") {
   namespace = "signin"
   sources = [
+    "java/src/org/chromium/components/signin/AccountManagerFacadeProvider.java",
+    "java/src/org/chromium/components/signin/AccountTrackerService.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/ChildAccountInfoFetcher.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",
   ]
 }
+
+android_library("javatests") {
+  testonly = true
+  deps = [
+    ":signin_java",
+    ":signin_java_test_support",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_test_monitor_java",
+    "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+    "//third_party/android_support_test_runner:rules_java",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/junit",
+  ]
+
+  sources = [ "javatests/src/org/chromium/components/signin/test/AccountManagerFacadeTest.java" ]
+}
+
+java_library("components_signin_junit_tests") {
+  # Platform checks are broken for Roboelectric. See https://crbug.com/1071638
+  bypass_platform_checks = true
+  testonly = true
+  sources = [
+    "junit/src/org/chromium/components/signin/test/AccountManagerFacadeRobolectricTest.java",
+    "junit/src/org/chromium/components/signin/test/ObservableValueTest.java",
+    "junit/src/org/chromium/components/signin/test/PatternMatcherTest.java",
+  ]
+  deps = [
+    ":signin_java",
+    ":signin_java_test_support",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//base:base_junit_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_test_monitor_java",
+    "//third_party/junit",
+  ]
+}
+
+android_library("signin_java_test_support") {
+  testonly = true
+  deps = [
+    ":signin_java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+    "//third_party/junit",
+  ]
+
+  sources = [
+    "javatests/src/org/chromium/components/signin/test/util/AccountHolder.java",
+    "javatests/src/org/chromium/components/signin/test/util/AccountManagerTestRule.java",
+    "javatests/src/org/chromium/components/signin/test/util/FakeAccountManagerDelegate.java",
+    "javatests/src/org/chromium/components/signin/test/util/FakeProfileDataSource.java",
+  ]
+}

components/signin/public/android/DEPS

-specific_include_rules = {
-  "CoreAccountInfo.java": [
-    "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountUtils.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/AccountTrackerService.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/AccountUtils.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/core/browser/android/java/src/org/chromium/components/signin/AccountManagerFacadeProvider.java",
-    "+components/signin/core/browser/android/javatests/src/org/chromium/components/signin/test/util/AccountHolder.java",
-    "+components/signin/core/browser/android/javatests/src/org/chromium/components/signin/test/util/AccountManagerTestRule.java",
-  ],
-}

components/signin/core/browser/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java → components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/ChildAccountInfoFetcher.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;
+package org.chromium.components.signin.identitymanager;
 
 import android.accounts.Account;
 import android.content.BroadcastReceiver;
@@ -17,6 +17,12 @@ import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
+import org.chromium.components.signin.AccountManagerDelegate;
+import org.chromium.components.signin.AccountManagerFacadeImpl;
+import org.chromium.components.signin.AccountManagerFacadeProvider;
+import org.chromium.components.signin.AccountUtils;
+import org.chromium.components.signin.ChildAccountStatus;
+import org.chromium.components.signin.SystemAccountManagerDelegate;
 
 /**
  * ChildAccountInfoFetcher for the Android platform.

components/signin/public/android/javatests/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegateTest.java

@@ -19,8 +19,8 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
-import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.components.signin.AccountManagerFacadeProvider;
+import org.chromium.components.signin.AccountUtils;
 import org.chromium.components.signin.test.util.AccountHolder;
 import org.chromium.components.signin.test.util.AccountManagerTestRule;
 
@@ -76,58 +76,52 @@ public class ProfileOAuth2TokenServiceDelegateTest {
         mContext = new AdvancedMockContext(InstrumentationRegistry.getTargetContext());
         mProfileOAuth2TokenServiceDelegate = new ProfileOAuth2TokenServiceDelegate(
                 0 /*nativeProfileOAuth2TokenServiceDelegateDelegate*/,
-                null /* AccountTrackerService */, AccountManagerFacadeProvider.get());
+                null /* AccountTrackerService */, AccountManagerFacadeProvider.getInstance());
     }
 
     @After
     public void tearDown() {
-        AccountManagerFacadeProvider.resetAccountManagerFacadeForTests();
+        AccountManagerFacadeProvider.resetInstanceForTests();
     }
 
     @Test
     @SmallTest
     @Feature({"Sync"})
     public void testGetAccountsNoAccountsRegistered() {
-        String[] accounts = ProfileOAuth2TokenServiceDelegate.getAccounts();
-        Assert.assertEquals("There should be no accounts registered", 0, accounts.length);
+        String[] sysAccounts = mProfileOAuth2TokenServiceDelegate.getSystemAccountNames();
+        Assert.assertEquals("There should be no accounts registered", 0, sysAccounts.length);
     }
 
     @Test
     @SmallTest
     @Feature({"Sync"})
     public void testGetAccountsOneAccountRegistered() {
-        Account account1 = AccountManagerFacade.createAccountFromName("foo@gmail.com");
+        Account account1 = AccountUtils.createAccountFromName("foo@gmail.com");
         AccountHolder accountHolder1 = AccountHolder.builder(account1).build();
         mAccountManagerTestRule.addAccount(accountHolder1);
 
         String[] sysAccounts = mProfileOAuth2TokenServiceDelegate.getSystemAccountNames();
         Assert.assertEquals("There should be one registered account", 1, sysAccounts.length);
         Assert.assertEquals("The account should be " + account1, account1.name, sysAccounts[0]);
-
-        String[] accounts = ProfileOAuth2TokenServiceDelegate.getAccounts();
-        Assert.assertEquals("There should be zero registered account", 0, accounts.length);
     }
 
     @Test
     @SmallTest
     @Feature({"Sync"})
     public void testGetAccountsTwoAccountsRegistered() {
-        Account account1 = AccountManagerFacade.createAccountFromName("foo@gmail.com");
+        Account account1 = AccountUtils.createAccountFromName("foo@gmail.com");
         AccountHolder accountHolder1 = AccountHolder.builder(account1).build();
         mAccountManagerTestRule.addAccount(accountHolder1);
-        Account account2 = AccountManagerFacade.createAccountFromName("bar@gmail.com");
+        Account account2 = AccountUtils.createAccountFromName("bar@gmail.com");
         AccountHolder accountHolder2 = AccountHolder.builder(account2).build();
         mAccountManagerTestRule.addAccount(accountHolder2);
 
         String[] sysAccounts = mProfileOAuth2TokenServiceDelegate.getSystemAccountNames();
-        Assert.assertEquals("There should be one registered account", 2, sysAccounts.length);
+        Assert.assertEquals("There should be two registered account", 2, sysAccounts.length);
         Assert.assertTrue("The list should contain " + account1,
                 Arrays.asList(sysAccounts).contains(account1.name));
         Assert.assertTrue("The list should contain " + account2,
                 Arrays.asList(sysAccounts).contains(account2.name));
-
-        String[] accounts = ProfileOAuth2TokenServiceDelegate.getAccounts();
-        Assert.assertEquals("There should be zero registered account", 0, accounts.length);
     }
 
     @Test
@@ -150,7 +144,7 @@ public class ProfileOAuth2TokenServiceDelegateTest {
 
     private void runTestOfGetOAuth2AccessTokenWithTimeout(String expectedToken) {
         String scope = "oauth2:http://example.com/scope";
-        Account account = AccountManagerFacade.createAccountFromName("test@gmail.com");
+        Account account = AccountUtils.createAccountFromName("test@gmail.com");
 
         // Add an account with given auth token for the given scope, already accepted auth popup.
         AccountHolder accountHolder = AccountHolder.builder(account)

services/BUILD.gn

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