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

content/renderer/pepper/host_var_tracker.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 "content/renderer/pepper/host_var_tracker.h"
 
+#include <tuple>
+
 #include "base/logging.h"
 #include "content/renderer/pepper/host_array_buffer_var.h"
 #include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/host_resource_var.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/v8object_var.h"
 #include "ppapi/c/pp_var.h"
 
 using ppapi::ArrayBufferVar;
 using ppapi::V8ObjectVar;
 
 namespace content {
 
 HostVarTracker::V8ObjectVarKey::V8ObjectVarKey(V8ObjectVar* object_var)
     : instance(object_var->instance()->pp_instance()) {
   v8::Local<v8::Object> object = object_var->GetHandle();
   hash = object.IsEmpty() ? 0 : object->GetIdentityHash();
 }
 
 HostVarTracker::V8ObjectVarKey::V8ObjectVarKey(PP_Instance instance,
                                                v8::Local<v8::Object> object)
     : instance(instance),
       hash(object.IsEmpty() ? 0 : object->GetIdentityHash()) {}
 
 HostVarTracker::V8ObjectVarKey::~V8ObjectVarKey() {}
 
 bool HostVarTracker::V8ObjectVarKey::operator<(
     const V8ObjectVarKey& other) const {
-  if (instance == other.instance)
-    return hash < other.hash;
-  return instance < other.instance;
+  return std::tie(instance, hash) < std::tie(other.instance, other.hash);
 }
 
 HostVarTracker::HostVarTracker()
     : VarTracker(SINGLE_THREADED), last_shared_memory_map_id_(0) {}
 
 HostVarTracker::~HostVarTracker() {}
 
 ArrayBufferVar* HostVarTracker::CreateArrayBuffer(uint32 size_in_bytes) {
   return new HostArrayBufferVar(size_in_bytes);
 }
@@ skipping 132 matching lines @@
   if (it->second.instance != instance)
     return false;
 
   *handle = it->second.handle;
   *size_in_bytes = it->second.size_in_bytes;
   shared_memory_map_.erase(it);
   return true;
 }
 
 }  // namespace content