Clean up autofill constructors, operator=, comparison methods in auto.

Added copy and move constructors and move assignment operators to
structs which had only a copy constructor defined.

Set constructors to =default where applicable.

Added |name_attribute|, |id_attribute| to FormData's comparison methods
to be in line with FormFieldData's comparison methods.

Bug: 1007974
Change-Id: I97cf61c8a5b3512b9d99f677f848fb74ca669041
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1844775
Commit-Queue: Vadym Doroshenko <dvadym@chromium.org>
Reviewed-by: Roger McFarlane <rogerm@chromium.org>
Reviewed-by: Vadym Doroshenko <dvadym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703667}

components/autofill/core/common/form_data.cc

@@ -70,15 +70,21 @@ void LogDeserializationError(int version) {
 }  // namespace
 
 FormData::FormData() = default;
+
 FormData::FormData(const FormData&) = default;
+
 FormData& FormData::operator=(const FormData&) = default;
+
 FormData::FormData(FormData&&) = default;
+
 FormData& FormData::operator=(FormData&&) = default;
+
 FormData::~FormData() = default;
 
 bool FormData::SameFormAs(const FormData& form) const {
-  if (name != form.name || url != form.url || action != form.action ||
-      is_form_tag != form.is_form_tag ||
+  if (name != form.name || id_attribute != form.id_attribute ||
+      name_attribute != form.name_attribute || url != form.url ||
+      action != form.action || is_form_tag != form.is_form_tag ||
       is_formless_checkout != form.is_formless_checkout ||
       fields.size() != form.fields.size())
     return false;
@@ -90,8 +96,9 @@ bool FormData::SameFormAs(const FormData& form) const {
 }
 
 bool FormData::SimilarFormAs(const FormData& form) const {
-  if (name != form.name || url != form.url || action != form.action ||
-      is_form_tag != form.is_form_tag ||
+  if (name != form.name || id_attribute != form.id_attribute ||
+      name_attribute != form.name_attribute || url != form.url ||
+      action != form.action || is_form_tag != form.is_form_tag ||
       is_formless_checkout != form.is_formless_checkout ||
       fields.size() != form.fields.size())
     return false;
@@ -103,7 +110,9 @@ bool FormData::SimilarFormAs(const FormData& form) const {
 }
 
 bool FormData::DynamicallySameFormAs(const FormData& form) const {
-  if (name != form.name || fields.size() != form.fields.size())
+  if (name != form.name || id_attribute != form.id_attribute ||
+      name_attribute != form.name_attribute ||
+      fields.size() != form.fields.size())
     return false;
   for (size_t i = 0; i < fields.size(); ++i) {
     if (!fields[i].DynamicallySameFieldAs(form.fields[i]))
@@ -113,7 +122,9 @@ bool FormData::DynamicallySameFormAs(const FormData& form) const {
 }
 
 bool FormData::operator==(const FormData& form) const {
-  return name == form.name && url == form.url && action == form.action &&
+  return name == form.name && id_attribute == form.id_attribute &&
+         name_attribute == form.name_attribute && url == form.url &&
+         action == form.action &&
          unique_renderer_id == form.unique_renderer_id &&
          submission_event == form.submission_event &&
          is_form_tag == form.is_form_tag &&
@@ -127,10 +138,11 @@ bool FormData::operator!=(const FormData& form) const {
 }
 
 bool FormData::operator<(const FormData& form) const {
-  return std::tie(name, url, action, is_form_tag, is_formless_checkout,
-                  fields) < std::tie(form.name, form.url, form.action,
-                                     form.is_form_tag,
-                                     form.is_formless_checkout, form.fields);
+  return std::tie(name, id_attribute, name_attribute, url, action, is_form_tag,
+                  is_formless_checkout, fields) <
+         std::tie(form.name, form.id_attribute, form.name_attribute, form.url,
+                  form.action, form.is_form_tag, form.is_formless_checkout,
+                  form.fields);
 }
 
 std::ostream& operator<<(std::ostream& os, const FormData& form) {

components/autofill/core/common/form_data_predictions.cc

@@ -6,23 +6,24 @@
 
 namespace autofill {
 
-FormDataPredictions::FormDataPredictions() {
-}
+FormDataPredictions::FormDataPredictions() = default;
 
-FormDataPredictions::FormDataPredictions(const FormDataPredictions& other)
-    : data(other.data),
-      signature(other.signature),
-      fields(other.fields) {
-}
+FormDataPredictions::FormDataPredictions(const FormDataPredictions&) = default;
 
-FormDataPredictions::~FormDataPredictions() {
-}
+FormDataPredictions& FormDataPredictions::operator=(
+    const FormDataPredictions&) = default;
+
+FormDataPredictions::FormDataPredictions(FormDataPredictions&&) = default;
+
+FormDataPredictions& FormDataPredictions::operator=(FormDataPredictions&&) =
+    default;
+
+FormDataPredictions::~FormDataPredictions() = default;
 
 bool FormDataPredictions::operator==(
     const FormDataPredictions& predictions) const {
   return (data.SameFormAs(predictions.data) &&
-          signature == predictions.signature &&
-          fields == predictions.fields);
+          signature == predictions.signature && fields == predictions.fields);
 }
 
 bool FormDataPredictions::operator!=(

components/autofill/core/common/form_data_predictions.h

@@ -23,7 +23,10 @@ struct FormDataPredictions {
   std::vector<FormFieldDataPredictions> fields;
 
   FormDataPredictions();
-  FormDataPredictions(const FormDataPredictions& other);
+  FormDataPredictions(const FormDataPredictions&);
+  FormDataPredictions& operator=(const FormDataPredictions&);
+  FormDataPredictions(FormDataPredictions&&);
+  FormDataPredictions& operator=(FormDataPredictions&&);
   ~FormDataPredictions();
 
   // Added for the sake of testing.

components/autofill/core/common/form_field_data.cc

@@ -144,7 +144,13 @@ bool HaveSameLabel(const FormFieldData& field1, const FormFieldData& field2) {
 
 FormFieldData::FormFieldData() = default;
 
-FormFieldData::FormFieldData(const FormFieldData& other) = default;
+FormFieldData::FormFieldData(const FormFieldData&) = default;
+
+FormFieldData& FormFieldData::operator=(const FormFieldData&) = default;
+
+FormFieldData::FormFieldData(FormFieldData&&) = default;
+
+FormFieldData& FormFieldData::operator=(FormFieldData&&) = default;
 
 FormFieldData::~FormFieldData() = default;
 

components/autofill/core/common/form_field_data.h

@@ -18,7 +18,7 @@
 namespace base {
 class Pickle;
 class PickleIterator;
-}
+}  // namespace base
 
 namespace autofill {
 
@@ -61,7 +61,10 @@ struct FormFieldData {
       std::numeric_limits<uint32_t>::max();
 
   FormFieldData();
-  FormFieldData(const FormFieldData& other);
+  FormFieldData(const FormFieldData&);
+  FormFieldData& operator=(const FormFieldData&);
+  FormFieldData(FormFieldData&&);
+  FormFieldData& operator=(FormFieldData&&);
   ~FormFieldData();
 
   // Returns true if two form fields are the same, not counting the value.

components/autofill/core/common/form_field_data_predictions.cc

@@ -6,21 +6,21 @@
 
 namespace autofill {
 
-FormFieldDataPredictions::FormFieldDataPredictions() {
-}
+FormFieldDataPredictions::FormFieldDataPredictions() = default;
 
 FormFieldDataPredictions::FormFieldDataPredictions(
-    const FormFieldDataPredictions& other)
-    : field(other.field),
-      signature(other.signature),
-      heuristic_type(other.heuristic_type),
-      server_type(other.server_type),
-      overall_type(other.overall_type),
-      parseable_name(other.parseable_name),
-      section(other.section) {}
-
-FormFieldDataPredictions::~FormFieldDataPredictions() {
-}
+    const FormFieldDataPredictions&) = default;
+
+FormFieldDataPredictions& FormFieldDataPredictions::operator=(
+    const FormFieldDataPredictions&) = default;
+
+FormFieldDataPredictions::FormFieldDataPredictions(FormFieldDataPredictions&&) =
+    default;
+
+FormFieldDataPredictions& FormFieldDataPredictions::operator=(
+    FormFieldDataPredictions&&) = default;
+
+FormFieldDataPredictions::~FormFieldDataPredictions() = default;
 
 bool FormFieldDataPredictions::operator==(
     const FormFieldDataPredictions& predictions) const {

components/autofill/core/common/form_field_data_predictions.h

@@ -15,7 +15,10 @@ namespace autofill {
 // Stores information about a field in a form.
 struct FormFieldDataPredictions {
   FormFieldDataPredictions();
-  FormFieldDataPredictions(const FormFieldDataPredictions& other);
+  FormFieldDataPredictions(const FormFieldDataPredictions&);
+  FormFieldDataPredictions& operator=(const FormFieldDataPredictions&);
+  FormFieldDataPredictions(FormFieldDataPredictions&&);
+  FormFieldDataPredictions& operator=(FormFieldDataPredictions&&);
   ~FormFieldDataPredictions();
 
   FormFieldData field;

components/autofill/core/common/password_form_fill_data.cc

@@ -75,7 +75,15 @@ PasswordFormFillData::PasswordFormFillData(
   }
 }
 
-PasswordFormFillData::PasswordFormFillData(const PasswordFormFillData& other) =
+PasswordFormFillData::PasswordFormFillData(const PasswordFormFillData&) =
+    default;
+
+PasswordFormFillData& PasswordFormFillData::operator=(
+    const PasswordFormFillData&) = default;
+
+PasswordFormFillData::PasswordFormFillData(PasswordFormFillData&&) = default;
+
+PasswordFormFillData& PasswordFormFillData::operator=(PasswordFormFillData&&) =
     default;
 
 PasswordFormFillData::~PasswordFormFillData() = default;

components/autofill/core/common/password_form_fill_data.h

@@ -38,8 +38,10 @@ struct PasswordFormFillData {
       const PasswordForm& preferred_match,
       bool wait_for_username);
 
-  PasswordFormFillData(const PasswordFormFillData& other);
-
+  PasswordFormFillData(const PasswordFormFillData&);
+  PasswordFormFillData& operator=(const PasswordFormFillData&);
+  PasswordFormFillData(PasswordFormFillData&&);
+  PasswordFormFillData& operator=(PasswordFormFillData&&);
   ~PasswordFormFillData();
 
   // If |has_renderer_ids| == true then |form_renderer_id| contains the unique
@@ -89,7 +91,6 @@ struct PasswordFormFillData {
   // TODO(https://crbug.com/831123): Remove this field when old parsing is
   // removed and filling by renderer ids is by default.
   bool has_renderer_ids = false;
-
 };
 
 // If |data.wait_for_username| is set, the renderer does not need to receive