[Android][Modularization] Move WebSigninBridge to signin.services target

This CL moves WebSigninBridge to signin.services target.

Bug: 1152432
Change-Id: I5736852287f6dfdfd6577ec7cca7b6b99ef5a8ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2556845Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830692}

chrome/android/BUILD.gn

@@ -3379,7 +3379,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java",
     "java/src/org/chromium/chrome/browser/signin/SigninUtils.java",
     "java/src/org/chromium/chrome/browser/signin/UnifiedConsentServiceBridge.java",
-    "java/src/org/chromium/chrome/browser/signin/WebSigninBridge.java",
     "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
     "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java",
     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java",

chrome/android/chrome_java_sources.gni

@@ -1282,7 +1282,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/signin/SigninView.java",
   "java/src/org/chromium/chrome/browser/signin/SyncPromoView.java",
   "java/src/org/chromium/chrome/browser/signin/UnifiedConsentServiceBridge.java",
-  "java/src/org/chromium/chrome/browser/signin/WebSigninBridge.java",
   "java/src/org/chromium/chrome/browser/signin/account_picker/AccountConsistencyPromoAction.java",
   "java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetCoordinator.java",
   "java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetMediator.java",

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

@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.signin.account_picker.AccountConsistencyPromo
 import org.chromium.chrome.browser.signin.account_picker.AccountPickerBottomSheetCoordinator;
 import org.chromium.chrome.browser.signin.account_picker.AccountPickerDelegate;
 import org.chromium.chrome.browser.signin.account_picker.AccountPickerDelegateImpl;
+import org.chromium.chrome.browser.signin.services.WebSigninBridge;
 import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
 import org.chromium.chrome.browser.tabmodel.TabCreator;
 import org.chromium.chrome.browser.tabmodel.TabModel;

chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerDelegateImpl.java

@@ -18,7 +18,7 @@ import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.SigninUtils;
-import org.chromium.chrome.browser.signin.WebSigninBridge;
+import org.chromium.chrome.browser.signin.services.WebSigninBridge;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.components.signin.AccountManagerFacadeProvider;
 import org.chromium.components.signin.AccountUtils;

chrome/android/junit/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerDelegateTest.java

@@ -36,7 +36,7 @@ import org.chromium.chrome.browser.incognito.IncognitoUtils;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.SigninManager;
-import org.chromium.chrome.browser.signin.WebSigninBridge;
+import org.chromium.chrome.browser.signin.services.WebSigninBridge;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
 import org.chromium.components.signin.AccountUtils;

chrome/browser/BUILD.gn

@@ -3227,6 +3227,7 @@ static_library("browser") {
       "//chrome/browser/safety_check/android",
       "//chrome/browser/share",
       "//chrome/browser/share/android:jni_headers",
+      "//chrome/browser/signin/services/android:jni_headers",
       "//chrome/browser/tab:jni_headers",
       "//chrome/browser/ui/android/layouts:android",
       "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings",

chrome/browser/android/signin/web_signin_bridge.cc

@@ -6,10 +6,10 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
-#include "chrome/android/chrome_jni_headers/WebSigninBridge_jni.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/signin/account_reconcilor_factory.h"
 #include "chrome/browser/signin/identity_manager_factory.h"
+#include "chrome/browser/signin/services/android/jni_headers/WebSigninBridge_jni.h"
 #include "components/signin/public/android/jni_headers/GoogleServiceAuthError_jni.h"
 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
 
@@ -20,7 +20,7 @@ void ForwardOnSigninCompletedToJava(
     const GoogleServiceAuthError& error) {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (error.state() == GoogleServiceAuthError::State::NONE) {
-    Java_WebSigninBridge_onSigninSucceded(env, j_listener);
+    Java_WebSigninBridge_onSigninSucceeded(env, j_listener);
   } else {
     base::android::ScopedJavaLocalRef<jobject> j_error =
         signin::Java_GoogleServiceAuthError_Constructor(env, error.state());

chrome/browser/signin/services/android/BUILD.gn

@@ -4,12 +4,27 @@
 
 import("//build/config/android/rules.gni")
 
+generate_jni("jni_headers") {
+  sources = [
+    "java/src/org/chromium/chrome/browser/signin/services/WebSigninBridge.java",
+  ]
+}
+
 android_library("java") {
-  sources = [ "java/src/org/chromium/chrome/browser/signin/services/SigninPreferencesManager.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/browser/signin/services/SigninPreferencesManager.java",
+    "java/src/org/chromium/chrome/browser/signin/services/WebSigninBridge.java",
+  ]
   deps = [
+    "//base:base_java",
+    "//base:jni_java",
     "//chrome/browser/preferences:java",
+    "//chrome/browser/profiles/android:java",
+    "//components/signin/public/android:java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
+
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 android_library("junit") {

chrome/android/java/src/org/chromium/chrome/browser/signin/WebSigninBridge.java → chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/WebSigninBridge.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.chrome.browser.signin;
+package org.chromium.chrome.browser.signin.services;
 
 import androidx.annotation.MainThread;
 
@@ -75,7 +75,7 @@ public class WebSigninBridge {
     }
 
     @CalledByNative
-    private static void onSigninSucceded(Listener listener) {
+    private static void onSigninSucceeded(Listener listener) {
         listener.onSigninSucceeded();
     }