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

extensions/renderer/user_script_injector.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 "extensions/renderer/user_script_injector.h"
 
+#include <tuple>
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/guest_view/extensions_guest_view_messages.h"
 #include "extensions/common/permissions/permissions_data.h"
@@ skipping 12 matching lines @@
 namespace {
 
 struct RoutingInfoKey {
   int routing_id;
   int script_id;
 
   RoutingInfoKey(int routing_id, int script_id)
       : routing_id(routing_id), script_id(script_id) {}
 
   bool operator<(const RoutingInfoKey& other) const {
-    if (routing_id != other.routing_id)
-      return routing_id < other.routing_id;
-
-    if (script_id != other.script_id)
-      return script_id < other.script_id;
-    return false;  // keys are equal.
+    return std::tie(routing_id, script_id) <
+           std::tie(other.routing_id, other.script_id);
   }
 };
 
 using RoutingInfoMap = std::map<RoutingInfoKey, bool>;
 
 // These two strings are injected before and after the Greasemonkey API and
 // user script to wrap it in an anonymous scope.
 const char kUserScriptHead[] = "(function (unsafeWindow) {\n";
 const char kUserScriptTail[] = "\n})(window);";
 
@@ skipping 207 matching lines @@
     scoped_ptr<base::Value> execution_result,
     UserScript::RunLocation run_location,
     content::RenderFrame* render_frame) {
 }
 
 void UserScriptInjector::OnWillNotInject(InjectFailureReason reason,
                                          content::RenderFrame* render_frame) {
 }
 
 }  // namespace extensions