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

components/mus/ws/ids.h

Index: components/mus/ws/ids.h
diff --git a/components/mus/ws/ids.h b/components/mus/ws/ids.h
index 3c814d0bde691b7505f3442e0928219d88cbdbc7..8ae41c9ce352d3a08c6e9b232f9c4ca793790829 100644
--- a/components/mus/ws/ids.h
+++ b/components/mus/ws/ids.h
@@ -4,6 +4,8 @@
 
 #ifndef COMPONENTS_MUS_WS_IDS_H_
 #define COMPONENTS_MUS_WS_IDS_H_
+
+#include <tuple>
 
 #include "components/mus/common/types.h"
 #include "components/mus/common/util.h"
@@ -29,10 +31,8 @@
   bool operator!=(const WindowId& other) const { return !(*this == other); }
 
   bool operator<(const WindowId& other) const {
-    if (connection_id == other.connection_id)
-      return window_id < other.window_id;
-
-    return connection_id < other.connection_id;
+    return std::tie(connection_id, window_id) <
+           std::tie(other.connection_id, other.window_id);
   }
 
   ConnectionSpecificId connection_id;