Clean Obsolete HTTP Data from the Password Store

components/password_manager/core/browser/credential_manager_pending_request_task.cc

Index: components/password_manager/core/browser/credential_manager_pending_request_task.cc
diff --git a/components/password_manager/core/browser/credential_manager_pending_request_task.cc b/components/password_manager/core/browser/credential_manager_pending_request_task.cc
index 63c79bb0a5c1991f5cd2c98e7263994ed10f0f59..71b7400b6e756fd9160a693f95227786e2396ea0 100644
--- a/components/password_manager/core/browser/credential_manager_pending_request_task.cc
+++ b/components/password_manager/core/browser/credential_manager_pending_request_task.cc
@@ -132,10 +132,14 @@ CredentialManagerPendingRequestTask::~CredentialManagerPendingRequestTask() =
 void CredentialManagerPendingRequestTask::OnGetPasswordStoreResults(
     std::vector<std::unique_ptr<autofill::PasswordForm>> results) {
   if (results.empty()) {
+    const auto migration_mode =
+        delegate_->client()->IsHSTSActiveForHost(origin_)
+            ? HttpPasswordMigrator::MigrationMode::MOVE
+            : HttpPasswordMigrator::MigrationMode::COPY;
+
     // Try to migrate the HTTP passwords and process them later.
     http_migrator_ = base::MakeUnique<HttpPasswordMigrator>(
-        origin_, HttpPasswordMigrator::MigrationMode::COPY,
-        delegate_->client()->GetPasswordStore(), this);
+        origin_, migration_mode, delegate_->client()->GetPasswordStore(), this);
     return;
   }
   ProcessForms(std::move(results));