[Password manager] Relplace the FormFieldData vector from autofill::FormData with named fields…

components/autofill/core/common/password_form_fill_data.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_FILL_DATA_H_
 #define COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_FILL_DATA_H_
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 21 matching lines @@
 };
 
 // Structure used for autofilling password forms. Note that the realms in this
 // struct are only set when the password's realm differs from the realm of the
 // form that we are filling.
 struct PasswordFormFillData {
   typedef std::map<base::string16, PasswordAndRealm> LoginCollection;
   typedef std::map<UsernamesCollectionKey,
                    std::vector<base::string16> > UsernamesCollection;
 
-  // Identifies the HTML form on the page and preferred username/password for
-  // login.
-  FormData basic_data;
+  // The name of the form.
+  base::string16 name;
+
+  // An origin is (scheme, host, port, path and fragment identifier) only; it is
+  // just exactly a URL with the query string removed.
+  GURL origin;
+
+  // The action target of the form.
+  GURL action;
+
+  // True if this form was submitted by a user gesture and not javascript.
+  bool user_submitted;
+
+  // Username and password input fields in the form.
+  FormFieldData username_field;
+  FormFieldData password_field;
 
   // The signon realm of the preferred user/pass pair.
   std::string preferred_realm;
 
   // A list of other matching username->PasswordAndRealm pairs for the form.
   LoginCollection additional_logins;
 
   // A list of possible usernames in the case where we aren't completely sure
   // that the original saved username is correct. This data is keyed by the
   // saved username/password to ensure uniqueness, though the username is not
@@ skipping 23 matching lines @@
     const PasswordForm& form_on_page,
     const PasswordFormMap& matches,
     const PasswordForm* const preferred_match,
     bool wait_for_username_before_autofill,
     bool enable_other_possible_usernames,
     PasswordFormFillData* result);
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_FILL_DATA_H__