Implement password form parsing with SINGLE_USERNAME prediction.

This CL is a part of username first flow implementation. The server
sends prediction SINGLE_USERNAME for a field which is a single username
in a form (i.e. the first part of sign-in process).

This CL implements that in case of receiving SINGLE_USERNAME prediction
FormParser chooses this field as a username field, and chooses no other
fields as passwords.

Bug: 959776
Change-Id: I2d62b488c041ace1d525f5627bab8c97aa9ccd20
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1726030Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Vadym Doroshenko <dvadym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682331}

components/password_manager/core/browser/form_parsing/form_parser.cc

@@ -147,6 +147,7 @@ bool IsNotUsernameField(const ProcessedField& field) {
 bool IsPasswordPrediction(const CredentialFieldType field_type) {
   switch (field_type) {
     case CredentialFieldType::kUsername:
+    case CredentialFieldType::kSingleUsername:
     case CredentialFieldType::kNone:
       return false;
     case CredentialFieldType::kCurrentPassword:
@@ -213,6 +214,9 @@ struct SignificantFields {
   // attributes.
   bool is_new_password_reliable = false;
 
+  // True if the current form has only username, but no passwords.
+  bool is_single_username = false;
+
   // Returns true if some password field is present. This is the minimal
   // requirement for a successful creation of a PasswordForm is present.
   bool HasPasswords() const {
@@ -220,6 +224,12 @@ struct SignificantFields {
         << "There is no password to confirm if there is no new password field.";
     return password || new_password;
   }
+
+  void ClearAllPasswordFields() {
+    password = nullptr;
+    new_password = nullptr;
+    confirmation_password = nullptr;
+  }
 };
 
 // Returns true if |field| is in |significant_fields|.
@@ -284,18 +294,25 @@ void ParseUsingPredictions(std::vector<ProcessedField>* processed_fields,
       case CredentialFieldType::kUsername:
         if (!result->username) {
           processed_field = FindField(processed_fields, prediction);
-          if (processed_field) {
+          if (processed_field)
             result->username = processed_field->field;
-          }
         } else if (!second_username) {
           processed_field = FindField(processed_fields, prediction);
-          if (processed_field) {
+          if (processed_field)
             second_username = processed_field->field;
-          }
         } else {
           prevent_handling_two_usernames = true;
         }
         break;
+      case CredentialFieldType::kSingleUsername:
+        processed_field = FindField(processed_fields, prediction);
+        if (processed_field) {
+          result->username = processed_field->field;
+          result->is_single_username = true;
+          result->ClearAllPasswordFields();
+          return;
+        }
+        break;
       case CredentialFieldType::kCurrentPassword:
         if (result->password) {
           prevent_handling_two_usernames = true;
@@ -478,7 +495,8 @@ std::vector<const FormFieldData*> GetRelevantPasswords(
     if (processed_field.is_password)
       passwords.push_back(&processed_field);
   }
-  DCHECK(!passwords.empty());
+  if (passwords.empty())
+    return std::vector<const FormFieldData*>();
 
   // These two counters are used to determine the ReadonlyPasswordFields value
   // corresponding to this form.
@@ -803,8 +821,6 @@ std::vector<ProcessedField> ProcessFields(
   DCHECK(all_possible_passwords->empty());
 
   std::vector<ProcessedField> result;
-  bool password_field_found = false;
-
   result.reserve(fields.size());
 
   // |all_possible_passwords| should only contain each value once.
@@ -840,8 +856,6 @@ std::vector<ProcessedField> ProcessFields(
     ProcessedField processed_field = {
         .field = &field, .autocomplete_flag = flag, .is_password = is_password};
 
-    password_field_found |= is_password;
-
     if (field.properties_mask & FieldPropertiesFlags::USER_TYPED)
       processed_field.interactability = Interactability::kCertain;
     else if (field.is_focusable)
@@ -850,9 +864,6 @@ std::vector<ProcessedField> ProcessFields(
     result.push_back(processed_field);
   }
 
-  if (!password_field_found)
-    result.clear();
-
   return result;
 }
 
@@ -908,8 +919,10 @@ std::unique_ptr<PasswordForm> AssemblePasswordForm(
     autofill::ValueElementVector all_possible_passwords,
     autofill::ValueElementVector all_possible_usernames,
     const base::Optional<FormPredictions>& form_predictions) {
-  if (!significant_fields.HasPasswords())
+  if (!significant_fields.HasPasswords() &&
+      !significant_fields.is_single_username) {
     return nullptr;
+  }
 
   // Create the PasswordForm and set data not related to specific fields.
   auto result = std::make_unique<PasswordForm>();
@@ -970,11 +983,14 @@ std::unique_ptr<PasswordForm> FormDataParser::Parse(const FormData& form_data,
   }
 
   // (2) If that failed, try to parse with autocomplete attributes.
-  ParseUsingAutocomplete(processed_fields, &significant_fields);
-  if (username_detection_method ==
-          UsernameDetectionMethod::kNoUsernameDetected &&
-      significant_fields.username) {
-    username_detection_method = UsernameDetectionMethod::kAutocompleteAttribute;
+  if (!significant_fields.is_single_username) {
+    ParseUsingAutocomplete(processed_fields, &significant_fields);
+    if (username_detection_method ==
+            UsernameDetectionMethod::kNoUsernameDetected &&
+        significant_fields.username) {
+      username_detection_method =
+          UsernameDetectionMethod::kAutocompleteAttribute;
+    }
   }
 
   // Pass the "reliability" information to mark the new-password fields as
@@ -989,32 +1005,35 @@ std::unique_ptr<PasswordForm> FormDataParser::Parse(const FormData& form_data,
   const bool username_found_before_heuristic = significant_fields.username;
 
   // Try to parse with base heuristic.
-  Interactability username_max = Interactability::kUnlikely;
-  ParseUsingBaseHeuristics(processed_fields, mode, &significant_fields,
-                           &username_max, &readonly_status_);
-  if (username_detection_method ==
-          UsernameDetectionMethod::kNoUsernameDetected &&
-      significant_fields.username) {
-    username_detection_method = UsernameDetectionMethod::kBaseHeuristic;
-  }
+  if (!significant_fields.is_single_username) {
+    Interactability username_max = Interactability::kUnlikely;
+    ParseUsingBaseHeuristics(processed_fields, mode, &significant_fields,
+                             &username_max, &readonly_status_);
+    if (username_detection_method ==
+            UsernameDetectionMethod::kNoUsernameDetected &&
+        significant_fields.username) {
+      username_detection_method = UsernameDetectionMethod::kBaseHeuristic;
+    }
 
-  // Additionally, and based on the best interactability computed by base
-  // heuristics, try to improve the username based on the context of the
-  // fields, unless the username already came from more reliable types of
-  // analysis.
-  if (!username_found_before_heuristic) {
-    const FormFieldData* username_field_by_context = FindUsernameInPredictions(
-        form_data.username_predictions, processed_fields, username_max);
-    if (username_field_by_context &&
-        !(mode == FormDataParser::Mode::kSaving &&
-          username_field_by_context->value.empty())) {
-      significant_fields.username = username_field_by_context;
-      if (username_detection_method ==
-              UsernameDetectionMethod::kNoUsernameDetected ||
-          username_detection_method ==
-              UsernameDetectionMethod::kBaseHeuristic) {
-        username_detection_method =
-            UsernameDetectionMethod::kHtmlBasedClassifier;
+    // Additionally, and based on the best interactability computed by base
+    // heuristics, try to improve the username based on the context of the
+    // fields, unless the username already came from more reliable types of
+    // analysis.
+    if (!username_found_before_heuristic) {
+      const FormFieldData* username_field_by_context =
+          FindUsernameInPredictions(form_data.username_predictions,
+                                    processed_fields, username_max);
+      if (username_field_by_context &&
+          !(mode == FormDataParser::Mode::kSaving &&
+            username_field_by_context->value.empty())) {
+        significant_fields.username = username_field_by_context;
+        if (username_detection_method ==
+                UsernameDetectionMethod::kNoUsernameDetected ||
+            username_detection_method ==
+                UsernameDetectionMethod::kBaseHeuristic) {
+          username_detection_method =
+              UsernameDetectionMethod::kHtmlBasedClassifier;
+        }
       }
     }
   }

components/password_manager/core/browser/form_parsing/form_parser_unittest.cc

@@ -2096,6 +2096,21 @@ TEST(FormParserTest, ContradictingPasswordPredictionAndAutocomplete) {
                     .autocomplete_attribute = "new-password"}}}});
 }
 
+TEST(FormParserTest, SingleUsernamePrediction) {
+  CheckTestData({
+      {"1 field",
+       {{.role = ElementRole::USERNAME,
+         .form_control_type = "text",
+         .prediction = {.type = autofill::SINGLE_USERNAME}}}},
+      {"Password field is ignored",
+       {{.role = ElementRole::USERNAME,
+         .form_control_type = "text",
+         .prediction = {.type = autofill::SINGLE_USERNAME}},
+        {.form_control_type = "password",
+         .prediction = {.type = autofill::PASSWORD}}}},
+  });
+}
+
 }  // namespace
 
 }  // namespace password_manager

components/password_manager/core/browser/form_parsing/password_field_prediction.cc

@@ -30,6 +30,8 @@ CredentialFieldType DeriveFromServerFieldType(ServerFieldType type) {
     case autofill::USERNAME:
     case autofill::USERNAME_AND_EMAIL_ADDRESS:
       return CredentialFieldType::kUsername;
+    case autofill::SINGLE_USERNAME:
+      return CredentialFieldType::kSingleUsername;
     case autofill::PASSWORD:
       return CredentialFieldType::kCurrentPassword;
     case autofill::ACCOUNT_CREATION_PASSWORD:

components/password_manager/core/browser/form_parsing/password_field_prediction.h

@@ -20,6 +20,7 @@ namespace password_manager {
 enum class CredentialFieldType {
   kNone,
   kUsername,
+  kSingleUsername,
   kCurrentPassword,
   kNewPassword,
   kConfirmationPassword

components/password_manager/core/browser/form_parsing/password_field_prediction_unittest.cc

@@ -13,8 +13,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using autofill::AutofillField;
 using autofill::ACCOUNT_CREATION_PASSWORD;
+using autofill::AutofillField;
 using autofill::CONFIRMATION_PASSWORD;
 using autofill::EMAIL_ADDRESS;
 using autofill::FormData;
@@ -24,6 +24,7 @@ using autofill::NEW_PASSWORD;
 using autofill::NO_SERVER_DATA;
 using autofill::PASSWORD;
 using autofill::ServerFieldType;
+using autofill::SINGLE_USERNAME;
 using autofill::UNKNOWN_TYPE;
 using autofill::USERNAME;
 using autofill::USERNAME_AND_EMAIL_ADDRESS;
@@ -186,6 +187,8 @@ TEST(FormPredictionsTest, DeriveFromServerFieldType) {
       {"Username", USERNAME, CredentialFieldType::kUsername},
       {"Username/Email", USERNAME_AND_EMAIL_ADDRESS,
        CredentialFieldType::kUsername},
+      {"Single Username", SINGLE_USERNAME,
+       CredentialFieldType::kSingleUsername},
       {"Password", PASSWORD, CredentialFieldType::kCurrentPassword},
       {"New password", NEW_PASSWORD, CredentialFieldType::kNewPassword},
       {"Account creation password", ACCOUNT_CREATION_PASSWORD,