[Password Generation] Send votes about confirmation fields

components/password_manager/core/browser/password_form_manager.h

Index: components/password_manager/core/browser/password_form_manager.h
diff --git a/components/password_manager/core/browser/password_form_manager.h b/components/password_manager/core/browser/password_form_manager.h
index 6f599b6e7a1245e6f6ede01a61cd74cdcdacbb6d..7b312eb45024bce65daddc5bb9a505d7068cc507 100644
--- a/components/password_manager/core/browser/password_form_manager.h
+++ b/components/password_manager/core/browser/password_form_manager.h
@@ -33,6 +33,9 @@ class FormSaver;
 class PasswordManager;
 class PasswordManagerClient;
 
+// A map from field names to field types.
+using FieldTypeMap = std::map<base::string16, autofill::ServerFieldType>;
+
 // This class helps with filling the observed form (both HTML and from HTTP
 // auth) and with saving/updating the stored information about it.
 class PasswordFormManager : public FormFetcher::Consumer {
@@ -369,8 +372,7 @@ class PasswordFormManager : public FormFetcher::Consumer {
 
   // Tries to set all votes (e.g. autofill field types, generation vote) to
   // a |FormStructure| and upload it to the server. Returns true on success.
-  bool UploadPasswordVote(const base::string16& username_field,
-                          const autofill::ServerFieldType& password_type,
+  bool UploadPasswordVote(const autofill::ServerFieldType& password_type,
                           const std::string& login_form_signature);
 
   // Adds a vote on password generation usage to |form_structure|.
@@ -422,26 +424,6 @@ class PasswordFormManager : public FormFetcher::Consumer {
   base::Optional<autofill::PasswordForm> UpdatePendingAndGetOldKey(
       std::vector<autofill::PasswordForm>* credentials_to_update);
 
-  // Sets autofill types of username, password and new password fields in
-  // |form_structure|. |password_type| (the autofill type of new password field)
-  // should be equal to NEW_PASSWORD, PROBABLY_NEW_PASSWORD or NOT_NEW_PASSWORD.
-  // These values correspond to cases when the user confirmed password update,
-  // did nothing or declined to update password respectively. The function also
-  // add the types to |available_field_types|.
-  void SetAutofillTypesOnUpdate(
-      const autofill::ServerFieldType password_type,
-      FormStructure* form_structure,
-      autofill::ServerFieldTypeSet* available_field_types);
-
-  // Sets autofill types of username and password fields in |form_structure|.
-  // |username_field| determines the name of the username field. The function
-  // also add the types to |available_field_types|.
-  void SetAutofillTypesOnSave(
-      const base::string16& username_field,
-      const autofill::ServerFieldType password_type,
-      FormStructure* form_structure,
-      autofill::ServerFieldTypeSet* available_field_types);
-
   // Set of nonblacklisted PasswordForms from the DB that best match the form
   // being managed by |this|, indexed by username. They are owned by
   // |form_fetcher_|.