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

ui/gfx/vector_icons/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 
 action("aggregate_vector_icons") {
   visibility = [ ":*" ]
 
   script = "aggregate_vector_icons.py"
@@ skipping 127 matching lines @@
     "tab_media_recording.icon",
     "tab_usb_connected.1x.icon",
     "tab_usb_connected.icon",
     "tablet.icon",
     "translate.icon",
     "user_account_avatar.icon",
     "videocam.icon",
     "warning.icon",
     "warning_badge.icon",
     "web.icon",
+    "window_control_back.1x.icon",
+    "window_control_back.icon",
+    "window_control_close.1x.icon",
+    "window_control_close.icon",
+    "window_control_left_snapped.1x.icon",
+    "window_control_left_snapped.icon",
+    "window_control_maximize.1x.icon",
+    "window_control_maximize.icon",
+    "window_control_minimize.1x.icon",
+    "window_control_minimize.icon",
+    "window_control_restore.1x.icon",
+    "window_control_restore.icon",
+    "window_control_right_snapped.1x.icon",
+    "window_control_right_snapped.icon",
     "zoom_minus.icon",
     "zoom_plus.icon",
     "${branding_path_component}/product.icon",
   ]
 
   output_cc = "$target_gen_dir/vector_icons.cc"
   output_h = "$target_gen_dir/vector_icons.h"
 
   inputs = icons
   inputs += [
@@ skipping 22 matching lines @@
     "../vector_icon_types.h",
     "../vector_icons_public.h",
   ]
 
   deps = [
     ":aggregate_vector_icons",
     "//base",
     "//skia",
   ]
 }