Convert c/b/policy/cloud/ to OnPrimaryAccountChanged()

Methods OnPrimaryAccountSet/Cleared() are deprecated, so this CL changes
the chrome/browser/password_manager/* to override the method
OnPrimaryAccountChanged().

Bug: 1163126
Change-Id: I5d3439b94ef7214debf58439c46078b70dbfc305
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611245Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
Commit-Queue: Julian Pastarmov <pastarmovj@chromium.org>
Auto-Submit: Mihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840601}

chrome/browser/policy/cloud/user_policy_signin_service.cc

@@ -98,13 +98,21 @@ void UserPolicySigninService::CallPolicyRegistrationCallback(
   std::move(callback).Run(client->dm_token(), client->client_id());
 }
 
-void UserPolicySigninService::OnPrimaryAccountSet(
-    const CoreAccountInfo& account_info) {
-  if (!identity_manager()->HasAccountWithRefreshToken(account_info.account_id))
+void UserPolicySigninService::OnPrimaryAccountChanged(
+    const signin::PrimaryAccountChangeEvent& event) {
+  UserPolicySigninServiceBase::OnPrimaryAccountChanged(event);
+
+  if (event.GetEventTypeFor(signin::ConsentLevel::kSync) !=
+      signin::PrimaryAccountChangeEvent::Type::kSet) {
     return;
+  }
 
-  // ProfileOAuth2TokenService now has a refresh token for the primary account
-  // so initialize the UserCloudPolicyManager.
+  DCHECK(identity_manager()->HasPrimaryAccount());
+  if (!identity_manager()->HasPrimaryAccountWithRefreshToken())
+    return;
+
+  // IdentityManager has a refresh token for the primary account, so initialize
+  // the UserCloudPolicyManager.
   TryInitializeForSignedInUser();
 }
 

chrome/browser/policy/cloud/user_policy_signin_service.h

@@ -51,7 +51,8 @@ class UserPolicySigninService : public UserPolicySigninServiceBase {
 
   // signin::IdentityManager::Observer implementation:
   // UserPolicySigninServiceBase is already an observer of IdentityManager.
-  void OnPrimaryAccountSet(const CoreAccountInfo& account_info) override;
+  void OnPrimaryAccountChanged(
+      const signin::PrimaryAccountChangeEvent& event_details) override;
   void OnRefreshTokenUpdatedForAccount(
       const CoreAccountInfo& account_info) override;
 

chrome/browser/policy/cloud/user_policy_signin_service_base.cc

@@ -73,9 +73,13 @@ void UserPolicySigninServiceBase::FetchPolicyForSignedInUser(
   manager->core()->service()->RefreshPolicy(std::move(callback));
 }
 
-void UserPolicySigninServiceBase::OnPrimaryAccountCleared(
-    const CoreAccountInfo& previous_primary_account_info) {
-  ShutdownUserCloudPolicyManager();
+void UserPolicySigninServiceBase::OnPrimaryAccountChanged(
+    const signin::PrimaryAccountChangeEvent& event) {
+  if (event.GetEventTypeFor(signin::ConsentLevel::kSync) ==
+      signin::PrimaryAccountChangeEvent::Type::kCleared) {
+    DCHECK(!identity_manager_->HasPrimaryAccount());
+    ShutdownUserCloudPolicyManager();
+  }
 }
 
 void UserPolicySigninServiceBase::Observe(

chrome/browser/policy/cloud/user_policy_signin_service_base.h

@@ -85,8 +85,8 @@ class UserPolicySigninServiceBase : public KeyedService,
       PolicyFetchCallback callback);
 
   // signin::IdentityManager::Observer implementation:
-  void OnPrimaryAccountCleared(
-      const CoreAccountInfo& previous_primary_account_info) override;
+  void OnPrimaryAccountChanged(
+      const signin::PrimaryAccountChangeEvent& event_details) override;
 
   // content::NotificationObserver implementation:
   void Observe(int type,