BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

8 files changed, 283 insertions, 14 deletions

diff --git a/chromium/ui/file_manager/file_manager/background/js/BUILD.gn b/chromium/ui/file_manager/file_manager/background/js/BUILD.gn
index e15d0f63c0c..ca79955ec83 100644
--- a/chromium/ui/file_manager/file_manager/background/js/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/background/js/BUILD.gn
@@ -219,6 +219,7 @@ js_library("drive_sync_handler") {
 js_unittest("drive_sync_handler_unittest") {
   deps = [
     ":drive_sync_handler",
+    ":file_operation_util",
     ":mock_progress_center",
     "//ui/file_manager/base/js:mock_chrome",
     "//ui/file_manager/base/js:test_error_reporting",
@@ -374,6 +375,7 @@ js_library("media_import_handler") {
 
 js_unittest("media_import_handler_unittest") {
   deps = [
+    ":file_operation_util",
     ":media_import_handler",
     ":mock_drive_sync_handler",
     ":mock_media_scanner",
diff --git a/chromium/ui/file_manager/file_manager/foreground/elements/BUILD.gn b/chromium/ui/file_manager/file_manager/foreground/elements/BUILD.gn
index ff2352ac56e..8cc31e64297 100644
--- a/chromium/ui/file_manager/file_manager/foreground/elements/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/foreground/elements/BUILD.gn
@@ -103,6 +103,10 @@ js_library("files_spinner") {
 # TODO(tapted): Move this to //ui/file_manager/base.
 js_library("files_toast") {
   visibility += [ "//ui/file_manager/gallery/*" ]
+  deps = [
+    "//ui/webui/resources/cr_elements/cr_button:cr_button",
+    "//ui/webui/resources/cr_elements/cr_toast:cr_toast",
+  ]
 }
 
 # TODO(tapted): Move this to //ui/file_manager/base.
diff --git a/chromium/ui/file_manager/file_manager/foreground/js/BUILD.gn b/chromium/ui/file_manager/file_manager/foreground/js/BUILD.gn
index 17706b170b7..338795f93e7 100644
--- a/chromium/ui/file_manager/file_manager/foreground/js/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/foreground/js/BUILD.gn
@@ -30,6 +30,7 @@ js_type_check("closure_compile_module") {
     ":closure_compile_externs",
     ":column_visibility_controller",
     ":constants",
+    ":crostini_controller",
     ":dialog_action_controller",
     ":dialog_type",
     ":directory_contents",
@@ -59,6 +60,7 @@ js_type_check("closure_compile_module") {
     ":naming_controller",
     ":navigation_list_model",
     ":navigation_uma",
+    ":path_component",
     ":progress_center_item_group",
     ":providers_model",
     ":quick_view_controller",
@@ -232,6 +234,15 @@ js_library("column_visibility_controller") {
 js_library("constants") {
 }
 
+js_library("crostini_controller") {
+  deps = [
+    ":directory_model",
+    ":file_manager_commands",
+    "ui:directory_tree",
+    "//ui/file_manager/file_manager/foreground/elements:files_message",
+  ]
+}
+
 js_library("dialog_action_controller") {
   deps = [
     ":dialog_type",
@@ -256,6 +267,7 @@ js_library("directory_contents") {
     ":file_list_model",
     "metadata:metadata_model",
     "//ui/file_manager/base/js:volume_manager_types",
+    "//ui/file_manager/externs:volume_manager",
     "//ui/file_manager/file_manager/common/js:async_util",
     "//ui/file_manager/file_manager/common/js:metrics",
     "//ui/file_manager/file_manager/common/js:util",
@@ -264,6 +276,16 @@ js_library("directory_contents") {
   ]
 }
 
+js_unittest("directory_contents_unittest") {
+  deps = [
+    ":directory_contents",
+    ":directory_model",
+    "//ui/file_manager/base/js:test_error_reporting",
+    "//ui/file_manager/base/js:volume_manager_types",
+    "//ui/file_manager/externs:volume_manager",
+  ]
+}
+
 js_library("directory_model") {
   deps = [
     ":directory_contents",
@@ -328,6 +350,7 @@ js_library("file_manager") {
     ":android_app_list_model",
     ":app_state_controller",
     ":column_visibility_controller",
+    ":crostini_controller",
     ":dialog_action_controller",
     ":dialog_type",
     ":directory_model",
@@ -371,6 +394,7 @@ js_library("file_manager_commands") {
     ":directory_model",
     ":directory_tree_naming_controller",
     ":file_selection",
+    ":file_tasks",
     ":file_transfer_controller",
     ":naming_controller",
     ":providers_model",
@@ -378,15 +402,18 @@ js_library("file_manager_commands") {
     ":task_controller",
     "ui:directory_tree",
     "ui:file_manager_ui",
+    "//ui/file_manager/file_manager/common/js:progress_center_common",
     "//ui/webui/resources/cr_elements/cr_input:cr_input",
   ]
-  externs_list = [ "//ui/file_manager/externs/command_handler_deps.js" ]
+  externs_list = [
+    "//ui/file_manager/externs/background/progress_center.js",
+    "//ui/file_manager/externs/command_handler_deps.js",
+  ]
 }
 
 js_unittest("file_manager_commands_unittest") {
   deps = [
     ":file_manager_commands",
-    ":file_tasks",
     "//ui/file_manager/file_manager/background/js:mock_volume_manager",
     "//ui/webui/resources/js:webui_resource_test",
   ]
@@ -409,12 +436,16 @@ js_library("file_selection") {
 js_library("file_tasks") {
   deps = [
     ":directory_model",
+    ":file_transfer_controller",
     ":naming_controller",
     ":task_history",
     "metadata:metadata_model",
     "ui:file_manager_ui",
   ]
-  externs_list = [ "//ui/file_manager/externs/background/crostini.js" ]
+  externs_list = [
+    "//ui/file_manager/externs/background/crostini.js",
+    "//ui/file_manager/externs/background/progress_center.js",
+  ]
 }
 
 js_unittest("file_tasks_unittest") {
@@ -631,6 +662,10 @@ js_unittest("navigation_list_model_unittest") {
   ]
 }
 
+js_library("path_component") {
+  deps = [ "//ui/file_manager/base/js:volume_manager_types" ]
+}
+
 js_library("progress_center_item_group") {
   deps = [
     "//ui/file_manager/file_manager/common/js:progress_center_common",
@@ -745,6 +780,7 @@ js_library("task_controller") {
     "metadata:metadata_model",
     "ui:file_manager_ui",
   ]
+  externs_list = [ "//ui/file_manager/externs/background/progress_center.js" ]
 }
 
 js_unittest("task_controller_unittest") {
@@ -806,6 +842,7 @@ js_library("webui_command_extender") {
 js_test_gen_html("js_test_gen_html") {
   deps = [
     ":actions_model_unittest",
+    ":directory_contents_unittest",
     ":file_list_model_unittest",
     ":file_manager_commands_unittest",
     ":file_tasks_unittest",
@@ -819,4 +856,5 @@ js_test_gen_html("js_test_gen_html") {
     ":task_controller_unittest",
     ":thumbnail_loader_unittest",
   ]
+  mocks = [ "$externs_path/file_manager_private.js" ]
 }
diff --git a/chromium/ui/file_manager/file_manager/foreground/js/ui/BUILD.gn b/chromium/ui/file_manager/file_manager/foreground/js/ui/BUILD.gn
index 2d16ed8d869..422d15d2972 100644
--- a/chromium/ui/file_manager/file_manager/foreground/js/ui/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/foreground/js/ui/BUILD.gn
@@ -48,6 +48,7 @@ js_type_check("closure_compile_module") {
     ":list_container",
     ":location_line",
     ":multi_menu",
+    ":multi_menu_button",
     ":progress_center_panel",
     ":providers_menu",
     ":search_box",
@@ -138,6 +139,7 @@ js_library("combobutton") {
   deps = [
     ":files_menu",
     ":multi_menu",
+    ":multi_menu_button",
     "//ui/file_manager/file_manager/foreground/elements:files_toggle_ripple",
   ]
   externs_list = [ "//ui/file_manager/externs/paper_elements.js" ]
@@ -277,6 +279,7 @@ js_library("file_manager_ui") {
     ":list_container",
     ":location_line",
     ":multi_menu",
+    ":multi_menu_button",
     ":progress_center_panel",
     ":providers_menu",
     ":search_box",
@@ -427,6 +430,7 @@ js_library("location_line") {
     "//ui/file_manager/file_manager/common/js:files_app_entry_types",
     "//ui/file_manager/file_manager/common/js:metrics",
     "//ui/file_manager/file_manager/common/js:util",
+    "//ui/file_manager/file_manager/foreground/js:path_component",
   ]
 }
 
@@ -434,6 +438,16 @@ js_library("multi_menu") {
   deps = [
     "//ui/webui/resources/js:event_tracker",
     "//ui/webui/resources/js/cr/ui:menu",
+    "//ui/webui/resources/js/cr/ui:menu_item",
+    "//ui/webui/resources/js/cr/ui:position_util",
+  ]
+  externs_list = [ "$externs_path/pending.js" ]
+}
+
+js_library("multi_menu_button") {
+  deps = [
+    "//ui/webui/resources/js:event_tracker",
+    "//ui/webui/resources/js/cr/ui:menu",
     "//ui/webui/resources/js/cr/ui:menu_button",
     "//ui/webui/resources/js/cr/ui:menu_item",
     "//ui/webui/resources/js/cr/ui:position_util",
@@ -444,6 +458,7 @@ js_library("multi_menu") {
 js_unittest("multi_menu_unittest") {
   deps = [
     ":multi_menu",
+    ":multi_menu_button",
     "//ui/file_manager/base/js:test_error_reporting",
     "//ui/file_manager/file_manager/common/js:util",
     "//ui/webui/resources/js:webui_resource_test",
diff --git a/chromium/ui/file_manager/file_manager/test/BUILD.gn b/chromium/ui/file_manager/file_manager/test/BUILD.gn
index f2a23d787d5..7f65381103e 100644
--- a/chromium/ui/file_manager/file_manager/test/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/test/BUILD.gn
@@ -19,7 +19,6 @@ action("create_test_main") {
     "//ui/file_manager/file_manager/foreground/js/elements_importer.js",
     "//ui/file_manager/file_manager/foreground/js/main_scripts.js",
     "//ui/file_manager/file_manager/main.html",
-    "//ui/webui/resources/css/text_defaults.css",
     "check_select.js",
     "crostini_mount.js",
     "crostini_share.js",
diff --git a/chromium/ui/file_manager/image_loader/BUILD.gn b/chromium/ui/file_manager/image_loader/BUILD.gn
index 567b2e8d651..072214e21ed 100644
--- a/chromium/ui/file_manager/image_loader/BUILD.gn
+++ b/chromium/ui/file_manager/image_loader/BUILD.gn
@@ -14,9 +14,9 @@ js_type_check("closure_compile_module") {
     ":image_loader",
     ":image_loader_client",
     ":image_loader_util",
+    ":image_request_task",
     ":load_image_request",
     ":piex_loader",
-    ":request",
     ":scheduler",
   ]
 }
@@ -39,9 +39,9 @@ js_unittest("cache_unittest") {
 js_library("image_loader") {
   deps = [
     ":cache",
+    ":image_request_task",
     ":load_image_request",
     ":piex_loader",
-    ":request",
     ":scheduler",
     "//ui/file_manager/externs:file_manager_private",
   ]
@@ -96,7 +96,7 @@ js_library("piex_loader") {
   externs_list = [ "//ui/file_manager/externs/platform.js" ]
 }
 
-js_library("request") {
+js_library("image_request_task") {
   deps = [
     ":cache",
     ":image_loader_util",
@@ -108,7 +108,14 @@ js_library("request") {
 }
 
 js_library("scheduler") {
-  deps = [ ":request" ]
+  deps = [ ":image_request_task" ]
+}
+
+js_unittest("scheduler_unittest") {
+  deps = [
+    ":scheduler",
+    "//ui/webui/resources/js:webui_resource_test",
+  ]
 }
 
 js_test_gen_html("js_test_gen_html") {
@@ -117,6 +124,7 @@ js_test_gen_html("js_test_gen_html") {
     ":cache_unittest",
     ":image_loader_client_unittest",
     ":image_loader_unittest",
+    ":scheduler_unittest",
   ]
 }
 
diff --git a/chromium/ui/file_manager/integration_tests/BUILD.gn b/chromium/ui/file_manager/integration_tests/BUILD.gn
index 5f56947117e..c294aeea41d 100644
--- a/chromium/ui/file_manager/integration_tests/BUILD.gn
+++ b/chromium/ui/file_manager/integration_tests/BUILD.gn
@@ -26,6 +26,6 @@ js_library("test_util") {
   testonly = true
   externs_list = [
     "$externs_path/chrome_extensions.js",
-    "//ui/file_manager/externs/chrome_test.js",
+    "$externs_path/test.js",
   ]
 }
diff --git a/chromium/ui/file_manager/integration_tests/file_manager/BUILD.gn b/chromium/ui/file_manager/integration_tests/file_manager/BUILD.gn
index 3110468a322..bad7ab9a689 100644
--- a/chromium/ui/file_manager/integration_tests/file_manager/BUILD.gn
+++ b/chromium/ui/file_manager/integration_tests/file_manager/BUILD.gn
@@ -14,7 +14,40 @@ js_type_check("closure_compile") {
     ":create_new_folder",
     ":crostini",
     ":directory_tree",
+    ":directory_tree_context_menu",
+    ":drive_specific",
     ":file_dialog",
+    ":file_display",
+    ":file_list",
+    ":files_tooltip",
+    ":folder_shortcuts",
+    ":format_dialog",
+    ":gear_menu",
+    ":grid_view",
+    ":install_linux_package_dialog",
+    ":keyboard_operations",
+    ":launcher_search",
+    ":metadata",
+    ":metrics",
+    ":my_files",
+    ":open_audio_files",
+    ":open_image_files",
+    ":open_video_files",
+    ":providers",
+    ":quick_view",
+    ":recents",
+    ":restore_geometry",
+    ":restore_prefs",
+    ":search",
+    ":share_and_manage_dialog",
+    ":sort_columns",
+    ":suggest_app_dialog",
+    ":tab_index",
+    ":tasks",
+    ":toolbar",
+    ":transfer",
+    ":traverse",
+    ":zip_files",
   ]
 }
 
@@ -27,11 +60,6 @@ js_library("background") {
   ]
 }
 
-js_library("file_dialog") {
-  testonly = true
-  deps = []
-}
-
 js_library("breadcrumbs") {
   testonly = true
   deps = []
@@ -61,3 +89,178 @@ js_library("directory_tree") {
   testonly = true
   deps = []
 }
+
+js_library("directory_tree_context_menu") {
+  testonly = true
+  deps = []
+}
+
+js_library("drive_specific") {
+  testonly = true
+  deps = []
+}
+
+js_library("file_dialog") {
+  testonly = true
+  deps = []
+}
+
+js_library("file_display") {
+  testonly = true
+  deps = []
+}
+
+js_library("file_list") {
+  testonly = true
+  deps = []
+}
+
+js_library("files_tooltip") {
+  testonly = true
+  deps = []
+}
+
+js_library("folder_shortcuts") {
+  testonly = true
+  deps = []
+}
+
+js_library("format_dialog") {
+  testonly = true
+  deps = []
+}
+
+js_library("gear_menu") {
+  testonly = true
+  deps = []
+}
+
+js_library("grid_view") {
+  testonly = true
+  deps = []
+}
+
+js_library("install_linux_package_dialog") {
+  testonly = true
+  deps = []
+}
+
+js_library("keyboard_operations") {
+  testonly = true
+  deps = []
+}
+
+js_library("launcher_search") {
+  testonly = true
+  deps = []
+}
+
+js_library("metadata") {
+  testonly = true
+  deps = []
+}
+
+js_library("metrics") {
+  testonly = true
+  deps = []
+}
+
+js_library("my_files") {
+  testonly = true
+  deps = []
+}
+
+js_library("open_audio_files") {
+  testonly = true
+  deps = []
+}
+
+js_library("open_image_files") {
+  testonly = true
+  deps = []
+}
+
+js_library("open_sniffed_files") {
+  testonly = true
+  deps = []
+}
+
+js_library("open_video_files") {
+  testonly = true
+  deps = []
+}
+
+js_library("providers") {
+  testonly = true
+  deps = []
+}
+
+js_library("quick_view") {
+  testonly = true
+  deps = []
+}
+
+js_library("recents") {
+  testonly = true
+  deps = []
+}
+
+js_library("restore_geometry") {
+  testonly = true
+  deps = []
+}
+
+js_library("restore_prefs") {
+  testonly = true
+  deps = []
+}
+
+js_library("search") {
+  testonly = true
+  deps = []
+}
+
+js_library("share_and_manage_dialog") {
+  testonly = true
+  deps = []
+}
+
+js_library("sort_columns") {
+  testonly = true
+  deps = []
+}
+
+js_library("suggest_app_dialog") {
+  testonly = true
+  deps = []
+}
+
+js_library("tab_index") {
+  testonly = true
+  deps = []
+}
+
+js_library("tasks") {
+  testonly = true
+  deps = []
+}
+
+js_library("toolbar") {
+  testonly = true
+  deps = []
+}
+
+js_library("transfer") {
+  testonly = true
+  deps = []
+}
+
+js_library("traverse") {
+  testonly = true
+  deps = []
+}
+
+js_library("zip_files") {
+  testonly = true
+  deps = []
+}