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

ui/views/controls/button/vector_icon_button.h

Index: ui/views/controls/button/vector_icon_button.h
diff --git a/ui/views/controls/button/vector_icon_button.h b/ui/views/controls/button/vector_icon_button.h
index b0aa02515e2408d130f9e476e74f525e820ed348..66f1b93864ec3820893f78adebaa62bc5a486472 100644
--- a/ui/views/controls/button/vector_icon_button.h
+++ b/ui/views/controls/button/vector_icon_button.h
@@ -25,10 +25,7 @@ class VIEWS_EXPORT VectorIconButton : public views::ImageButton {
   ~VectorIconButton() override;
 
   // Sets the icon to display and provides a callback which should return the
-  // text color from which to derive this icon's color. The one that takes an ID
-  // is deprecated and should be removed when all vector icons are identified by
-  // VectorIcon structs.
-  void SetIcon(gfx::VectorIconId id);
+  // text color from which to derive this icon's color.
   void SetIcon(const gfx::VectorIcon& icon);
 
   // views::ImageButton:
@@ -43,10 +40,7 @@ class VIEWS_EXPORT VectorIconButton : public views::ImageButton {
   void UpdateImagesAndColors();
 
   VectorIconButtonDelegate* delegate_;
-  // TODO(estade): remove |id_| in favor of |icon_| once all callers have been
-  // updated.
-  gfx::VectorIconId id_;
-  const gfx::VectorIcon* icon_ = nullptr;
+  const gfx::VectorIcon* icon_;
 
   DISALLOW_COPY_AND_ASSIGN(VectorIconButton);
 };