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

components/url_matcher/string_pattern.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/url_matcher/string_pattern.h"
 
+#include <tuple>
+
 namespace url_matcher {
 
 StringPattern::StringPattern(const std::string& pattern,
                              StringPattern::ID id)
     : pattern_(pattern), id_(id) {}
 
 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