[Password Generation] Send id attribute to server for HTML based form classifier

components/autofill/core/browser/proto/server.proto

Index: components/autofill/core/browser/proto/server.proto
diff --git a/components/autofill/core/browser/proto/server.proto b/components/autofill/core/browser/proto/server.proto
index 754519777353a87073263b5e6b0f0ac990635cb8..e84e2025a79e469343d30a88e1d8b12c86191336 100644
--- a/components/autofill/core/browser/proto/server.proto
+++ b/components/autofill/core/browser/proto/server.proto
@@ -33,7 +33,7 @@ message AutofillQueryResponseContents {
 
 // This message contains information about the field types in a single form.
 // It is sent by the toolbar to contribute to the field type statistics.
-// Next available id: 21
+// Next available id: 22
 message AutofillUploadContents {
   required string client_version = 1;
   required fixed64 form_signature = 2;
@@ -59,7 +59,8 @@ message AutofillUploadContents {
     // AutoFillFieldType
     required fixed32 autofill_type = 7;
 
-    // The value of the name attribute on the field, if present.
+    // The value of the name attribute on the field, if present. Otherwise, the
+    // value of the id attribute. See HTMLFormControlElement::nameForAutofill.
     optional string name = 8;
 
     // The value of the autocomplete attribute on the field, if present.
@@ -93,6 +94,10 @@ message AutofillUploadContents {
     // The properties mask (i.e. whether the field was autofilled, user
     // modified, etc.) See FieldPropertiesFlags.
     optional uint32 properties_mask = 20;
+
+    // The value of the id attribute, if it differs from the name attribute.
+    // Otherwise, this field is absent.
+    optional string id = 21;
   }
   // Signature of the form action host (e.g. Hash64Bit("example.com")).
   optional fixed64 action_signature = 13;