Merge to branch 2171 [Password Generation] Fix a bug where we always upload ACCOUNT_CREATION_PASSWO…

components/password_manager/core/browser/password_form_manager.cc

Index: components/password_manager/core/browser/password_form_manager.cc
diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc
index 59eff7cc5235d839e224c9b1fa90916d4553389f..5bd25b61e3330690e346462d51e8b0a7267bf3c7 100644
--- a/components/password_manager/core/browser/password_form_manager.cc
+++ b/components/password_manager/core/browser/password_form_manager.cc
@@ -730,8 +730,7 @@ void PasswordFormManager::UploadPasswordForm(
   // Note that this doesn't guarantee that the upload succeeded, only that
   // |form_data| is considered uploadable.
   bool success =
-      autofill_manager->UploadPasswordForm(
-          form_data, autofill::ACCOUNT_CREATION_PASSWORD);
+      autofill_manager->UploadPasswordForm(form_data, password_type);
   UMA_HISTOGRAM_BOOLEAN("PasswordGeneration.UploadStarted", success);
 }