[Password Generation] Use signatures for form matching

components/autofill/core/browser/autofill_field.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_AUTOFILL_FIELD_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_FIELD_H_
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/proto/server.pb.h"
 #include "components/autofill/core/common/form_field_data.h"
+#include "components/autofill/core/common/signatures_util.h"
 
 namespace autofill {
 
 class AutofillType;
 
 class AutofillField : public FormFieldData {
  public:
   enum PhonePart {
     IGNORED = 0,
     PHONE_PREFIX = 1,
@@ skipping 33 matching lines @@
 
   // This function automatically chooses between server and heuristic autofill
   // type, depending on the data available.
   AutofillType Type() const;
 
   // Returns true if the value of this field is empty.
   bool IsEmpty() const;
 
   // The unique signature of this field, composed of the field name and the html
   // input type in a 32-bit hash.
-  std::string FieldSignature() const;
+  FieldSignature FieldSignature() const;
+
+  // Returns the field signature as string.
+  std::string FieldSignatureAsStr() const;
 
   // Returns true if the field type has been determined (without the text in the
   // field).
   bool IsFieldFillable() const;
 
   void set_default_value(const std::string& value) { default_value_ = value; }
   const std::string& default_value() const { return default_value_; }
 
   void set_credit_card_number_offset(size_t position) {
     credit_card_number_offset_ = position;
@@ skipping 93 matching lines @@
 
   // The outcome of HTML parsing based form classifier.
   AutofillUploadContents::Field::FormClassifierOutcome form_classifier_outcome_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillField);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_FIELD_H_