Move final vector icons out of ui/gfx/vector_icons/ and remove the

ui/gfx/paint_vector_icon.h

Index: ui/gfx/paint_vector_icon.h
diff --git a/ui/gfx/paint_vector_icon.h b/ui/gfx/paint_vector_icon.h
index 0b84d855e11c3d9e5fb18c2f468177d706b0c857..9177b54c7dd852bfcc2b7b97554e31cc430f260f 100644
--- a/ui/gfx/paint_vector_icon.h
+++ b/ui/gfx/paint_vector_icon.h
@@ -13,7 +13,6 @@ namespace gfx {
 
 class Canvas;
 struct VectorIcon;
-enum class VectorIconId;
 
 GFX_EXPORT extern const VectorIcon kNoneIcon;
 
@@ -21,34 +20,21 @@ GFX_EXPORT extern const VectorIcon kNoneIcon;
 // is the length of a single edge of the square icon, in device independent
 // pixels. |color| is used as the fill.
 GFX_EXPORT void PaintVectorIcon(Canvas* canvas,
-                                VectorIconId id,
-                                int dip_size,
-                                SkColor color);
-GFX_EXPORT void PaintVectorIcon(Canvas* canvas,
                                 const VectorIcon& icon,
                                 int dip_size,
                                 SkColor color);
 
 // Creates an ImageSkia which will render the icon on demand. The size will come
 // from the .icon file (the 1x version, if multiple versions exist).
-GFX_EXPORT ImageSkia CreateVectorIcon(VectorIconId id,
-                                      SkColor color);
 GFX_EXPORT ImageSkia CreateVectorIcon(const VectorIcon& icon, SkColor color);
 
 // As above, but creates the image at the given size.
-GFX_EXPORT ImageSkia CreateVectorIcon(VectorIconId id,
-                                      int dip_size,
-                                      SkColor color);
 GFX_EXPORT ImageSkia CreateVectorIcon(const VectorIcon& icon,
                                       int dip_size,
                                       SkColor color);
 
 // As above, but also paints a badge defined by |badge_id| on top of the icon.
 // The badge uses the same canvas size and default color as the icon.
-GFX_EXPORT ImageSkia CreateVectorIconWithBadge(VectorIconId id,
-                                               int dip_size,
-                                               SkColor color,
-                                               VectorIconId badge_id);
 GFX_EXPORT ImageSkia CreateVectorIconWithBadge(const VectorIcon& icon,
                                                int dip_size,
                                                SkColor color,