Convert c/b/profiles/, c/b/safe_browsing/ to OnPrimaryAccountChanged()

Methods OnUnconsentedPrimaryAccountChanged is deprecated, so this CL
changes the chrome/browser/profiles/* and c/b/safe_browsing/* to
override the method OnPrimaryAccountChanged().

Bug: 1163126
Change-Id: I0dbabb38085373cf44de5f7273812d4f44fe7969
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611091Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840655}

chrome/browser/profiles/gaia_info_update_service.cc

@@ -155,12 +155,17 @@ void GAIAInfoUpdateService::Shutdown() {
   identity_manager_->RemoveObserver(this);
 }
 
-void GAIAInfoUpdateService::OnUnconsentedPrimaryAccountChanged(
-    const CoreAccountInfo& unconsented_primary_account_info) {
-  if (unconsented_primary_account_info.gaia.empty()) {
-    ClearProfileEntry();
-  } else {
+void GAIAInfoUpdateService::OnPrimaryAccountChanged(
+    const signin::PrimaryAccountChangeEvent& event) {
+  switch (event.GetEventTypeFor(signin::ConsentLevel::kNotRequired)) {
+    case signin::PrimaryAccountChangeEvent::Type::kSet:
       UpdatePrimaryAccount();
+      break;
+    case signin::PrimaryAccountChangeEvent::Type::kCleared:
+      ClearProfileEntry();
+      break;
+    case signin::PrimaryAccountChangeEvent::Type::kNone:
+      break;
   }
 }
 

chrome/browser/profiles/gaia_info_update_service.h

@@ -48,8 +48,8 @@ class GAIAInfoUpdateService : public KeyedService,
   void UpdateAnyAccount(const AccountInfo& info);
 
   // Overridden from signin::IdentityManager::Observer:
-  void OnUnconsentedPrimaryAccountChanged(
-      const CoreAccountInfo& unconsented_primary_account_info) override;
+  void OnPrimaryAccountChanged(
+      const signin::PrimaryAccountChangeEvent& event) override;
   void OnExtendedAccountInfoUpdated(const AccountInfo& info) override;
   void OnAccountsInCookieUpdated(
       const signin::AccountsInCookieJarInfo& accounts_in_cookie_jar_info,

chrome/browser/safe_browsing/advanced_protection_status_manager.cc

@@ -123,14 +123,24 @@ void AdvancedProtectionStatusManager::OnExtendedAccountInfoRemoved(
   }
 }
 
-void AdvancedProtectionStatusManager::OnUnconsentedPrimaryAccountChanged(
-    const CoreAccountInfo& account_info) {
-  // TODO(crbug.com/926204): remove IdentityManager ensures that primary account
-  // always has valid refresh token when it is set.
-  if (account_info.is_under_advanced_protection)
+void AdvancedProtectionStatusManager::OnPrimaryAccountChanged(
+    const signin::PrimaryAccountChangeEvent& event) {
+  switch (event.GetEventTypeFor(signin::ConsentLevel::kNotRequired)) {
+    case signin::PrimaryAccountChangeEvent::Type::kSet: {
+      // TODO(crbug.com/926204): remove IdentityManager ensures that primary
+      // account always has valid refresh token when it is set.
+      if (event.GetCurrentState().primary_account.is_under_advanced_protection)
         OnAdvancedProtectionEnabled();
       else
         OnAdvancedProtectionDisabled();
+      break;
+    }
+    case signin::PrimaryAccountChangeEvent::Type::kCleared:
+      OnAdvancedProtectionDisabled();
+      break;
+    case signin::PrimaryAccountChangeEvent::Type::kNone:
+      break;
+  }
 }
 
 void AdvancedProtectionStatusManager::OnAdvancedProtectionEnabled() {

chrome/browser/safe_browsing/advanced_protection_status_manager.h

@@ -85,8 +85,8 @@ class AdvancedProtectionStatusManager
   void UnsubscribeFromSigninEvents();
 
   // IdentityManager::Observer implementations.
-  void OnUnconsentedPrimaryAccountChanged(
-      const CoreAccountInfo& account_info) override;
+  void OnPrimaryAccountChanged(
+      const signin::PrimaryAccountChangeEvent& event) override;
   void OnExtendedAccountInfoUpdated(const AccountInfo& info) override;
   void OnExtendedAccountInfoRemoved(const AccountInfo& info) override;