[Signin][Android] Remove ChromeSigninController from PickerAdapter

This CL replaces ChromeSigninController in PickerAdapter by
IdentityManager.

Bug: 1049548
Change-Id: If3523863144cb37b807406b87abb5db2ace89fb5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2084556Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746818}

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/PickerAdapter.java

@@ -23,9 +23,10 @@ import androidx.annotation.VisibleForTesting;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.signin.DisplayableProfileData;
+import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.ProfileDataCache;
 import org.chromium.components.signin.AccountManagerFacade;
-import org.chromium.components.signin.ChromeSigninController;
+import org.chromium.components.signin.base.CoreAccountInfo;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -438,10 +439,10 @@ public class PickerAdapter extends Adapter<RecyclerView.ViewHolder>
     private String getOwnerEmail() {
         if (sTestOwnerEmail != null) return sTestOwnerEmail;
 
-        ChromeSigninController controller = ChromeSigninController.get();
-        Account account = controller.getSignedInUser();
-        if (account != null) {
-            return account.name;
+        CoreAccountInfo coreAccountInfo =
+                IdentityServicesProvider.get().getIdentityManager().getPrimaryAccountInfo();
+        if (coreAccountInfo != null) {
+            return coreAccountInfo.getEmail();
         }
 
         AccountManagerFacade manager = AccountManagerFacade.get();
@@ -504,8 +505,8 @@ public class PickerAdapter extends Adapter<RecyclerView.ViewHolder>
         DisplayableProfileData profileData = mProfileDataCache.getProfileDataOrDefault(ownerEmail);
         String name = profileData.getFullNameOrEmail();
         if (TextUtils.isEmpty(name) || TextUtils.equals(name, ownerEmail)) {
-            ChromeSigninController controller = ChromeSigninController.get();
-            name = controller.getSignedInAccountName();
+            name = CoreAccountInfo.getEmailFrom(
+                    IdentityServicesProvider.get().getIdentityManager().getPrimaryAccountInfo());
         }
 
         ArrayList<String> telephones = new ArrayList<>();