1 files changed, 51 insertions, 27 deletions

diff --git a/chromium/ui/file_manager/file_manager/common/js/BUILD.gn b/chromium/ui/file_manager/file_manager/common/js/BUILD.gn
index d2681715d5d..01f7e685d5c 100644
--- a/chromium/ui/file_manager/file_manager/common/js/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/common/js/BUILD.gn
@@ -4,7 +4,7 @@
 
 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")
 import("//ui/webui/resources/js/cr.gni")
 
 visibility = [
@@ -16,7 +16,7 @@ group("closure_compile") {
   testonly = true
   deps = [
     ":closure_compile_jsmodules",
-    ":js_test_gen_html_modules_type_check_auto",
+    ":js_test_type_check",
     ":test_support_modules_type_check",
   ]
 }
@@ -34,14 +34,15 @@ group("js_modules") {
     ":files_app_entry_types",
     ":filtered_volume_manager",
     ":glitch",
+    ":icon_util",
     ":importer_common",
     ":lru_cache",
-    ":mediasession_types",
     ":metrics",
     ":metrics_base",
     ":notifications_browser_proxy",
     ":power",
     ":progress_center_common",
+    ":recent_date_bucket",
     ":storage_adapter",
     ":trash",
     ":url_constants",
@@ -63,6 +64,7 @@ js_type_check("closure_compile_jsmodules") {
     ":files_app_entry_types",
     ":filtered_volume_manager",
     ":glitch",
+    ":icon_util",
     ":importer_common",
     ":lru_cache",
     ":metrics",
@@ -72,6 +74,7 @@ js_type_check("closure_compile_jsmodules") {
     ":notifications_browser_proxy",
     ":power",
     ":progress_center_common",
+    ":recent_date_bucket",
     ":storage_adapter",
     ":trash",
     ":url_constants",
@@ -81,6 +84,7 @@ js_type_check("closure_compile_jsmodules") {
   ]
 
   closure_flags = strict_error_checking_closure_args + [
+                    "language_in=ECMASCRIPT_2020",
                     "js_module_root=./gen/ui",
                     "js_module_root=../../ui",
                     "hide_warnings_for=third_party/",
@@ -98,9 +102,10 @@ js_type_check("test_support_modules_type_check") {
 
   closure_flags =
       strict_error_checking_closure_args + [
+        "language_in=ECMASCRIPT_2020",
         "js_module_root=./gen/ui",
         "js_module_root=../../ui",
-        "browser_resolver_prefix_replacements=\"chrome://test/=./\"",
+        "browser_resolver_prefix_replacements=\"chrome://webui-test/=./\"",
       ]
 }
 
@@ -132,7 +137,7 @@ js_library("glitch") {
 js_library("dialog_type") {
 }
 
-js_unittest("files_app_entry_types_unittest.m") {
+js_unittest("files_app_entry_types_unittest") {
   deps = [
     ":files_app_entry_types",
     ":mock_entry",
@@ -145,6 +150,7 @@ js_unittest("files_app_entry_types_unittest.m") {
 
 js_library("files_app_entry_types") {
   deps = [
+    ":icon_util",
     "//ui/file_manager/file_manager/common/js:volume_manager_types",
     "//ui/file_manager/file_manager/externs:volume_info",
   ]
@@ -172,7 +178,7 @@ js_library("file_type") {
   ]
 }
 
-js_unittest("file_type_unittest.m") {
+js_unittest("file_type_unittest") {
   deps = [
     ":file_type",
     ":mock_entry",
@@ -205,7 +211,7 @@ js_library("filtered_volume_manager") {
   ]
 }
 
-js_unittest("filtered_volume_manager_unittest.m") {
+js_unittest("filtered_volume_manager_unittest") {
   deps = [
     ":filtered_volume_manager",
     "//chrome/test/data/webui:chai_assert",
@@ -237,7 +243,7 @@ js_library("test_importer_common") {
   ]
 }
 
-js_unittest("importer_common_unittest.m") {
+js_unittest("importer_common_unittest") {
   deps = [
     ":importer_common",
     ":mock_entry",
@@ -254,16 +260,13 @@ js_unittest("importer_common_unittest.m") {
 js_library("lru_cache") {
 }
 
-js_unittest("lru_cache_unittest.m") {
+js_unittest("lru_cache_unittest") {
   deps = [
     ":lru_cache",
     "//chrome/test/data/webui:chai_assert",
   ]
 }
 
-js_library("mediasession_types") {
-}
-
 js_library("metrics") {
   visibility = []
   visibility = [ "//ui/file_manager/file_manager/*" ]
@@ -297,11 +300,27 @@ js_library("progress_center_common") {
 js_library("power") {
 }
 
+js_library("recent_date_bucket") {
+  deps = [
+    ":util",
+    "//ui/file_manager/file_manager/externs:file_manager_private",
+  ]
+}
+
+js_unittest("recent_date_bucket_unittest") {
+  deps = [
+    ":mock_chrome",
+    ":recent_date_bucket",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
+}
+
 js_library("storage_adapter") {
   externs_list = [ "$externs_path/chrome_extensions.js" ]
 }
 
-js_unittest("storage_adapter_unittest.m") {
+js_unittest("storage_adapter_unittest") {
   deps = [
     ":storage_adapter",
     "//chrome/test/data/webui:chai_assert",
@@ -323,11 +342,11 @@ js_library("xfm") {
 js_library("trash") {
   deps = [
     ":files_app_entry_types",
+    ":metrics",
     ":util",
     "//ui/file_manager/file_manager/common/js:volume_manager_types",
     "//ui/file_manager/file_manager/externs:files_app_entry_interfaces",
     "//ui/file_manager/file_manager/externs:volume_manager",
-    "//ui/webui/resources/js:assert.m",
   ]
 }
 
@@ -350,7 +369,6 @@ js_library("util") {
     "//ui/file_manager/file_manager/externs:volume_manager",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
-    "//ui/webui/resources/js:util.m",
     "//ui/webui/resources/js/cr:ui.m",
   ]
 
@@ -360,7 +378,7 @@ js_library("util") {
   ]
 }
 
-js_unittest("util_unittest.m") {
+js_unittest("util_unittest") {
   deps = [
     ":files_app_entry_types",
     ":mock_entry",
@@ -371,7 +389,7 @@ js_unittest("util_unittest.m") {
   ]
 }
 
-js_unittest("volume_manager_types_unittest.m") {
+js_unittest("volume_manager_types_unittest") {
   deps = [ ":volume_manager_types" ]
 }
 
@@ -382,23 +400,29 @@ js_library("volume_manager_types") {
   ]
 }
 
-js_test_gen_html("js_test_gen_html_modules") {
+js_library("icon_util") {
+  deps = [ "//ui/file_manager/file_manager/externs:file_manager_private" ]
+}
+
+js_test_type_check("js_test_type_check") {
   deps = [
-    ":file_type_unittest.m",
-    ":files_app_entry_types_unittest.m",
-    ":filtered_volume_manager_unittest.m",
-    ":importer_common_unittest.m",
-    ":lru_cache_unittest.m",
-    ":storage_adapter_unittest.m",
-    ":util_unittest.m",
-    ":volume_manager_types_unittest.m",
+    ":file_type_unittest",
+    ":files_app_entry_types_unittest",
+    ":filtered_volume_manager_unittest",
+    ":importer_common_unittest",
+    ":lru_cache_unittest",
+    ":recent_date_bucket_unittest",
+    ":storage_adapter_unittest",
+    ":util_unittest",
+    ":volume_manager_types_unittest",
   ]
 
   closure_flags =
       strict_error_checking_closure_args + [
+        "language_in=ECMASCRIPT_2020",
         "js_module_root=./gen/ui",
         "js_module_root=../../ui",
-        "browser_resolver_prefix_replacements=\"chrome://test/=./\"",
+        "browser_resolver_prefix_replacements=\"chrome://webui-test/=./\"",
         "hide_warnings_for=third_party/",
       ]
 }