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

components/autofill/core/common/form_field_data.cc

 // 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.
 
 #include "components/autofill/core/common/form_field_data.h"
 
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/common/autofill_util.h"
 
 namespace autofill {
 
 namespace {
 
 // Increment this anytime pickle format is modified as well as provide
 // deserialization routine from previous kPickleVersion format.
-const int kPickleVersion = 6;
+const int kPickleVersion = 7;
 
 void AddVectorToPickle(std::vector<base::string16> strings,
                        base::Pickle* pickle) {
   pickle->WriteInt(static_cast<int>(strings.size()));
   for (size_t i = 0; i < strings.size(); ++i) {
     pickle->WriteString16(strings[i]);
   }
 }
 
 bool ReadStringVector(base::PickleIterator* iter,
@@ skipping 78 matching lines @@
 bool DeserializeSection8(base::PickleIterator* iter,
                          FormFieldData* field_data) {
   return iter->ReadString16(&field_data->css_classes);
 }
 
 bool DeserializeSection9(base::PickleIterator* iter,
                          FormFieldData* field_data) {
   return iter->ReadUInt32(&field_data->properties_mask);
 }
 
+bool DeserializeSection10(base::PickleIterator* iter,
+                          FormFieldData* field_data) {
+  return iter->ReadString16(&field_data->id);
+}
+
 }  // namespace
 
 FormFieldData::FormFieldData()
     : max_length(0),
       is_autofilled(false),
       check_status(NOT_CHECKABLE),
       is_focusable(false),
       should_autocomplete(true),
       role(ROLE_ATTRIBUTE_OTHER),
       text_direction(base::i18n::UNKNOWN_DIRECTION),
       properties_mask(0) {}
 
 FormFieldData::FormFieldData(const FormFieldData& other) = default;
 
 FormFieldData::~FormFieldData() {
 }
 
 bool FormFieldData::SameFieldAs(const FormFieldData& field) const {
   // A FormFieldData stores a value, but the value is not part of the identity
   // of the field, so we don't want to compare the values.
-  return label == field.label && name == field.name &&
+  return label == field.label && name == field.name && id == field.id &&
          form_control_type == field.form_control_type &&
          autocomplete_attribute == field.autocomplete_attribute &&
          placeholder == field.placeholder && max_length == field.max_length &&
          css_classes == field.css_classes &&
          // is_checked and is_autofilled counts as "value" since these change
          // when we fill things in.
          IsCheckable(check_status) == IsCheckable(field.check_status) &&
          is_focusable == field.is_focusable &&
          should_autocomplete == field.should_autocomplete &&
          role == field.role && text_direction == field.text_direction;
@@ skipping 22 matching lines @@
   // This does not use std::tie() as that generates more implicit variables
   // than the max-vartrack-size for var-tracking-assignments when compiling
   // for Android, producing build warnings. (See https://crbug.com/555171 for
   // context.)
 
   // Like SameFieldAs this ignores the value.
   if (label < field.label) return true;
   if (label > field.label) return false;
   if (name < field.name) return true;
   if (name > field.name) return false;
+  if (id < field.id) return true;
+  if (id > field.id) return false;
   if (form_control_type < field.form_control_type) return true;
   if (form_control_type > field.form_control_type) return false;
   if (autocomplete_attribute < field.autocomplete_attribute) return true;
   if (autocomplete_attribute > field.autocomplete_attribute) return false;
   if (placeholder < field.placeholder) return true;
   if (placeholder > field.placeholder) return false;
   if (max_length < field.max_length) return true;
   if (max_length > field.max_length) return false;
   if (css_classes < field.css_classes) return true;
   if (css_classes > field.css_classes) return false;
@@ skipping 25 matching lines @@
   pickle->WriteInt(field_data.check_status);
   pickle->WriteBool(field_data.is_focusable);
   pickle->WriteBool(field_data.should_autocomplete);
   pickle->WriteInt(field_data.role);
   pickle->WriteInt(field_data.text_direction);
   AddVectorToPickle(field_data.option_values, pickle);
   AddVectorToPickle(field_data.option_contents, pickle);
   pickle->WriteString16(field_data.placeholder);
   pickle->WriteString16(field_data.css_classes);
   pickle->WriteUInt32(field_data.properties_mask);
+  pickle->WriteString16(field_data.id);
 }
 
 bool DeserializeFormFieldData(base::PickleIterator* iter,
                               FormFieldData* field_data) {
   int version;
   FormFieldData temp_form_field_data;
   if (!iter->ReadInt(&version)) {
     LOG(ERROR) << "Bad pickle of FormFieldData, no version present";
     return false;
   }
@@ skipping 64 matching lines @@
           !DeserializeSection2(iter, &temp_form_field_data) ||
           !DeserializeSection3(iter, &temp_form_field_data) ||
           !DeserializeSection4(iter, &temp_form_field_data) ||
           !DeserializeSection8(iter, &temp_form_field_data) ||
           !DeserializeSection9(iter, &temp_form_field_data)) {
         LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
         return false;
       }
       break;
     }
+    case 7: {
+      if (!DeserializeSection1(iter, &temp_form_field_data) ||
+          !DeserializeSection6(iter, &temp_form_field_data) ||
+          !DeserializeSection7(iter, &temp_form_field_data) ||
+          !DeserializeSection2(iter, &temp_form_field_data) ||
+          !DeserializeSection3(iter, &temp_form_field_data) ||
+          !DeserializeSection4(iter, &temp_form_field_data) ||
+          !DeserializeSection8(iter, &temp_form_field_data) ||
+          !DeserializeSection9(iter, &temp_form_field_data) ||
+          !DeserializeSection10(iter, &temp_form_field_data)) {
+        LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
+        return false;
+      }
+      break;
+    }
     default: {
       LOG(ERROR) << "Unknown FormFieldData pickle version " << version;
       return false;
     }
   }
   *field_data = temp_form_field_data;
   return true;
 }
 
 std::ostream& operator<<(std::ostream& os, const FormFieldData& field) {
@@ skipping 15 matching lines @@
     case FormFieldData::RoleAttribute::ROLE_ATTRIBUTE_PRESENTATION:
       role_str = "ROLE_ATTRIBUTE_PRESENTATION";
       break;
     case FormFieldData::RoleAttribute::ROLE_ATTRIBUTE_OTHER:
       role_str = "ROLE_ATTRIBUTE_OTHER";
       break;
   }
 
   return os << base::UTF16ToUTF8(field.label) << " "
             << base::UTF16ToUTF8(field.name) << " "
+            << base::UTF16ToUTF8(field.id) << " "
             << base::UTF16ToUTF8(field.value) << " " << field.form_control_type
             << " " << field.autocomplete_attribute << " " << field.placeholder
             << " " << field.max_length << " " << field.css_classes << " "
             << (field.is_autofilled ? "true" : "false") << " "
             << check_status_str << (field.is_focusable ? "true" : "false")
             << " " << (field.should_autocomplete ? "true" : "false") << " "
             << role_str << " " << field.text_direction << " "
             << field.properties_mask;
 }
 
 }  // namespace autofill