Use std::tie() for operator< in extensions/

extensions/browser/api/declarative/rules_registry_service.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_API_DECLARATIVE_RULES_REGISTRY_SERVICE_H__
 #define EXTENSIONS_BROWSER_API_DECLARATIVE_RULES_REGISTRY_SERVICE_H__
 
 #include <map>
 #include <string>
+#include <tuple>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/scoped_observer.h"
 #include "extensions/browser/api/declarative/rules_registry.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/extension_registry_observer.h"
 
@@ skipping 16 matching lines @@
  public:
   static const int kDefaultRulesRegistryID;
   static const int kInvalidRulesRegistryID;
 
   struct RulesRegistryKey {
     std::string event_name;
     int rules_registry_id;
     RulesRegistryKey(const std::string& event_name, int rules_registry_id)
         : event_name(event_name), rules_registry_id(rules_registry_id) {}
     bool operator<(const RulesRegistryKey& other) const {
-      return (event_name < other.event_name) ||
-             ((event_name == other.event_name) &&
-              (rules_registry_id < other.rules_registry_id));
+      return std::tie(event_name, rules_registry_id) <
+             std::tie(other.event_name, other.rules_registry_id);
     }
   };
 
   explicit RulesRegistryService(content::BrowserContext* context);
   ~RulesRegistryService() override;
 
   // Unregisters refptrs to concrete RulesRegistries at other objects that were
   // created by us so that the RulesRegistries can be released.
   void Shutdown() override;
 
@@ skipping 85 matching lines @@
       extension_registry_observer_;
 
   content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(RulesRegistryService);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_DECLARATIVE_RULES_REGISTRY_SERVICE_H__