Use std::tie for multi-member comparisons

chrome/browser/browsing_data/browsing_data_database_helper.cc

 // Copyright (c) 2012 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 "chrome/browser/browsing_data/browsing_data_database_helper.h"
 
+#include <tuple>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 97 matching lines @@
     const std::string& description)
     : origin(origin),
       name(name),
       description(description) {
 }
 
 CannedBrowsingDataDatabaseHelper::PendingDatabaseInfo::~PendingDatabaseInfo() {}
 
 bool CannedBrowsingDataDatabaseHelper::PendingDatabaseInfo::operator<(
     const PendingDatabaseInfo& other) const {
-  if (origin == other.origin)
-    return name < other.name;
-  return origin < other.origin;
+  return std::tie(origin, name) < std::tie(other.origin, other.name);
 }
 
 CannedBrowsingDataDatabaseHelper::CannedBrowsingDataDatabaseHelper(
     Profile* profile)
     : BrowsingDataDatabaseHelper(profile) {
 }
 
 void CannedBrowsingDataDatabaseHelper::AddDatabase(
     const GURL& origin,
     const std::string& name,
@@ skipping 53 matching lines @@
        ++it) {
     if (it->origin == origin && it->name == name) {
       pending_database_info_.erase(it);
       break;
     }
   }
   BrowsingDataDatabaseHelper::DeleteDatabase(origin_identifier, name);
 }
 
 CannedBrowsingDataDatabaseHelper::~CannedBrowsingDataDatabaseHelper() {}