Revert of [Password Manager] Send username correction votes

components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 280 matching lines @@
   // PasswordFormBuilder below, plus the corresponding expectations.
   struct TestCase {
     const char* autocomplete[3];
     const char* expected_username_element;
     const char* expected_username_value;
     const char* expected_other_possible_usernames;
   } cases[] = {
       // When no elements are marked with autocomplete='username', the text-type
       // input field before the first password element should get selected as
       // the username, and the rest should be marked as alternatives.
-      {{nullptr, nullptr, nullptr},
-       "username2",
-       "William",
-       "John+username1, Smith+username3"},
+      {{nullptr, nullptr, nullptr}, "username2", "William", "John+Smith"},
       // When a sole element is marked with autocomplete='username', it should
       // be treated as the username for sure, with no other_possible_usernames.
       {{"username", nullptr, nullptr}, "username1", "John", ""},
       {{nullptr, "username", nullptr}, "username2", "William", ""},
       {{nullptr, nullptr, "username"}, "username3", "Smith", ""},
       // When >=2 elements have the attribute, the first should be selected as
       // the username, and the rest should go to other_possible_usernames.
-      {{"username", "username", nullptr},
-       "username1",
-       "John",
-       "William+username2"},
-      {{nullptr, "username", "username"},
-       "username2",
-       "William",
-       "Smith+username3"},
-      {{"username", nullptr, "username"},
-       "username1",
-       "John",
-       "Smith+username3"},
+      {{"username", "username", nullptr}, "username1", "John", "William"},
+      {{nullptr, "username", "username"}, "username2", "William", "Smith"},
+      {{"username", nullptr, "username"}, "username1", "John", "Smith"},
       {{"username", "username", "username"},
        "username1",
        "John",
-       "William+username2, Smith+username3"},
+       "William+Smith"},
       // When there is an empty autocomplete attribute (i.e. autocomplete=""),
       // it should have the same effect as having no attribute whatsoever.
-      {{"", "", ""}, "username2", "William", "John+username1, Smith+username3"},
+      {{"", "", ""}, "username2", "William", "John+Smith"},
       {{"", "", "username"}, "username3", "Smith", ""},
-      {{"username", "", "username"}, "username1", "John", "Smith+username3"},
+      {{"username", "", "username"}, "username1", "John", "Smith"},
       // It should not matter if attribute values are upper or mixed case.
-      {{"USERNAME", nullptr, "uSeRNaMe"},
-       "username1",
-       "John",
-       "Smith+username3"},
-      {{"uSeRNaMe", nullptr, "USERNAME"},
-       "username1",
-       "John",
-       "Smith+username3"}};
+      {{"USERNAME", nullptr, "uSeRNaMe"}, "username1", "John", "Smith"},
+      {{"uSeRNaMe", nullptr, "USERNAME"}, "username1", "John", "Smith"}};
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     for (size_t nonempty_username_fields = 0; nonempty_username_fields < 2;
          ++nonempty_username_fields) {
       SCOPED_TRACE(testing::Message()
                    << "Iteration " << i << " "
                    << (nonempty_username_fields ? "nonempty" : "empty"));
 
       // Repeat each test once with empty, and once with non-empty usernames.
       // In the former case, no empty other_possible_usernames should be saved.
@@ skipping 19 matching lines @@
           LoadHTMLAndConvertForm(html, nullptr, false);
       ASSERT_TRUE(password_form);
 
       EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_username_element),
                 password_form->username_element);
 
       if (nonempty_username_fields) {
         EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_username_value),
                   password_form->username_value);
         EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_other_possible_usernames),
-                  OtherPossibleUsernamesToString(
-                      password_form->other_possible_usernames));
+                  base::JoinString(password_form->other_possible_usernames,
+                                   base::ASCIIToUTF16("+")));
       } else {
         EXPECT_TRUE(password_form->username_value.empty());
         EXPECT_TRUE(password_form->other_possible_usernames.empty());
       }
 
       // Do a basic sanity check that we are still having a password field.
       EXPECT_EQ(base::UTF8ToUTF16("password"), password_form->password_element);
       EXPECT_EQ(base::UTF8ToUTF16("secret"), password_form->password_value);
     }
   }
