[Signin] Remove PrimaryAccountManager::HasUnconsentedPrimaryAccount

Replaces existing calls to
PrimaryAccountManager::HasUnconsentedPrimaryAccount with
HasPrimaryAccount(ConsentLevel::kNotRequired) and removes the method.

Bug: 2440621
Change-Id: Icacc73e23d7165e523d463d03967f9c5f71c9247
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2450019
Auto-Submit: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: David Roger <droger@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814605}

components/signin/internal/identity_manager/primary_account_manager.cc

@@ -149,10 +149,6 @@ CoreAccountInfo PrimaryAccountManager::GetUnconsentedPrimaryAccountInfo()
   return primary_account_info();
 }
 
-bool PrimaryAccountManager::HasUnconsentedPrimaryAccount() const {
-  return !primary_account_info().account_id.empty();
-}
-
 void PrimaryAccountManager::SetUnconsentedPrimaryAccountInfo(
     CoreAccountInfo account_info) {
   if (HasPrimaryAccount(signin::ConsentLevel::kSync)) {

components/signin/internal/identity_manager/primary_account_manager.h

@@ -158,9 +158,6 @@ class PrimaryAccountManager : public ProfileOAuth2TokenServiceObserver {
   // account. Returns an empty info, if there is no such account.
   CoreAccountInfo GetUnconsentedPrimaryAccountInfo() const;
 
-  // Returns whether the user's unconsented primary account is available.
-  bool HasUnconsentedPrimaryAccount() const;
-
   // Sets the unconsented primary account. The unconsented primary account can
   // only be changed if the user is not authenticated. If the user is
   // authenticated, use Signout() instead.

components/signin/internal/identity_manager/primary_account_manager_unittest.cc

@@ -273,12 +273,12 @@ TEST_F(PrimaryAccountManagerTest, UnconsentedSignOutWhileProhibited) {
   CoreAccountId account_id = AddToAccountTracker("gaia_id", "user@gmail.com");
   CoreAccountInfo account_info = account_tracker()->GetAccountInfo(account_id);
   manager_->SetUnconsentedPrimaryAccountInfo(account_info);
-  EXPECT_TRUE(manager_->HasUnconsentedPrimaryAccount());
+  EXPECT_TRUE(manager_->HasPrimaryAccount(ConsentLevel::kNotRequired));
   EXPECT_FALSE(manager_->HasPrimaryAccount(ConsentLevel::kSync));
   signin_client()->set_is_signout_allowed(false);
   manager_->SignOut(signin_metrics::SIGNOUT_TEST,
                     signin_metrics::SignoutDelete::IGNORE_METRIC);
-  EXPECT_FALSE(manager_->HasUnconsentedPrimaryAccount());
+  EXPECT_FALSE(manager_->HasPrimaryAccount(ConsentLevel::kNotRequired));
 }
 
 TEST_F(PrimaryAccountManagerTest, ProhibitedAtStartup) {
@@ -511,7 +511,7 @@ TEST_F(PrimaryAccountManagerTest, RevokeSyncConsent) {
 
   manager_->RevokeSyncConsent();
   EXPECT_FALSE(manager_->HasPrimaryAccount(ConsentLevel::kSync));
-  EXPECT_TRUE(manager_->HasUnconsentedPrimaryAccount());
+  EXPECT_TRUE(manager_->HasPrimaryAccount(ConsentLevel::kNotRequired));
   EXPECT_EQ(account_id,
             manager_->GetUnconsentedPrimaryAccountInfo().account_id);
 }

components/signin/internal/identity_manager/primary_account_mutator_impl.cc

@@ -56,7 +56,8 @@ void PrimaryAccountMutatorImpl::SetUnconsentedPrimaryAccount(
 #if defined(OS_CHROMEOS)
   // On Chrome OS the UPA can only be set once and never removed or changed.
   DCHECK(!account_id.empty());
-  DCHECK(!primary_account_manager_->HasUnconsentedPrimaryAccount());
+  DCHECK(
+      !primary_account_manager_->HasPrimaryAccount(ConsentLevel::kNotRequired));
 #endif
   AccountInfo account_info;
   if (!account_id.empty()) {
@@ -78,7 +79,7 @@ bool PrimaryAccountMutatorImpl::ClearPrimaryAccount(
     ClearAccountsAction action,
     signin_metrics::ProfileSignout source_metric,
     signin_metrics::SignoutDelete delete_metric) {
-  if (!primary_account_manager_->HasUnconsentedPrimaryAccount())
+  if (!primary_account_manager_->HasPrimaryAccount(ConsentLevel::kNotRequired))
     return false;
 
   switch (action) {