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

ui/gfx/paint_vector_icon.cc

 // Copyright 2015 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 "ui/gfx/paint_vector_icon.h"
 
 #include <map>
+#include <tuple>
 
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/vector_icon_types.h"
@@ skipping 321 matching lines @@
 
  private:
   struct IconDescription {
     IconDescription(VectorIconId id,
                     size_t dip_size,
                     SkColor color,
                     VectorIconId badge_id)
         : id(id), dip_size(dip_size), color(color), badge_id(badge_id) {}
 
     bool operator<(const IconDescription& other) const {
-      if (id != other.id)
-        return id < other.id;
-      if (dip_size != other.dip_size)
-        return dip_size < other.dip_size;
-      if (color != other.color)
-        return color < other.color;
-      return badge_id < other.badge_id;
+      return std::tie(id, dip_size, color, badge_id) <
+             std::tie(other.id, other.dip_size, other.color, other.badge_id);
     }
 
     VectorIconId id;
     size_t dip_size;
     SkColor color;
     VectorIconId badge_id;
   };
 
   std::map<IconDescription, ImageSkia> images_;
 
@@ skipping 30 matching lines @@
 
 ImageSkia CreateVectorIconFromSource(const std::string& source,
                                      size_t dip_size,
                                      SkColor color) {
   return ImageSkia(
       new VectorIconSource(source, dip_size, color),
       gfx::Size(static_cast<int>(dip_size), static_cast<int>(dip_size)));
 }
 
 }  // namespace gfx