WebUI: Move optimize_webui.py related files to c/b/r/tools.

Also fix new PRESUBMIT warning about
TESTONLY_AND_VISIBILITY in optimize_webui.gni.

Bug: None
Change-Id: I588d8c3ab26073756e47227cc0813ab5bb890d0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611332
Commit-Queue: dpapad <dpapad@chromium.org>
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840539}

chrome/browser/resources/PRESUBMIT.py

@@ -93,13 +93,6 @@ def CheckHtml(input_api, output_api):
       input_api, output_api, 80, lambda x: x.LocalPath().endswith('.html'))
 
 
-def RunOptimizeWebUiTests(input_api, output_api):
-  presubmit_path = input_api.PresubmitLocalPath()
-  sources = ['optimize_webui_test.py']
-  tests = [input_api.os_path.join(presubmit_path, s) for s in sources]
-  return input_api.canned_checks.RunUnitTests(input_api, output_api, tests)
-
-
 def _CheckSvgsOptimized(input_api, output_api):
   results = []
   try:
@@ -135,11 +128,6 @@ def _CheckChangeOnUploadOrCommit(input_api, output_api):
   affected = input_api.AffectedFiles()
   if any(f for f in affected if f.LocalPath().endswith('.html')):
     results += CheckHtml(input_api, output_api)
