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

content/public/browser/desktop_media_id.h

 // Copyright 2013 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 CONTENT_PUBLIC_BROWSER_DESKTOP_MEDIA_ID_H_
 #define CONTENT_PUBLIC_BROWSER_DESKTOP_MEDIA_ID_H_
 
 #include <string>
+#include <tuple>
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 
 #if defined(USE_AURA)
 namespace aura {
 class Window;
 }  // namespace aura
 #endif  // defined(USE_AURA)
 
@@ skipping 28 matching lines @@
   DesktopMediaID() = default;
 
   DesktopMediaID(Type type, Id id)
       : type(type),
         id(id) {
   }
 
   // Operators so that DesktopMediaID can be used with STL containers.
   bool operator<(const DesktopMediaID& other) const {
 #if defined(USE_AURA)
-    return (type < other.type ||
-            (type == other.type &&
-             (id < other.id || (id == other.id &&
-                                aura_id < other.aura_id))));
+    return std::tie(type, id, aura_id) <
+           std::tie(other.type, other.id, other.aura_id);
 #else
-    return type < other.type || (type == other.type && id < other.id);
+    return std::tie(type, id) < std::tie(other.type, other.id);
 #endif
   }
   bool operator==(const DesktopMediaID& other) const {
 #if defined(USE_AURA)
     return type == other.type && id == other.id && aura_id == other.aura_id;
 #else
     return type == other.type && id == other.id;
 #endif
   }
 
@@ skipping 11 matching lines @@
   Id id = kNullId;
 #if defined(USE_AURA)
   // TODO(miu): Make this an int, after clean-up for http://crbug.com/513490.
   Id aura_id = kNullId;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_DESKTOP_MEDIA_ID_H_