Commit 4c50825a authored by Alice Wang's avatar Alice Wang Committed by Chromium LUCI CQ

[Modularization] Move SigninHelper to signin.services target

This CL moves SigninHelper to signin.services target.

Bug: 1158799
Change-Id: I53e5efda1d18b3233de01d11fde3e67d479fea2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595408Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837977}
parent 514e980e
......@@ -1248,7 +1248,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/signin/SigninActivityLauncherImpl.java",
"java/src/org/chromium/chrome/browser/signin/SigninFragment.java",
"java/src/org/chromium/chrome/browser/signin/SigninFragmentBase.java",
"java/src/org/chromium/chrome/browser/signin/SigninHelper.java",
"java/src/org/chromium/chrome/browser/signin/SigninHelperProvider.java",
"java/src/org/chromium/chrome/browser/signin/SigninManagerImpl.java",
"java/src/org/chromium/chrome/browser/signin/SigninPromoController.java",
......
......@@ -8,6 +8,7 @@ import androidx.annotation.MainThread;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
import org.chromium.chrome.browser.signin.services.SigninHelper;
import org.chromium.chrome.browser.signin.services.SigninPreferencesManager;
import org.chromium.chrome.browser.sync.SyncController;
......
......@@ -14,6 +14,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.chromium.base.test.util.Batch;
import org.chromium.chrome.browser.signin.services.SigninHelper;
import org.chromium.chrome.browser.signin.services.SigninPreferencesManager;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
......
......@@ -23,9 +23,9 @@ import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.signin.SigninHelper;
import org.chromium.chrome.browser.signin.SigninHelperProvider;
import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
import org.chromium.chrome.browser.signin.services.SigninHelper;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.browser.Features;
import org.chromium.chrome.test.util.browser.signin.MockChangeEventChecker;
......
......@@ -20,6 +20,7 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java",
"java/src/org/chromium/chrome/browser/signin/services/ProfileDataCache.java",
"java/src/org/chromium/chrome/browser/signin/services/ProfileDownloader.java",
"java/src/org/chromium/chrome/browser/signin/services/SigninHelper.java",
"java/src/org/chromium/chrome/browser/signin/services/SigninManager.java",
"java/src/org/chromium/chrome/browser/signin/services/SigninMetricsUtils.java",
"java/src/org/chromium/chrome/browser/signin/services/SigninPreferencesManager.java",
......@@ -28,6 +29,7 @@ android_library("java") {
]
deps = [
":java_resources",
"$google_play_services_package:google_play_services_auth_base_java",
"//base:base_java",
"//base:jni_java",
"//chrome/browser/preferences: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 android.accounts.Account;
import android.content.Context;
......@@ -19,9 +19,6 @@ import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.TraceEvent;
import org.chromium.base.task.AsyncTask;
import org.chromium.chrome.browser.signin.services.SigninManager;
import org.chromium.chrome.browser.signin.services.SigninManager.SignInCallback;
import org.chromium.chrome.browser.signin.services.SigninPreferencesManager;
import org.chromium.components.signin.AccountManagerFacadeProvider;
import org.chromium.components.signin.AccountTrackerService;
import org.chromium.components.signin.AccountUtils;
......@@ -56,11 +53,10 @@ public class SigninHelper implements ApplicationStatus.ApplicationStateListener
public static final class SystemAccountChangeEventChecker
implements SigninHelper.AccountChangeEventChecker {
@Override
public List<String> getAccountChangeEvents(
Context context, int index, String accountName) {
public List<String> getAccountChangeEvents(Context context, int index, String accountName) {
try {
List<AccountChangeEvent> list = GoogleAuthUtil.getAccountChangeEvents(
context, index, accountName);
List<AccountChangeEvent> list =
GoogleAuthUtil.getAccountChangeEvents(context, index, accountName);
List<String> result = new ArrayList<>(list.size());
for (AccountChangeEvent e : list) {
if (e.getChangeType() == GoogleAuthUtil.CHANGE_TYPE_ACCOUNT_RENAMED_TO) {
......@@ -89,7 +85,7 @@ public class SigninHelper implements ApplicationStatus.ApplicationStateListener
* Please use SigninHelperProvider to get SigninHelper instance instead of creating it
* manually.
*/
SigninHelper(SigninManager signinManager, AccountTrackerService accountTrackerService,
public SigninHelper(SigninManager signinManager, AccountTrackerService accountTrackerService,
SigninPreferencesManager signinPreferencesManager) {
mSigninManager = signinManager;
mAccountTrackerService = accountTrackerService;
......@@ -192,7 +188,7 @@ public class SigninHelper implements ApplicationStatus.ApplicationStateListener
final Account account = AccountUtils.createAccountFromName(newName);
mSigninManager.signinAndEnableSync(
SigninAccessPoint.ACCOUNT_RENAMED, account, new SignInCallback() {
SigninAccessPoint.ACCOUNT_RENAMED, account, new SigninManager.SignInCallback() {
@Override
public void onSignInComplete() {
validateAccountsInternal(true);
......
......@@ -6,7 +6,7 @@ package org.chromium.chrome.test.util.browser.signin;
import android.content.Context;
import org.chromium.chrome.browser.signin.SigninHelper;
import org.chromium.chrome.browser.signin.services.SigninHelper;
import java.util.ArrayList;
import java.util.HashMap;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment