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

components/url_matcher/string_pattern.cc

Index: components/url_matcher/string_pattern.cc
diff --git a/components/url_matcher/string_pattern.cc b/components/url_matcher/string_pattern.cc
index d103bced3e255de4762f5d87a3d8b237c287f93b..a4b87bcaad52bb5d9fab1405ca73121818684c64 100644
--- a/components/url_matcher/string_pattern.cc
+++ b/components/url_matcher/string_pattern.cc
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/url_matcher/string_pattern.h"
+
+#include <tuple>
 
 namespace url_matcher {
 
@@ -13,8 +15,7 @@
 StringPattern::~StringPattern() {}
 
 bool StringPattern::operator<(const StringPattern& rhs) const {
-  if (id_ != rhs.id_) return id_ < rhs.id_;
-  return pattern_ < rhs.pattern_;
+  return std::tie(id_, pattern_) < std::tie(rhs.id_, rhs.pattern_);
 }
 
 }  // namespace url_matcher