Reland of Use std::tie() for operator< in components/

components/guest_view/browser/guest_view_manager.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 "components/guest_view/browser/guest_view_manager.h"
 
+#include <tuple>
+
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "components/guest_view/browser/guest_view_base.h"
 #include "components/guest_view/browser/guest_view_manager_delegate.h"
 #include "components/guest_view/browser/guest_view_manager_factory.h"
 #include "components/guest_view/common/guest_view_constants.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 452 matching lines @@
 
 GuestViewManager::ElementInstanceKey::ElementInstanceKey(
     int embedder_process_id,
     int element_instance_id)
     : embedder_process_id(embedder_process_id),
       element_instance_id(element_instance_id) {
 }
 
 bool GuestViewManager::ElementInstanceKey::operator<(
     const GuestViewManager::ElementInstanceKey& other) const {
-  if (embedder_process_id != other.embedder_process_id)
-    return embedder_process_id < other.embedder_process_id;
-
-  return element_instance_id < other.element_instance_id;
+  return std::tie(embedder_process_id, element_instance_id) <
+         std::tie(other.embedder_process_id, other.element_instance_id);
 }
 
 bool GuestViewManager::ElementInstanceKey::operator==(
     const GuestViewManager::ElementInstanceKey& other) const {
   return (embedder_process_id == other.embedder_process_id) &&
          (element_instance_id == other.element_instance_id);
 }
 
 GuestViewManager::GuestViewData::GuestViewData(
     const GuestViewCreateFunction& create_function,
     const GuestViewCleanUpFunction& cleanup_function)
     : create_function(create_function), cleanup_function(cleanup_function) {}
 
 GuestViewManager::GuestViewData::~GuestViewData() {}
 
 }  // namespace guest_view