[Password Generation] Use signatures for form matching

components/autofill/core/browser/form_structure.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_BROWSER_FORM_STRUCTURE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_
 
 #include <stddef.h>
 
 #include <set>
@@ skipping 73 matching lines @@
                                  rappor::RapporService* rappor_service);
 
   // Returns predictions using the details from the given |form_structures| and
   // their fields' predicted types.
   static std::vector<FormDataPredictions> GetFieldTypePredictions(
       const std::vector<FormStructure*>& form_structures);
 
   // Returns whether sending autofill field metadata to the server is enabled.
   static bool IsAutofillFieldMetadataEnabled();
 
-  // The unique signature for this form, composed of the target url domain,
-  // the form name, and the form field names in a 64-bit hash.
-  std::string FormSignature() const;
+  // Return the form signature as string.
+  std::string FormSignatureAsStr() const;
 
   // Runs a quick heuristic to rule out forms that are obviously not
   // auto-fillable, like google/yahoo/msn search, etc.
   bool IsAutofillable() const;
 
   // Returns whether |this| form represents a complete Credit Card form, which
   // consists in having at least a credit card number field and an expiration
   // field.
   bool IsCompleteCreditCardForm() const;
 
@@ skipping 107 matching lines @@
     return has_author_specified_sections_;
   }
 
   void set_upload_required(UploadRequired required) {
     upload_required_ = required;
   }
   UploadRequired upload_required() const { return upload_required_; }
 
   bool all_fields_are_passwords() const { return all_fields_are_passwords_; }
 
+  // The unique signature for this form, composed of the target url domain,
+  // the form name, and the form field names in a 64-bit hash.
+  FormSignature form_signature() const { return form_signature_; }
+
   // Returns a FormData containing the data this form structure knows about.
   FormData ToFormData() const;
 
   bool operator==(const FormData& form) const;
   bool operator!=(const FormData& form) const;
 
  private:
   friend class AutofillMergeTest;
   friend class FormStructureTest;
   FRIEND_TEST_ALL_PREFIXES(AutofillDownloadTest, QueryAndUploadTest);
   FRIEND_TEST_ALL_PREFIXES(FormStructureTest, FindLongestCommonPrefix);
 
   // Encodes information about this form and its fields into |query_form|.
   void EncodeFormForQuery(
       autofill::AutofillQueryContents::Form* query_form) const;
 
   // Encodes information about this form and its fields into |upload|.
   void EncodeFormForUpload(autofill::AutofillUploadContents* upload) const;
 
-  // 64-bit hash of the string - used in FormSignature and unit-tests.
-  static uint64_t Hash64Bit(const std::string& str);
-
-  uint64_t FormSignature64Bit() const;
-
   // Returns true if the form has no fields, or too many.
   bool IsMalformed() const;
 
   // Classifies each field in |fields_| into a logical section.
   // Sections are identified by the heuristic that a logical section should not
   // include multiple fields of the same autofill type (with some exceptions, as
   // described in the implementation).  Sections are furthermore distinguished
   // as either credit card or non-credit card sections.
   // If |has_author_specified_sections| is true, only the second pass --
   // distinguishing credit card sections from non-credit card ones -- is made.
@@ skipping 25 matching lines @@
   // The number of fields able to be auto-filled.
   size_t autofill_count_;
 
   // A vector of all the input fields in the form.
   ScopedVector<AutofillField> fields_;
 
   // The number of fields that are part of the form signature and that are
   // included in queries to the Autofill server.
   size_t active_field_count_;
 
-  // The names of the form input elements, that are part of the form signature.
-  // The string starts with "&" and the names are also separated by the "&"
-  // character. E.g.: "&form_input1_name&form_input2_name&...&form_inputN_name"
-  std::string form_signature_field_names_;
-
   // Whether the server expects us to always upload, never upload, or default
   // to the stored upload rates.
   UploadRequired upload_required_;
 
   // Whether the form includes any field types explicitly specified by the site
   // author, via the |autocompletetype| attribute.
   bool has_author_specified_types_;
 
   // Whether the form includes any sections explicitly specified by the site
   // author, via the autocomplete attribute.
   bool has_author_specified_sections_;
 
   // Whether the form was parsed for autocomplete attribute, thus assigning
   // the real values of |has_author_specified_types_| and
   // |has_author_specified_sections_|.
   bool was_parsed_for_autocomplete_attributes_;
 
   // True if the form contains at least one password field.
   bool has_password_field_;
 
   // True if the form is a <form>.
   bool is_form_tag_;
 
   // True if the form is made of unowned fields in a non checkout flow.
   bool is_formless_checkout_;
 
   // True if all form fields are password fields.
   bool all_fields_are_passwords_;
 
+  FormSignature form_signature_;
+
   DISALLOW_COPY_AND_ASSIGN(FormStructure);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_