Creating pending credentials in NewPasswordFormManager.

This Cl copies and adapts creating pending credentials from
PasswordFormManager to NewPasswordFormManager. No changes in logic.

Creating of pending credentials is the step in implementing of saving
in NewPasswordFormManager. Next steps will be to implement Save() and
Update() methods.

Bug: 831123
Change-Id: I2a7f24c85e46ecd1474f99cf26c9b5136fe2ae9d
Reviewed-on: https://chromium-review.googlesource.com/1148393
Commit-Queue: Vadym Doroshenko <dvadym@chromium.org>
Reviewed-by: Vaclav Brozek <vabr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578582}

components/password_manager/core/browser/new_password_form_manager.h

@@ -18,6 +18,8 @@
 #include "components/password_manager/core/browser/form_fetcher.h"
 #include "components/password_manager/core/browser/form_parsing/password_field_prediction.h"
 #include "components/password_manager/core/browser/password_form_manager_for_ui.h"
+#include "components/password_manager/core/browser/password_form_user_action.h"
+#include "components/password_manager/core/browser/votes_uploader.h"
 
 namespace autofill {
 class FormStructure;
@@ -116,6 +118,37 @@ class NewPasswordFormManager : public PasswordFormManagerForUI,
   // the autofill server responding to the lookup request.
   void ReportTimeBetweenStoreAndServerUMA();
 
+  // Create pending credentials from |submitted_form_| and forms received from
+  // the password store.
+  void CreatePendingCredentials();
+
+  // Create pending credentials from provisionally saved form when this form
+  // represents credentials that were not previosly saved.
+  void CreatePendingCredentialsForNewCredentials(
+      const autofill::PasswordForm& submitted_password_form,
+      const base::string16& password_element);
+
+  // If |best_matches_| contains only one entry, then return this entry.
+  // Otherwise for empty |password| return nullptr and for non-empty |password|
+  // returns the any entry in |best_matches_| with the same password, if it
+  // exists, and nullptr otherwise.
+  const autofill::PasswordForm* FindBestMatchForUpdatePassword(
+      const base::string16& password) const;
+
+  // Try to return a member of |best_matches_| which is most likely to represent
+  // the same credential as |form|. Return null if there is none. This is used
+  // to tell whether the user submitted a credential filled by Chrome.
+  const autofill::PasswordForm* FindBestSavedMatch(
+      const autofill::PasswordForm* form) const;
+
+  // Sets |user_action_| and records some metrics.
+  void SetUserAction(UserAction user_action);
+
+  void SetPasswordOverridden(bool password_overridden) {
+    password_overridden_ = password_overridden;
+    votes_uploader_.set_password_overridden(password_overridden);
+  }
+
   // The client which implements embedder-specific PasswordManager operations.
   PasswordManagerClient* client_;
 
@@ -128,6 +161,13 @@ class NewPasswordFormManager : public PasswordFormManagerForUI,
   // by |form_fetcher_|.
   std::map<base::string16, const autofill::PasswordForm*> best_matches_;
 
+  // Set of forms from PasswordStore that correspond to the current site and
+  // that are not in |best_matches_|. They are owned by |form_fetcher_|.
+  // It is leftover from the old PasswordFormManager.
+  // TODO(https://crbug.com/831123): update all places where it is used with
+  // saved credentials from |form_fetcher_|.
+  std::vector<const autofill::PasswordForm*> not_best_matches_;
+
   // Set of blacklisted forms from the PasswordStore that best match the current
   // form. They are owned by |form_fetcher_|.
   std::vector<const autofill::PasswordForm*> blacklisted_matches_;
@@ -136,7 +176,7 @@ class NewPasswordFormManager : public PasswordFormManagerForUI,
   // as preferred. This is only allowed to be null if there are no best matches
   // at all, since there will always be one preferred login when there are
   // multiple matches (when first saved, a login is marked preferred).
-  const autofill::PasswordForm* preferred_match_;
+  const autofill::PasswordForm* preferred_match_ = nullptr;
 
   // Takes care of recording metrics and events for |*this|.
   scoped_refptr<PasswordFormMetricsRecorder> metrics_recorder_;
@@ -147,11 +187,40 @@ class NewPasswordFormManager : public PasswordFormManagerForUI,
   // FormFetcher instance which owns the login data from PasswordStore.
   FormFetcher* form_fetcher_;
 
+  VotesUploader votes_uploader_;
+
   // |is_submitted_| = true means that a submission of the managed form was seen
   // and then |submitted_form_| contains the submitted form.
   bool is_submitted_ = false;
   autofill::FormData submitted_form_;
 
+  // Stores updated credentials when the form was submitted but success is still
+  // unknown. This variable contains credentials that are ready to be written
+  // (saved or updated) to a password store. It is calculated based on
+  // |submitted_form_| and |best_matches_|.
+  autofill::PasswordForm pending_credentials_;
+
+  // Whether |pending_credentials_| stores a new login or is an update to an
+  // existing one.
+  bool is_new_login_ = true;
+
+  // Whether this form has an auto generated password.
+  bool has_generated_password_ = false;
+
+  // Whether the saved password was overridden.
+  bool password_overridden_ = false;
+
+  // A form is considered to be "retry" password if it has only one field which
+  // is a current password field.
+  // This variable is true if the password passed through ProvisionallySave() is
+  // a password that is not part of any password form stored for this origin
+  // and it was entered on a retry password form.
+  bool retry_password_form_password_update_ = false;
+
+  // Records the action the user has taken while interacting with the password
+  // form.
+  UserAction user_action_ = UserAction::kNone;
+
   base::Optional<FormPredictions> predictions_;
 
   // True when the managed form was already filled.

components/password_manager/core/browser/password_form_manager.h

@@ -293,8 +293,8 @@ class PasswordFormManager : public PasswordFormManagerForUI,
   bool UpdatePendingCredentialsIfUsernameChanged(
       const autofill::PasswordForm& form);
 
-  // Create pending credentials from provisionally saved form and forms received
-  // from password store.
+  // Create pending credentials from |submitted_form_| and forms received from
+  // the password store.
   void CreatePendingCredentials();
 
   // Create pending credentials from provisionally saved form when this form