1 files changed, 19 insertions, 17 deletions

diff --git a/chromium/ui/file_manager/image_loader/BUILD.gn b/chromium/ui/file_manager/image_loader/BUILD.gn
index 56678dec7c3..f998277ba47 100644
--- a/chromium/ui/file_manager/image_loader/BUILD.gn
+++ b/chromium/ui/file_manager/image_loader/BUILD.gn
@@ -5,17 +5,18 @@
 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")
+import("//ui/file_manager/base/gn/js_test_type_check.gni")
 
 js_type_check("closure_compile_jsmodules") {
   closure_flags = default_closure_args + [
+                    "language_in=ECMASCRIPT_2020",
                     "jscomp_error=strictCheckTypes",
                     "js_module_root=gen/ui/file_manager/",
                     "js_module_root=../../ui/file_manager/",
                     "browser_resolver_prefix_replacements=\"chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/=./file_manager/\"",
                   ]
   deps = [
-    ":background.m",
+    ":background",
     ":cache",
     ":image_loader_client",
     ":image_loader_util",
@@ -26,13 +27,13 @@ js_type_check("closure_compile_jsmodules") {
   ]
 }
 
-js_library("background.m") {
+js_library("background") {
 }
 
 js_library("cache") {
 }
 
-js_unittest("cache_unittest.m") {
+js_unittest("cache_unittest") {
   deps = [
     ":load_image_request",
     "//chrome/test/data/webui:chai_assert",
@@ -70,7 +71,7 @@ js_library("image_loader") {
   ]
 }
 
-js_unittest("image_loader_unittest.m") {
+js_unittest("image_loader_unittest") {
   deps = [
     ":image_loader_util",
     ":image_orientation",
@@ -106,7 +107,7 @@ js_library("image_loader_client") {
   ]
 }
 
-js_unittest("image_loader_client_unittest.m") {
+js_unittest("image_loader_client_unittest") {
   deps = [
     ":image_loader_client",
     ":load_image_request",
@@ -141,7 +142,7 @@ js_library("scheduler") {
   deps = [ ":image_request_task" ]
 }
 
-js_unittest("scheduler_unittest.m") {
+js_unittest("scheduler_unittest") {
   deps = [
     ":image_request_task",
     ":scheduler",
@@ -149,19 +150,20 @@ js_unittest("scheduler_unittest.m") {
   ]
 }
 
-js_test_gen_html("js_test_gen_html_modules") {
+js_test_type_check("js_test_type_check") {
   deps = [
-    ":cache_unittest.m",
-    ":image_loader_client_unittest.m",
-    ":image_loader_unittest.m",
-    ":scheduler_unittest.m",
+    ":cache_unittest",
+    ":image_loader_client_unittest",
+    ":image_loader_unittest",
+    ":scheduler_unittest",
   ]
 
   closure_flags = strict_error_checking_closure_args + [
+                    "language_in=ECMASCRIPT_2020",
                     "js_module_root=./gen/ui",
                     "js_module_root=../../ui/file_manager/",
                     "js_module_root=./gen/ui/file_manager/",
-                    "browser_resolver_prefix_replacements=\"chrome://test/=./\"",
+                    "browser_resolver_prefix_replacements=\"chrome://webui-test/=./\"",
                     "browser_resolver_prefix_replacements=\"chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/=./file_manager/\"",
                   ]
 }
@@ -170,7 +172,7 @@ group("closure_compile") {
   testonly = true
   deps = [
     ":closure_compile_jsmodules",
-    ":js_test_gen_html_modules_type_check_auto",
+    ":js_test_type_check",
   ]
 }
 
@@ -203,9 +205,9 @@ optimize_webui("build") {
   host = "image_loader"
 
   input = preprocess_folder
-  js_module_in_files = [ "background.m.js" ]
+  js_module_in_files = [ "background.js" ]
 
-  js_out_files = [ "background.m.rollup.js" ]
+  js_out_files = [ "background.rollup.js" ]
 
   external_paths = [
     "chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj|$files_app_path",
@@ -213,7 +215,7 @@ optimize_webui("build") {
   ]
 
   deps = [
-    ":background.m",
+    ":background",
     "//ui/file_manager:preprocess_generated",
     "//ui/file_manager:preprocess_generated_image_loader",
     "//ui/file_manager:preprocess_static",