[Password Manager] Improve signature of PasswordManagerClient::IsPasswordSyncEnabled

chrome/browser/password_manager/chrome_password_manager_client.cc

Index: chrome/browser/password_manager/chrome_password_manager_client.cc
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index 3e90c9cf344b6d4e6d0eee082b24b06617413cc7..371752895becf0b4ac0e5e06cedc92837e772380 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -82,8 +82,8 @@ void ReportMetrics(bool password_manager_enabled,
   // May be null in tests.
   if (store) {
     store->ReportMetrics(client->GetSyncUsername(),
-                         client->IsPasswordSyncEnabled(
-                             password_manager::ONLY_CUSTOM_PASSPHRASE));
+                         client->GetPasswordSyncState() ==
+                             password_manager::SYNCING_WITH_CUSTOM_PASSPHRASE);
   }
   UMA_HISTOGRAM_BOOLEAN("PasswordManager.Enabled", password_manager_enabled);
 }
@@ -305,20 +305,18 @@ ChromePasswordManagerClient::GetPasswordStore() const {
              profile_, ServiceAccessType::EXPLICIT_ACCESS).get();
 }
 
-bool ChromePasswordManagerClient::IsPasswordSyncEnabled(
-    password_manager::CustomPassphraseState state) const {
+password_manager::PasswordSyncState
+ChromePasswordManagerClient::GetPasswordSyncState() const {
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   if (sync_service && sync_service->HasSyncSetupCompleted() &&
       sync_service->SyncActive() &&
       sync_service->GetActiveDataTypes().Has(syncer::PASSWORDS)) {
-    if (sync_service->IsUsingSecondaryPassphrase()) {
-      return state == password_manager::ONLY_CUSTOM_PASSPHRASE;
-    } else {
-      return state == password_manager::WITHOUT_CUSTOM_PASSPHRASE;
-    }
+    return sync_service->IsUsingSecondaryPassphrase()
+               ? password_manager::SYNCING_WITH_CUSTOM_PASSPHRASE
+               : password_manager::SYNCING_NORMAL_ENCRYPTION;
   }
-  return false;
+  return password_manager::NOT_SYNCING_PASSWORDS;
 }
 
 void ChromePasswordManagerClient::OnLogRouterAvailabilityChanged(