WebUI: Migrate more preprocess_grit users to preprocess_if_expr

settings, print_preview tests, welcome, NTP

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

chrome/browser/resources/new_tab_page/BUILD.gn

@@ -5,7 +5,7 @@
 import("//chrome/browser/resources/optimize_webui.gni")
 import("//chrome/common/features.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("//ui/webui/webui_features.gni")
 
@@ -286,7 +286,7 @@ group("web_components") {
 if (optimize_webui) {
   preprocess_folder = "preprocessed"
 
-  preprocess_grit("preprocess") {
+  preprocess_if_expr("preprocess") {
     defines = [ "is_official_build=$is_official_build" ]
     in_folder = "./"
     out_folder = "$target_gen_dir/$preprocess_folder"
@@ -303,7 +303,7 @@ if (optimize_webui) {
     ]
   }
 
-  preprocess_grit("preprocess_gen") {
+  preprocess_if_expr("preprocess_gen") {
     deps = [ ":web_components" ]
     defines = [ "is_official_build=$is_official_build" ]
     in_folder = target_gen_dir

chrome/browser/resources/new_tab_page/modules/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//chrome/common/features.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("//ui/webui/webui_features.gni")
 
@@ -53,7 +53,7 @@ if (optimize_webui) {
   # for bundling.
   preprocess_folder = "../preprocessed/modules"
 
-  preprocess_grit("preprocess") {
+  preprocess_if_expr("preprocess") {
     defines = [ "is_official_build=$is_official_build" ]
     in_folder = "./"
 
@@ -70,7 +70,7 @@ if (optimize_webui) {
     }
   }
 
-  preprocess_grit("preprocess_gen") {
+  preprocess_if_expr("preprocess_gen") {
     deps = [ ":web_components" ]
     defines = [ "is_official_build=$is_official_build" ]
     in_folder = target_gen_dir

chrome/browser/resources/settings/BUILD.gn

@@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.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")
@@ -92,7 +92,7 @@ generate_grd("build_grd") {
   }
 }
 
-preprocess_grit("preprocess") {
+preprocess_if_expr("preprocess") {
   in_folder = "./"
   out_folder = "$target_gen_dir/$preprocess_folder"
   out_manifest = "$target_gen_dir/$preprocess_manifest"
@@ -152,7 +152,7 @@ preprocess_grit("preprocess") {
   }
 }
 
-preprocess_grit("preprocess_generated") {
+preprocess_if_expr("preprocess_generated") {
   deps = [ ":polymer3_elements" ]
   in_folder = target_gen_dir
   out_folder = "$target_gen_dir/$preprocess_folder"

chrome/browser/resources/welcome/BUILD.gn

@@ -5,7 +5,7 @@
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.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")
 
@@ -39,7 +39,7 @@ generate_grd("build_grd") {
   ]
 }
 
-preprocess_grit("preprocess") {
+preprocess_if_expr("preprocess") {
   in_folder = "./"
   out_folder = "$target_gen_dir/$preprocess_folder"
   out_manifest = "$target_gen_dir/$preprocess_manifest"
@@ -60,7 +60,7 @@ preprocess_grit("preprocess") {
   ]
 }
 
-preprocess_grit("preprocess_generated") {
+preprocess_if_expr("preprocess_generated") {
   deps = [ ":web_components" ]
   in_folder = target_gen_dir
   out_folder = "$target_gen_dir/$preprocess_folder"

chrome/test/data/webui/print_preview/BUILD.gn

@@ -4,9 +4,9 @@
 
 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")
 
-preprocess_grit("preprocess") {
+preprocess_if_expr("preprocess") {
   in_folder = "./"
   out_folder = "$target_gen_dir"
   in_files = [