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

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

 // Copyright 2016 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.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
 package autofill;
 
@@ skipping 15 matching lines @@
 // This message is the result of an Autofill query. It holds the field type
 // information.
 // Next available id: 7
 message AutofillQueryResponseContents {
   optional bool upload_required = 1;
   repeated group Field = 2 { required fixed32 autofill_type = 3; }
 }
 
 // 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;
 
   // True if the autofill feature was used to fill this form, false otherwise.
   required bool autofill_used = 3;
 
   // A string representing a bit array of what personal information items
   // the user has entered in the autofill settings dialog.
   // The corresponding bit is set if the user has that particular
   // item entered and is not set otherwise.
   required string data_present = 4;
 
   // List of the fields in the form and their types.
   repeated group Field = 5 {
     // Field identification inside the current form.
     required fixed32 signature = 6;
 
     // Type of the field, e.g. what type of personal information did the user
     // enter in that field before form submission. There is a predefined
     // enum of types located at
     // components/autofill/core/browser/field_types.h
     // 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.
     optional string autocomplete = 9;
 
     // The type of input control for this field (e.g. text, textarea, email).
     optional string type = 10;
 
     enum PasswordGenerationType {
       NO_GENERATION = 0;
@@ skipping 13 matching lines @@
     }
     // The outcome of HTML parsing based form classifier.
     optional FormClassifierOutcome form_classifier_outcome = 18;
 
     // The value of the class attribute on the field, if present.
     optional string css_classes = 19;
 
     // 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;
 
   // Signature of the form which is used for password generation debugging.
   // Currently is used when password generated on a password field of a
   // registration form is used on a password field of a login form.
   optional fixed64 login_form_signature = 14;
 
   // Whether a form submission event was observed.
   optional bool submission = 15;
 
   // The form name.
   optional string form_name = 16;
 }