WebUI: Migrate more preprocess_grit to preprocess_if_expr

Migrating ui/webui/resources and chromeos/components/

preprocess_if_expr is identical to preprocess_grit for files not using
the deprecated // <include> in JS.

Also mark preprocess_grit as unsupported, since it will have only one
remaining user, which needs further evaluation (file_manager).

Change-Id: Ied707603cedbcc28af50ff8a262c2da758d0179e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2570814
Commit-Queue: dpapad <dpapad@chromium.org>
Auto-Submit: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833403}

chromeos/components/connectivity_diagnostics/resources/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/grit/preprocess_grit.gni")
+import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 
@@ -38,7 +38,7 @@ generate_grd("build_grd") {
   out_grd = "$target_gen_dir/connectivity_diagnostics_resources.grd"
 }
 
-preprocess_grit("preprocess_generated") {
+preprocess_if_expr("preprocess_generated") {
   deps = [ ":web_components" ]
   in_folder = target_gen_dir
   out_folder = "$target_gen_dir/$preprocess_folder"

tools/grit/preprocess_grit.gni

@@ -2,6 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# This tool is no longer supported. Use preprocess_if_expr instead, which
+# also generates manifests and preprocesses <if expr> but does not also
+# inline <include>s (which are deprecated).
+
 import("//build/config/python.gni")
 import("//tools/grit/grit_defines.gni")
 

ui/webui/resources/cr_components/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/chromeos/ui_mode.gni")
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/grit/preprocess_grit.gni")
+import("//tools/grit/preprocess_if_expr.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 import("//ui/webui/webui_features.gni")
 
@@ -37,7 +37,7 @@ group("preprocess") {
   ]
 }
 
-preprocess_grit("preprocess_src") {
+preprocess_if_expr("preprocess_src") {
   in_folder = "./"
   out_folder = "$preprocess_folder"
   out_manifest = "$target_gen_dir/$preprocess_src_manifest"
@@ -52,7 +52,7 @@ preprocess_grit("preprocess_src") {
   }
 }
 
-preprocess_grit("preprocess_mojom") {
+preprocess_if_expr("preprocess_mojom") {
   deps =
       [ "//ui/webui/resources/cr_components/customize_themes:mojom_webui_js" ]
   in_folder = "$root_gen_dir/mojom-webui/ui/webui/resources/cr_components"
@@ -61,7 +61,7 @@ preprocess_grit("preprocess_mojom") {
   in_files = [ "customize_themes/customize_themes.mojom-webui.js" ]
 }
 
-preprocess_grit("preprocess_generated") {
+preprocess_if_expr("preprocess_generated") {
   deps = [ ":polymer3_elements" ]
   in_folder = target_gen_dir
   out_folder = "$preprocess_folder"
@@ -151,7 +151,7 @@ preprocess_grit("preprocess_generated") {
   }
 }
 
-preprocess_grit("preprocess_polymer2") {
+preprocess_if_expr("preprocess_polymer2") {
   in_folder = "./"
   out_folder = "$preprocess_folder"
   out_manifest = "$target_gen_dir/$preprocess_polymer2_manifest"

ui/webui/resources/cr_elements/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/chromeos/ui_mode.gni")
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/grit/preprocess_grit.gni")
+import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/html_to_js.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
@@ -35,14 +35,14 @@ group("preprocess") {
   ]
 }
 
-preprocess_grit("preprocess_src") {
+preprocess_if_expr("preprocess_src") {
   in_folder = "./"
   out_folder = "$preprocess_folder"
   out_manifest = "$target_gen_dir/$preprocess_src_manifest"
   in_files = [ "cr_splitter/cr_splitter.js" ]
 }
 
-preprocess_grit("preprocess_polymer2") {
+preprocess_if_expr("preprocess_polymer2") {
   in_folder = "./"
   out_folder = "$preprocess_folder"
   out_manifest = "$target_gen_dir/$preprocess_polymer2_manifest"
@@ -155,7 +155,7 @@ preprocess_grit("preprocess_polymer2") {
   }
 }
 
-preprocess_grit("preprocess_generated") {
+preprocess_if_expr("preprocess_generated") {
   deps = [ ":polymer3_elements" ]
   in_folder = target_gen_dir
   out_folder = "$preprocess_folder"

ui/webui/resources/css/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//tools/grit/preprocess_grit.gni")
+import("//tools/grit/preprocess_if_expr.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 
 include_polymer = !is_android && !is_ios
@@ -18,7 +18,7 @@ generate_grd("build_grdp") {
   resource_path_prefix = "css"
 }
 
-preprocess_grit("preprocess_src") {
+preprocess_if_expr("preprocess_src") {
   in_folder = "./"
   out_folder = "$preprocess_folder"
   out_manifest = "$target_gen_dir/$preprocess_src_manifest"

ui/webui/resources/js/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/chromeos/ui_mode.gni")
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/grit/preprocess_grit.gni")
+import("//tools/grit/preprocess_if_expr.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 import("../tools/js_modulizer.gni")
 
@@ -33,7 +33,7 @@ group("preprocess") {
   ]
 }
 
-preprocess_grit("preprocess_src") {
+preprocess_if_expr("preprocess_src") {
   in_folder = "./"
   out_folder = "$preprocess_folder"
   out_manifest = "$target_gen_dir/$preprocess_src_manifest"
@@ -72,7 +72,7 @@ preprocess_grit("preprocess_src") {
   }
 }
 
-preprocess_grit("preprocess_generated") {
+preprocess_if_expr("preprocess_generated") {
   deps = [ ":modulize" ]
   in_folder = target_gen_dir
   out_folder = "$preprocess_folder"

ui/webui/resources/js/cr/ui/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/chromeos/ui_mode.gni")
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/grit/preprocess_grit.gni")
+import("//tools/grit/preprocess_if_expr.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 import("../../../tools/js_modulizer.gni")
 import("../../cr.gni")
@@ -31,7 +31,7 @@ group("preprocess") {
   ]
 }
 
-preprocess_grit("preprocess_src") {
+preprocess_if_expr("preprocess_src") {
   in_folder = "./"
   out_folder = "$preprocess_folder"
   out_manifest = "$target_gen_dir/$preprocess_src_manifest"
@@ -80,7 +80,7 @@ preprocess_grit("preprocess_src") {
   }
 }
 
-preprocess_grit("preprocess_generated") {
+preprocess_if_expr("preprocess_generated") {
   deps = [ ":modulize" ]
   in_folder = target_gen_dir
   out_folder = "$preprocess_folder"

ui/webui/resources/tools/generate_grd.py

@@ -5,7 +5,7 @@
 # Generates a grit grd file from a list of input manifest files. This is useful
 # for preventing the need to list JS files in multiple locations, as files can
 # be listed just once in the BUILD.gn file as inputs for a build rule that knows
-# how to output such a manifest (e.g. preprocess_grit).
+# how to output such a manifest (e.g. preprocess_if_expr).
 #
 # Variables:
 #   manifest-files: