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

components/autofill/core/common/form_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_data.h"
 
+#include <tuple>
+
 #include "base/base64.h"
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/common/form_field_data.h"
 
 namespace autofill {
 
 namespace {
 
@@ skipping 62 matching lines @@
       fields.size() != form.fields.size())
     return false;
   for (size_t i = 0; i < fields.size(); ++i) {
     if (!fields[i].SameFieldAs(form.fields[i]))
       return false;
   }
   return true;
 }
 
 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) {
   os << base::UTF16ToUTF8(form.name) << " "
      << form.origin << " "
      << form.action << " "
      << form.is_form_tag << " "
      << "Fields:";
   for (size_t i = 0; i < form.fields.size(); ++i) {
     os << form.fields[i] << ",";
@@ skipping 73 matching lines @@
   if (input.empty())
     return false;
   std::string pickle_data;
   Base64Decode(input, &pickle_data);
   base::Pickle pickle(pickle_data.data(), static_cast<int>(pickle_data.size()));
   base::PickleIterator iter(pickle);
   return DeserializeFormData(&iter, form_data);
 }
 
 }  // namespace autofill