Finish updating aggregate_vector_icons template

Bug: 1132894
Change-Id: Ibb942cbb4ceaa97bb973ffdac8e483502e96fae3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503569Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821893}

ash/public/cpp/app_list/vector_icons/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons2("app_list_vector_icons") {
+aggregate_vector_icons("app_list_vector_icons") {
   icon_directory = "."
 
   sources = [

ash/resources/vector_icons/BUILD.gn

@@ -5,7 +5,7 @@
 import("//build/config/chrome_build.gni")
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons2("ash_vector_icons") {
+aggregate_vector_icons("ash_vector_icons") {
   icon_directory = "."
 
   sources = [

ash/shortcut_viewer/vector_icons/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons2("ksv_vector_icons") {
+aggregate_vector_icons("ksv_vector_icons") {
   icon_directory = "."
 
   sources = [

chrome/app/vector_icons/BUILD.gn

@@ -7,7 +7,7 @@ import("//components/vector_icons/vector_icons.gni")
 import("//device/vr/buildflags/buildflags.gni")
 import("//ui/webui/webui_features.gni")
 
-aggregate_vector_icons2("chrome_vector_icons") {
+aggregate_vector_icons("chrome_vector_icons") {
   icon_directory = "."
 
   # Keep sorted alphabetically.

chrome/browser/vr/vector_icons/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons2("vr_vector_icons") {
+aggregate_vector_icons("vr_vector_icons") {
   icon_directory = "."
 
   sources = [

chromecast/ui/BUILD.gn

@@ -105,7 +105,7 @@ if (use_aura) {
 # Rules for generating vector icon source files.
 # Adapted from //components/vector_icons/BUILD.gn
 
-aggregate_vector_icons2("media_controls_vector_icons") {
+aggregate_vector_icons("media_controls_vector_icons") {
   icon_directory = "vector_icons"
 
   sources = [

chromeos/ui/vector_icons/BUILD.gn

@@ -6,7 +6,7 @@ import("//components/vector_icons/vector_icons.gni")
 
 # The icons in this target, unlike those in //ash/resources/vector_icons,
 # are ok to use from outside of ash/, eg lacros builds.
-aggregate_vector_icons2("chromeos_ui_vector_icons") {
+aggregate_vector_icons("chromeos_ui_vector_icons") {
   icon_directory = "."
 
   sources = [

components/media_message_center/vector_icons/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons2("media_vector_icons") {
+aggregate_vector_icons("media_vector_icons") {
   icon_directory = "."
 
   sources = [

components/omnibox/browser/BUILD.gn

@@ -18,7 +18,7 @@ buildflag_header("buildflags") {
   flags = [ "ENABLE_VR=$enable_vr" ]
 }
 
-aggregate_vector_icons2("omnibox_vector_icons") {
+aggregate_vector_icons("omnibox_vector_icons") {
   icon_directory = "vector_icons"
 
   sources = [

components/vector_icons/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons2("components_vector_icons") {
+aggregate_vector_icons("components_vector_icons") {
   icon_directory = "."
 
   sources = [

components/vector_icons/vector_icons.gni

@@ -21,50 +21,6 @@
 # Example
 #
 #   See BUILD.gn in this directory (//components/vector_icons/) for an example.
-#
-# TODO(estade): rename to aggregate_vector_icons after all clients are updated.
-template("aggregate_vector_icons2") {
-  assert(defined(invoker.sources),
-         "Need sources in $target_name listing the icon files.")
-  assert(
-      defined(invoker.icon_directory),
-      "Need icon_directory in $target_name where the icons and templates live.")
-
-  action(target_name) {
-    visibility = [ ":*" ]
-
-    script = "//components/vector_icons/aggregate_vector_icons.py"
-
-    output_cc = "$target_gen_dir/vector_icons.cc"
-    output_h = "$target_gen_dir/vector_icons.h"
-
-    templates = [
-      "vector_icons.cc.template",
-      "vector_icons.h.template",
-    ]
-    inputs =
-        rebase_path(templates + invoker.sources, ".", invoker.icon_directory) +
-        [ "//components/vector_icons/aggregate_vector_icons.py" ]
-
-    outputs = [
-      output_cc,
-      output_h,
-    ]
-
-    response_file_contents =
-        rebase_path(invoker.sources, root_build_dir, invoker.icon_directory)
-
-    args = [
-      "--working_directory=" +
-          rebase_path(invoker.icon_directory, root_build_dir),
-      "--file_list={{response_file_name}}",
-      "--output_cc=" + rebase_path(output_cc, root_build_dir),
-      "--output_h=" + rebase_path(output_h, root_build_dir),
-    ]
-  }
-}
-
-# Deprecated version. TODO(estade): remove when all clients are updated.
 template("aggregate_vector_icons") {
   assert(defined(invoker.sources),
          "Need sources in $target_name listing the icon files.")

ui/message_center/BUILD.gn

@@ -8,7 +8,7 @@ import("//components/vector_icons/vector_icons.gni")
 import("//testing/test.gni")
 import("//ui/base/ui_features.gni")
 
-aggregate_vector_icons2("message_center_vector_icons") {
+aggregate_vector_icons("message_center_vector_icons") {
   icon_directory = "vector_icons"
 
   sources = [

ui/views/BUILD.gn

@@ -17,7 +17,7 @@ config("flags") {
   defines = [ "TOOLKIT_VIEWS=1" ]
 }
 
-aggregate_vector_icons2("views_vector_icons") {
+aggregate_vector_icons("views_vector_icons") {
   icon_directory = "vector_icons"
 
   sources = [

ui/views/window/vector_icons/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons2("window_control_vector_icons") {
+aggregate_vector_icons("window_control_vector_icons") {
   icon_directory = "."
 
   sources = [