Reland of Use std::tie() for operator< in components/

components/autofill/core/common/form_data.cc

Index: components/autofill/core/common/form_data.cc
diff --git a/components/autofill/core/common/form_data.cc b/components/autofill/core/common/form_data.cc
index aaa8178f48ddb83291b674dbbf48bd464a2aabd3..3d68639b65e3f2b471cffa751ea09cc74a128179 100644
--- a/components/autofill/core/common/form_data.cc
+++ b/components/autofill/core/common/form_data.cc
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/autofill/core/common/form_data.h"
+
+#include <tuple>
 
 #include "base/base64.h"
 #include "base/pickle.h"
@@ -86,15 +88,9 @@
 }
 
 bool FormData::operator<(const FormData& form) const {
-  if (name != form.name)
-    return name < form.name;
-  if (origin != form.origin)
-    return origin < form.origin;
-  if (action != form.action)
-    return action < form.action;
-  if (is_form_tag != form.is_form_tag)
-    return is_form_tag < form.is_form_tag;
-  return fields < form.fields;
+  return std::tie(name, origin, action, is_form_tag, fields) <
+         std::tie(form.name, form.origin, form.action, form.is_form_tag,
+                  form.fields);
 }
 
 std::ostream& operator<<(std::ostream& os, const FormData& form) {