[Android][Signin] Use consistent name for account email variable

This CL changes the current variable name accountId to accountEmail so
that we can have a consistent name for account email.

Bug: 1131344
Change-Id: I652755e7485673d6611622f5bd60aceda5d849ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2550827Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829639}

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderCoordinator.java

@@ -114,8 +114,8 @@ public class AssistantHeaderCoordinator implements ProfileDataCache.Observer {
     }
 
     @Override
-    public void onProfileDataUpdated(String account) {
-        if (!mSignedInAccountName.equals(account)) {
+    public void onProfileDataUpdated(String accountEmail) {
+        if (!mSignedInAccountName.equals(accountEmail)) {
             return;
         }
         setProfileImageFor(mSignedInAccountName);

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java

@@ -257,7 +257,7 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
 
     // ProfileDataCache.Observer implementation.
     @Override
-    public void onProfileDataUpdated(String accountId) {
+    public void onProfileDataUpdated(String accountEmail) {
         triggerPromoUpdate();
     }
 

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

@@ -67,8 +67,8 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac
     // ProfileDataCache.Observer:
 
     @Override
-    public void onProfileDataUpdated(String accountId) {
-        if (!mWaitingOnOwnerInfo || !TextUtils.equals(accountId, getOwnerEmail())) {
+    public void onProfileDataUpdated(String accountEmail) {
+        if (!mWaitingOnOwnerInfo || !TextUtils.equals(accountEmail, getOwnerEmail())) {
             return;
         }
 

chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java

@@ -412,7 +412,7 @@ public class RecentTabsManager implements AndroidSyncSettingsObserver, SignInSta
 
     // ProfileDataCache.Observer implementation.
     @Override
-    public void onProfileDataUpdated(String accountId) {
+    public void onProfileDataUpdated(String accountEmail) {
         update();
     }
 

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java

@@ -271,7 +271,7 @@ public abstract class SignInPromo extends OptionalLeaf {
 
         // ProfileDataCache.Observer implementation.
         @Override
-        public void onProfileDataUpdated(String accountId) {
+        public void onProfileDataUpdated(String accountEmail) {
             notifyDataChanged();
         }
     }

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

@@ -53,9 +53,9 @@ public class ProfileDataCache implements ProfileDownloader.Observer, ProfileData
     public interface Observer {
         /**
          * Notifies that an account's profile data has been updated.
-         * @param accountId An account ID.
+         * @param accountEmail An account email.
          */
-        void onProfileDataUpdated(String accountId);
+        void onProfileDataUpdated(String accountEmail);
     }
 
     /**
@@ -162,7 +162,6 @@ public class ProfileDataCache implements ProfileDownloader.Observer, ProfileData
      * @param badgeResId Resource id of the badge to be attached. If it is 0 then no badge is
      *         attached
      */
-    @MainThread
     public void updateBadgeConfig(@DrawableRes int badgeResId) {
         ThreadUtils.assertOnUiThread();
         assert mBadgeConfig != null;
@@ -243,21 +242,21 @@ public class ProfileDataCache implements ProfileDownloader.Observer, ProfileData
     }
 
     @Override
-    public void onProfileDownloaded(String accountId, String fullName, String givenName,
-            Bitmap bitmap) {
+    public void onProfileDownloaded(
+            String accountEmail, String fullName, String givenName, Bitmap bitmap) {
         ThreadUtils.assertOnUiThread();
         updateCachedProfileDataAndNotifyObservers(new DisplayableProfileData(
-                accountId, prepareAvatar(bitmap, accountId), fullName, givenName));
+                accountEmail, prepareAvatar(bitmap, accountEmail), fullName, givenName));
     }
 
     @Override
-    public void onProfileDataUpdated(String accountId) {
+    public void onProfileDataUpdated(String accountEmail) {
         assert mProfileDataSource != null;
         ProfileDataSource.ProfileData profileData =
-                mProfileDataSource.getProfileDataForAccount(accountId);
+                mProfileDataSource.getProfileDataForAccount(accountEmail);
         if (profileData == null) {
-            mCachedProfileData.remove(accountId);
-            notifyObservers(accountId);
+            mCachedProfileData.remove(accountEmail);
+            notifyObservers(accountEmail);
         } else {
             updateCachedProfileDataAndNotifyObservers(createDisplayableProfileData(profileData));
         }

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

@@ -30,13 +30,13 @@ public class ProfileDownloader {
     public interface Observer {
         /**
          * Notifies that an account data in the profile has been updated.
-         * @param accountId An account ID.
+         * @param accountEmail An account email.
          * @param fullName A full name.
          * @param givenName A given name.
          * @param bitmap A user picture.
          */
         void onProfileDownloaded(
-                String accountId, String fullName, String givenName, Bitmap bitmap);
+                String accountEmail, String fullName, String givenName, Bitmap bitmap);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java

@@ -400,7 +400,7 @@ public class AccountManagementFragment extends PreferenceFragmentCompat
 
     // ProfileDataCache.Observer implementation:
     @Override
-    public void onProfileDataUpdated(String accountId) {
+    public void onProfileDataUpdated(String accountEmail) {
         updateAccountsList();
     }
 

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java

@@ -253,7 +253,7 @@ public class SignInPreference
 
     // ProfileDataCache.Observer implementation.
     @Override
-    public void onProfileDataUpdated(String accountId) {
+    public void onProfileDataUpdated(String accountEmail) {
         update();
     }
 

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncErrorCardPreference.java

@@ -184,7 +184,7 @@ public class SyncErrorCardPreference extends Preference
      * {@link ProfileDataCache.Observer} implementation.
      */
     @Override
-    public void onProfileDataUpdated(String accountId) {
+    public void onProfileDataUpdated(String accountEmail) {
         update();
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncPromoPreference.java

@@ -213,7 +213,7 @@ public class SyncPromoPreference
 
     // ProfileDataCache.Observer implementation.
     @Override
-    public void onProfileDataUpdated(String accountId) {
+    public void onProfileDataUpdated(String accountEmail) {
         update();
     }
 

components/signin/core/browser/android/java/src/org/chromium/components/signin/ProfileDataSource.java

@@ -71,9 +71,9 @@ public interface ProfileDataSource {
     interface Observer {
         /**
          * Notifies that an account's profile data has been updated.
-         * @param accountId An account ID.
+         * @param accountEmail An account email.
          */
-        void onProfileDataUpdated(String accountId);
+        void onProfileDataUpdated(String accountEmail);
     }
 
     /**