-
-  webui_sources = set(['optimize_webui.py'])
-  affected_files = [input_api.os_path.basename(f.LocalPath()) for f in affected]
-  if webui_sources.intersection(set(affected_files)):
-    results += RunOptimizeWebUiTests(input_api, output_api)
   results += _CheckSvgsOptimized(input_api, output_api)
   results += _CheckWebDevStyle(input_api, output_api)
   results += input_api.canned_checks.CheckPatchFormatted(input_api, output_api,

chrome/browser/resources/bookmarks/BUILD.gn

@@ -8,7 +8,7 @@ import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
-import("../optimize_webui.gni")
+import("../tools/optimize_webui.gni")
 
 preprocess_folder = "preprocessed"
 preprocess_manifest = "preprocessed_manifest.json"

chrome/browser/resources/chromeos/bluetooth_pairing_dialog/BUILD.gn

@@ -7,7 +7,7 @@ import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
-import("../../optimize_webui.gni")
+import("../../tools/optimize_webui.gni")
 
 preprocess_folder = "preprocessed"
 preprocess_gen_manifest = "preprocessed_gen_manifest.json"

chrome/browser/resources/chromeos/internet_config_dialog/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("../../optimize_webui.gni")
+import("../../tools/optimize_webui.gni")
 
 optimize_webui("build") {
   host = "internet_config_dialog"

chrome/browser/resources/chromeos/internet_detail_dialog/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("../../optimize_webui.gni")
+import("../../tools/optimize_webui.gni")
 
 optimize_webui("build") {
   host = "internet_detail_dialog"

chrome/browser/resources/chromeos/machine_learning/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("../../optimize_webui.gni")
 
 js_type_check("closure_compile") {
   deps = [

chrome/browser/resources/downloads/BUILD.gn

@@ -8,7 +8,7 @@ import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
-import("../optimize_webui.gni")
+import("../tools/optimize_webui.gni")
 
 preprocess_folder = "preprocessed"
 preprocess_manifest = "preprocessed_manifest.json"

chrome/browser/resources/extensions/BUILD.gn

@@ -9,7 +9,7 @@ import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
-import("../optimize_webui.gni")
+import("../tools/optimize_webui.gni")
 
 preprocess_folder = "preprocessed"
 preprocess_manifest = "preprocessed_manifest.json"

chrome/browser/resources/history/BUILD.gn

@@ -8,7 +8,7 @@ import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
-import("../optimize_webui.gni")
+import("../tools/optimize_webui.gni")
 
 preprocess_folder = "preprocessed"
 preprocess_manifest = "preprocessed_manifest.json"

chrome/browser/resources/new_tab_page/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("//chrome/browser/resources/optimize_webui.gni")
+import("//chrome/browser/resources/tools/optimize_webui.gni")
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")

chrome/browser/resources/print_preview/BUILD.gn

@@ -8,7 +8,7 @@ import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
-import("../optimize_webui.gni")
+import("../tools/optimize_webui.gni")
 
 preprocess_folder = "preprocessed"
 preprocess_manifest = "preprocessed_manifest.json"

chrome/browser/resources/settings/BUILD.gn

@@ -12,7 +12,7 @@ import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("//ui/webui/webui_features.gni")
-import("../optimize_webui.gni")
+import("../tools/optimize_webui.gni")
 import("settings.gni")
 
 preprocess_folder = "preprocessed"

chrome/browser/resources/settings/chromeos/BUILD.gn

@@ -9,7 +9,7 @@ import("//tools/grit/preprocess_if_expr.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("//ui/webui/webui_features.gni")
-import("../../optimize_webui.gni")
+import("../../tools/optimize_webui.gni")
 import("./os_settings.gni")
 
 preprocess_folder_v2 = "preprocess_v2"

chrome/browser/resources/signin/profile_picker/BUILD.gn

@@ -8,7 +8,7 @@ import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
-import("../../optimize_webui.gni")
+import("../../tools/optimize_webui.gni")
 
 preprocess_folder = "preprocessed"
 preprocess_manifest = "preprocessed_manifest.json"

chrome/browser/resources/tab_search/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("//chrome/browser/resources/optimize_webui.gni")
+import("//chrome/browser/resources/tools/optimize_webui.gni")
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")

chrome/browser/resources/tools/PRESUBMIT.py

+# Copyright 2021 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.
+
+def _CheckChangeOnUploadOrCommit(input_api, output_api):
+  results = []
+  webui_sources = set(['optimize_webui.py', 'rollup_plugin.js'])
+  affected = input_api.AffectedFiles()
+  affected_files = [input_api.os_path.basename(f.LocalPath()) for f in affected]
+  if webui_sources.intersection(set(affected_files)):
+    results += RunOptimizeWebUiTests(input_api, output_api)
+  return results
+
+
+def RunOptimizeWebUiTests(input_api, output_api):
+  presubmit_path = input_api.PresubmitLocalPath()
+  sources = ['optimize_webui_test.py']
+  tests = [input_api.os_path.join(presubmit_path, s) for s in sources]
+  return input_api.canned_checks.RunUnitTests(input_api, output_api, tests)
+
+
+def CheckChangeOnUpload(input_api, output_api):
+  return _CheckChangeOnUploadOrCommit(input_api, output_api)
+
+
+def CheckChangeOnCommit(input_api, output_api):
+  return _CheckChangeOnUploadOrCommit(input_api, output_api)
+

chrome/browser/resources/optimize_webui.gni → chrome/browser/resources/tools/optimize_webui.gni

@@ -7,7 +7,8 @@ import("//build/config/python.gni")
 template("node") {
   # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
   python2_action(target_name) {
-    forward_variables_from(invoker, "*")
+    forward_variables_from(invoker, "*", TESTONLY_AND_VISIBILITY)
+    forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
 
     # Declare dependencies to all involved tools.
     inputs += [
@@ -30,7 +31,7 @@ template("node") {
 
 template("optimize_webui") {
   node(target_name) {
-    script = "//chrome/browser/resources/optimize_webui.py"
+    script = "//chrome/browser/resources/tools/optimize_webui.py"
 
     # This depfile is generated by optimize_webui.py
     depfile = "${target_gen_dir}/${target_name}.d"

chrome/browser/resources/optimize_webui.py → chrome/browser/resources/tools/optimize_webui.py

@@ -16,7 +16,7 @@ import tempfile
 
 
 _HERE_PATH = os.path.dirname(__file__)
-_SRC_PATH = os.path.normpath(os.path.join(_HERE_PATH, '..', '..', '..'))
+_SRC_PATH = os.path.normpath(os.path.join(_HERE_PATH, '..', '..', '..', '..'))
 _CWD = os.getcwd()  # NOTE(dbeam): this is typically out/<gn_name>/.
 
 sys.path.append(os.path.join(_SRC_PATH, 'third_party', 'node'))
@@ -209,7 +209,7 @@ def _bundle_v3(tmp_out_dir, in_path, out_path, manifest_out_path, args,
   if not os.path.exists(tmp_out_dir):
     os.makedirs(tmp_out_dir)
   path_to_plugin = os.path.join(
-      os.path.abspath(_HERE_PATH), 'tools', 'rollup_plugin.js')
+      os.path.abspath(_HERE_PATH), 'rollup_plugin.js')
   rollup_config_file = _generate_rollup_config(tmp_out_dir, path_to_plugin,
                                                in_path, args.host, excludes,
                                                external_paths)

chrome/browser/resources/webui_js_error/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("//chrome/browser/resources/optimize_webui.gni")
+import("//chrome/browser/resources/tools/optimize_webui.gni")
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")

ui/file_manager/audio_player/js/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("//chrome/browser/resources/optimize_webui.gni")
+import("//chrome/browser/resources/tools/optimize_webui.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 

ui/file_manager/video_player/js/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("//chrome/browser/resources/optimize_webui.gni")
+import("//chrome/browser/resources/tools/optimize_webui.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//third_party/closure_compiler/js_unit_tests.gni")
 import("//ui/file_manager/base/gn/js_test_gen_html.gni")