@@ skipping 45 matching lines @@
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_new_password_element),
               password_form->new_password_element);
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_new_password_value),
               password_form->new_password_value);
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_confirmation_element),
               password_form->confirmation_password_element);
 
     // Do a basic sanity check that we are still selecting the right username.
     EXPECT_EQ(base::UTF8ToUTF16("username1"), password_form->username_element);
     EXPECT_EQ(base::UTF8ToUTF16("William"), password_form->username_value);
-    EXPECT_THAT(
-        password_form->other_possible_usernames,
-        testing::ElementsAre(PossibleUsernamePair(
-            base::UTF8ToUTF16("Smith"), base::UTF8ToUTF16("username2"))));
+    EXPECT_THAT(password_form->other_possible_usernames,
+                testing::ElementsAre(base::UTF8ToUTF16("Smith")));
   }
 }
 
 TEST_F(MAYBE_PasswordFormConversionUtilsTest, IdentifyingThreePasswordFields) {
   // Each test case consists of a set of parameters to be plugged into the
   // PasswordFormBuilder below, plus the corresponding expectations.
   struct TestCase {
     const char* password_values[3];
     const char* expected_password_element;
     const char* expected_password_value;
@@ skipping 47 matching lines @@
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_new_password_element),
               password_form->new_password_element);
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_new_password_value),
               password_form->new_password_value);
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_confirmation_element),
               password_form->confirmation_password_element);
 
     // Do a basic sanity check that we are still selecting the right username.
     EXPECT_EQ(base::UTF8ToUTF16("username1"), password_form->username_element);
     EXPECT_EQ(base::UTF8ToUTF16("William"), password_form->username_value);
-    EXPECT_THAT(
-        password_form->other_possible_usernames,
-        testing::ElementsAre(PossibleUsernamePair(
-            base::UTF8ToUTF16("Smith"), base::UTF8ToUTF16("username2"))));
+    EXPECT_THAT(password_form->other_possible_usernames,
+                testing::ElementsAre(base::UTF8ToUTF16("Smith")));
   }
 }
 
 TEST_F(MAYBE_PasswordFormConversionUtilsTest,
        IdentifyingPasswordFieldsWithAutocompleteAttributes) {
   // Each test case consists of a set of parameters to be plugged into the
   // PasswordFormBuilder below, plus the corresponding expectations.
   struct TestCase {
     const char* autocomplete[3];
     const char* expected_password_element;
@@ skipping 330 matching lines @@
     ASSERT_TRUE(password_form);
 
     // In the absence of username autocomplete attributes, the username should
     // be the text input field just before 'current-password' or before
     // 'new-password', if there is no 'current-password'.
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_username_element),
               password_form->username_element);
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_username_value),
               password_form->username_value);
     if (strcmp(cases[i].expected_username_value, "William") == 0) {
-      EXPECT_THAT(
-          password_form->other_possible_usernames,
-          testing::ElementsAre(PossibleUsernamePair(
-              base::UTF8ToUTF16("Smith"), base::UTF8ToUTF16("username2"))));
+      EXPECT_THAT(password_form->other_possible_usernames,
+                  testing::ElementsAre(base::UTF8ToUTF16("Smith")));
     } else {
-      EXPECT_THAT(
-          password_form->other_possible_usernames,
-          testing::ElementsAre(PossibleUsernamePair(
-              base::UTF8ToUTF16("William"), base::UTF8ToUTF16("username1"))));
+      EXPECT_THAT(password_form->other_possible_usernames,
+                  testing::ElementsAre(base::UTF8ToUTF16("William")));
     }
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_password_element),
               password_form->password_element);
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_password_value),
               password_form->password_value);
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_new_password_element),
               password_form->new_password_element);
     EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_new_password_value),
               password_form->new_password_value);
     EXPECT_EQ(cases[i].expected_new_password_marked_by_site,
@@ skipping 607 matching lines @@
 TEST_F(MAYBE_PasswordFormConversionUtilsTest, TooManyFieldsToParseForm) {
   PasswordFormBuilder builder(kTestFormActionURL);
   for (size_t i = 0; i < form_util::kMaxParseableFields + 1; ++i)
     builder.AddTextField("id", "value", "autocomplete");
   std::unique_ptr<PasswordForm> password_form =
       LoadHTMLAndConvertForm(builder.ProduceHTML(), nullptr, false);
   EXPECT_FALSE(password_form);
 }
 
 }  // namespace autofill