Rename PrepareSyncPasswordHashData to PreparePasswordHashData

Since now we need to prepare password hash for both sync, other gaia
and enterprise passwords, we should rename the function as
PasswordStore::PreparePasswordHashData(..) and don't gate on empty
sync username.

Also fix minor UMA logging issue in
PasswordStore::SaveProtectedPasswordHashImpl

Bug: 830998
Change-Id: I26cb613babcdd0268785e61b52c021aa9f343cb5
Reviewed-on: https://chromium-review.googlesource.com/1112586Reviewed-by: Vadym Doroshenko <dvadym@chromium.org>
Commit-Queue: Jialiu Lin <jialiul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570099}

chrome/browser/password_manager/password_store_factory.cc

@@ -271,10 +271,8 @@ PasswordStoreFactory::BuildServiceInstanceFor(
   }
 
 #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
-  // Prepare sync password hash data for reuse detection.
-  std::string sync_username = GetSyncUsername(profile);
-  if (!sync_username.empty())
-    ps->PrepareSyncPasswordHashData(sync_username);
+  // Prepare password hash data for reuse detection.
+  ps->PreparePasswordHashData(GetSyncUsername(profile));
 #endif
 
   // TODO(https://crbug.com/817754): remove the code once majority of the users

components/password_manager/core/browser/password_store.cc

@@ -361,11 +361,11 @@ void PasswordStore::CheckReuse(const base::string16& input,
 #endif
 
 #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
-void PasswordStore::PrepareSyncPasswordHashData(
-    const std::string& sync_username) {
+void PasswordStore::PreparePasswordHashData(const std::string& sync_username) {
   // TODO(crbug.com/841438): Delete migration code when most users complete
   // the migration.
-  hash_password_manager_.MaybeMigrateExistingSyncPasswordHash(sync_username);
+  if (!sync_username.empty())
+    hash_password_manager_.MaybeMigrateExistingSyncPasswordHash(sync_username);
   SchedulePasswordHashUpdate(/*should_log_metrics=*/true);
   ScheduleEnterprisePasswordURLUpdate();
 }
@@ -560,8 +560,11 @@ void PasswordStore::SaveProtectedPasswordHashImpl(
     else
       enterprise_password_hash_list.push_back(std::move(password_hash));
   }
-  metrics_util::LogProtectedPasswordHashCounts(
-      gaia_password_hash_list.size(), enterprise_password_hash_list.size());
+
+  if (should_log_metrics) {
+    metrics_util::LogProtectedPasswordHashCounts(
+        gaia_password_hash_list.size(), enterprise_password_hash_list.size());
+  }
   reuse_detector_->UseGaiaPasswordHash(std::move(gaia_password_hash_list));
   reuse_detector_->UseNonGaiaEnterprisePasswordHash(
       std::move(enterprise_password_hash_list));

components/password_manager/core/browser/password_store.h

@@ -256,9 +256,9 @@ class PasswordStore : protected PasswordStoreSync,
 
 // TODO(crbug.com/706392): Fix password reuse detection for Android.
 #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
-  // Immediately called after |Init()| to retrieve sync password hash data for
+  // Immediately called after |Init()| to retrieve password hash data for
   // reuse detection.
-  void PrepareSyncPasswordHashData(const std::string& sync_username);
+  void PreparePasswordHashData(const std::string& sync_username);
 
   // Checks that some suffix of |input| equals to a password saved on another
   // registry controlled domain than |domain|.