Use std::tie for multi-member comparisons

chrome/browser/browsing_data/browsing_data_service_worker_helper.cc

 // Copyright 2014 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_service_worker_helper.h"
 
+#include <tuple>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/service_worker_context.h"
 
 using content::BrowserThread;
 using content::ServiceWorkerContext;
@@ skipping 72 matching lines @@
                                   const std::vector<GURL>& scopes)
     : origin(origin), scopes(scopes) {
 }
 
 CannedBrowsingDataServiceWorkerHelper::PendingServiceWorkerUsageInfo::
     ~PendingServiceWorkerUsageInfo() {
 }
 
 bool CannedBrowsingDataServiceWorkerHelper::PendingServiceWorkerUsageInfo::
 operator<(const PendingServiceWorkerUsageInfo& other) const {
-  if (origin == other.origin)
-    return scopes < other.scopes;
-  return origin < other.origin;
+  return std::tie(origin, scopes) < std::tie(other.origin, other.scopes);
 }
 
 CannedBrowsingDataServiceWorkerHelper::CannedBrowsingDataServiceWorkerHelper(
     content::ServiceWorkerContext* context)
     : BrowsingDataServiceWorkerHelper(context) {
 }
 
 CannedBrowsingDataServiceWorkerHelper::
     ~CannedBrowsingDataServiceWorkerHelper() {
 }
@@ skipping 46 matching lines @@
   for (std::set<PendingServiceWorkerUsageInfo>::iterator it =
            pending_service_worker_info_.begin();
        it != pending_service_worker_info_.end();) {
     if (it->origin == origin)
       pending_service_worker_info_.erase(it++);
     else
       ++it;
   }
   BrowsingDataServiceWorkerHelper::DeleteServiceWorkers(origin);
 }