[Android] Refactor IdentityManager.Observer API override in

FeedSurfaceMediator and ChromeBackupWatcher

Replace IdentityManager.Observer.(onPrimaryAccountSet/Cleared) calls
with onPrimaryAccountChanged call.

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

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java

@@ -47,8 +47,8 @@ import org.chromium.components.browser_ui.widget.listmenu.ListMenuItemProperties
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.components.prefs.PrefService;
 import org.chromium.components.search_engines.TemplateUrlService.TemplateUrlServiceObserver;
-import org.chromium.components.signin.base.CoreAccountInfo;
 import org.chromium.components.signin.identitymanager.IdentityManager;
+import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent;
 import org.chromium.components.signin.metrics.SigninAccessPoint;
 import org.chromium.components.user_prefs.UserPrefs;
 import org.chromium.content_public.browser.LoadUrlParams;
@@ -639,15 +639,10 @@ public class FeedSurfaceMediator
         mCoordinator.updateHeaderViews(false, null, null);
     }
 
-    // IdentityManager.Delegate interface.
+    // IdentityManager.Observer interface.
 
     @Override
-    public void onPrimaryAccountSet(CoreAccountInfo account) {
-        updateSectionHeader();
-    }
-
-    @Override
-    public void onPrimaryAccountCleared(CoreAccountInfo account) {
+    public void onPrimaryAccountChanged(PrimaryAccountChangeEvent eventDetails) {
         updateSectionHeader();
     }
 

chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java

@@ -17,8 +17,8 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
-import org.chromium.components.signin.base.CoreAccountInfo;
 import org.chromium.components.signin.identitymanager.IdentityManager;
+import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent;
 
 /**
  * Class for watching for changes to the Android preferences that are backed up using Android
@@ -60,18 +60,12 @@ public class ChromeBackupWatcher {
         // Update the backup if the sign-in status changes.
         IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
                 Profile.getLastUsedRegularProfile());
-        identityManager.addObserver(
-                new IdentityManager.Observer() {
-                    @Override
-                    public void onPrimaryAccountSet(CoreAccountInfo account) {
-                        onBackupPrefsChanged();
-                    }
-
-                    @Override
-                    public void onPrimaryAccountCleared(CoreAccountInfo account) {
-                        onBackupPrefsChanged();
-                    }
-                });
+        identityManager.addObserver(new IdentityManager.Observer() {
+            @Override
+            public void onPrimaryAccountChanged(PrimaryAccountChangeEvent eventDetails) {
+                onBackupPrefsChanged();
+            }
+        });
     }
 
     @CalledByNative

components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/PrimaryAccountChangeEvent.java

@@ -36,10 +36,14 @@ public class PrimaryAccountChangeEvent {
     private final @Type int mEventTypeForConsentLevelNotRequired;
 
     @CalledByNative
-    public PrimaryAccountChangeEvent(
+    private PrimaryAccountChangeEvent(
             @Type int eventTypeForConsentLevelNotRequired, @Type int eventTypeForConsentLevelSync) {
         mEventTypeForConsentLevelNotRequired = eventTypeForConsentLevelNotRequired;
         mEventTypeForConsentLevelSync = eventTypeForConsentLevelSync;
+        assert mEventTypeForConsentLevelNotRequired != Type.NONE
+                || mEventTypeForConsentLevelSync
+                        != Type.NONE
+            : "PrimaryAccountChangeEvent should not be fired for no-change events";
     }
 
     /**

components/signin/public/identity_manager/primary_account_change_event.cc

@@ -103,9 +103,16 @@ base::android::ScopedJavaLocalRef<jobject>
 ConvertToJavaPrimaryAccountChangeEvent(
     JNIEnv* env,
     const PrimaryAccountChangeEvent& event_details) {
+  PrimaryAccountChangeEvent::Type event_type_not_required =
+      event_details.GetEventTypeFor(ConsentLevel::kNotRequired);
+  PrimaryAccountChangeEvent::Type event_type_sync =
+      event_details.GetEventTypeFor(ConsentLevel::kSync);
+  // Should not fire events if there is no change in primary accounts for any
+  // consent level.
+  DCHECK(event_type_not_required != PrimaryAccountChangeEvent::Type::kNone ||
+         event_type_sync != PrimaryAccountChangeEvent::Type::kNone);
   return Java_PrimaryAccountChangeEvent_Constructor(
-      env, jint(event_details.GetEventTypeFor(ConsentLevel::kNotRequired)),
-      jint(event_details.GetEventTypeFor(ConsentLevel::kSync)));
+      env, jint(event_type_not_required), jint(event_type_sync));
 }
 
 #endif  // defined(OS_ANDROID)