Revert of [Password Manager] Send username correction votes

components/autofill/core/common/password_form.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_H__
 #define COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_H__
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/time/time.h"
 #include "components/autofill/core/common/form_data.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 namespace autofill {
 
-// Pair of possible username value and field name that contained this value.
-using PossibleUsernamePair = std::pair<base::string16, base::string16>;
-
-// Vector of possible username values and corresponding field names.
-using PossibleUsernamesVector = std::vector<PossibleUsernamePair>;
-
 // The PasswordForm struct encapsulates information about a login form,
 // which can be an HTML form or a dialog with username/password text fields.
 //
 // The Web Data database stores saved username/passwords and associated form
 // metdata using a PasswordForm struct, typically one that was created from
 // a parsed HTMLFormElement or LoginDialog, but the saved entries could have
 // also been created by imported data from another browser.
 //
 // The PasswordManager implements a fuzzy-matching algorithm to compare saved
 // PasswordForm entries against PasswordForms that were created from a parsed
@@ skipping 104 matching lines @@
   //
   // When parsing an HTML form, this is typically empty unless the site
   // has implemented some form of autofill.
   base::string16 username_value;
 
   // This member is populated in cases where we there are multiple input
   // elements that could possibly be the username. Used when our heuristics for
   // determining the username are incorrect. Optional.
   //
   // When parsing an HTML form, this is typically empty.
-  PossibleUsernamesVector other_possible_usernames;
+  std::vector<base::string16> other_possible_usernames;
 
   // The name of the input element corresponding to the current password.
   // Optional (improves scoring).
   //
   // When parsing an HTML form, this will always be set, unless it is a sign-up
   // form or a change password form that does not ask for the current password.
   // In these two cases the |new_password_element| will always be set.
   base::string16 password_element;
 
   // The current password. Must be non-empty for PasswordForm instances that are
@@ skipping 139 matching lines @@
 // (origin, username_element, username_value, password_element, signon_realm).
 bool ArePasswordFormUniqueKeyEqual(const PasswordForm& left,
                                    const PasswordForm& right);
 
 // A comparator for the unique key.
 struct LessThanUniqueKey {
   bool operator()(const std::unique_ptr<PasswordForm>& left,
                   const std::unique_ptr<PasswordForm>& right) const;
 };
 
-// Converts a vector of possible usernames to string.
-base::string16 OtherPossibleUsernamesToString(
-    const PossibleUsernamesVector& possible_usernames);
-
 // For testing.
 std::ostream& operator<<(std::ostream& os, PasswordForm::Layout layout);
 std::ostream& operator<<(std::ostream& os, const PasswordForm& form);
 std::ostream& operator<<(std::ostream& os, PasswordForm* form);
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_H__