Revert of Move more vector icons to respective directories and update code to

ui/views/controls/button/image_button.cc

Index: ui/views/controls/button/image_button.cc
diff --git a/ui/views/controls/button/image_button.cc b/ui/views/controls/button/image_button.cc
index fd2151e2a1aab73c6ad529ec5a909ffd9ea309ab..e875612c10ea5dbceaac42ce1796fb633983b731 100644
--- a/ui/views/controls/button/image_button.cc
+++ b/ui/views/controls/button/image_button.cc
@@ -48,14 +48,10 @@
 }
 
 void ImageButton::SetImage(ButtonState for_state, const gfx::ImageSkia* image) {
-  SetImage(for_state, image ? *image : gfx::ImageSkia());
-}
-
-void ImageButton::SetImage(ButtonState for_state, const gfx::ImageSkia& image) {
   if (for_state == STATE_HOVERED)
-    set_animate_on_state_change(!image.isNull());
+    set_animate_on_state_change(image != nullptr);
   const gfx::Size old_preferred_size = GetPreferredSize();
-  images_[for_state] = image;
+  images_[for_state] = image ? *image : gfx::ImageSkia();
 
   if (old_preferred_size != GetPreferredSize())
     PreferredSizeChanged();
@@ -254,11 +250,11 @@
 }
 
 void ToggleImageButton::SetImage(ButtonState image_state,
-                                 const gfx::ImageSkia& image) {
+                                 const gfx::ImageSkia* image) {
   if (toggled_) {
-    alternate_images_[image_state] = image;
+    alternate_images_[image_state] = image ? *image : gfx::ImageSkia();
   } else {
-    images_[image_state] = image;
+    images_[image_state] = image ? *image : gfx::ImageSkia();
     if (state() == image_state)
       SchedulePaint();
   }