BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 49 insertions, 2 deletions

diff --git a/chromium/chromeos/resources/BUILD.gn b/chromium/chromeos/resources/BUILD.gn
index b3ba08270e5..836ddd1c0a5 100644
--- a/chromium/chromeos/resources/BUILD.gn
+++ b/chromium/chromeos/resources/BUILD.gn
@@ -37,6 +37,32 @@ grit("resources") {
     "//chromeos/services/machine_learning/public/mojom:mojom_js",
     "//chromeos/services/multidevice_setup/public/mojom:mojom_js",
     "//chromeos/services/network_config/public/mojom:mojom_js",
+    "//chromeos/services/network_health/public/mojom:mojom_js",
+  ]
+}
+
+# Resources used by chrome://camera-app.
+grit("camera_app_resources") {
+  source = "../components/camera_app_ui/resources/camera_app_resources.grd"
+
+  outputs = [
+    "grit/chromeos_camera_app_resources.h",
+    "grit/chromeos_camera_app_resources_map.cc",
+    "grit/chromeos_camera_app_resources_map.h",
+    "chromeos_camera_app_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/chromeos"
+
+  grit_flags = [
+    "-E",
+    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+  ]
+
+  deps = [
+    "//chromeos/components/camera_app_ui:mojo_bindings_js",
+    "//media/capture/video/chromeos/mojom:cros_camera_js",
+    "//mojo/public/js:bindings_lite",
+    "//third_party/blink/public/mojom:mojom_platform_js",
   ]
 }
 
@@ -95,6 +121,27 @@ grit("sample_system_web_app_resources") {
   output_dir = "$root_gen_dir/chromeos"
 }
 
+# Resources used by chrome://telemetry-extension
+grit("telemetry_extension_resources") {
+  source = "../components/telemetry_extension_ui/resources/telemetry_extension_resources.grd"
+
+  deps = [ "../components/telemetry_extension_ui/mojom:mojom_js" ]
+
+  outputs = [
+    "grit/chromeos_telemetry_extension_resources.h",
+    "grit/chromeos_telemetry_extension_resources_map.cc",
+    "grit/chromeos_telemetry_extension_resources_map.h",
+    "chromeos_telemetry_extension_resources.pak",
+  ]
+
+  grit_flags = [
+    "-E",
+    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+  ]
+
+  output_dir = "$root_gen_dir/chromeos"
+}
+
 # Resources used by chrome://media-app, and parts of the sandboxed app it hosts
 # that do not come from the app bundle (below).
 grit("media_app_resources") {
@@ -119,8 +166,8 @@ grit("media_app_resources") {
 # Resources automatically served by the chrome://media-app bundle, obtained via DEPS.
 grit("media_app_bundle_resources") {
   if (enable_cros_media_app) {
-    # Obtained via src-internal/DEPS.
-    source = "../components/media_app_ui/resources/pkg/media_app_bundle_resources.grd"
+    # Obtained via an internal CIPD package in src/DEPS.
+    source = "../components/media_app_ui/resources/prod/media_app_bundle_resources.grd"
   } else {
     source = "../components/media_app_ui/resources/mock/media_app_bundle_mock_resources.grd"
   }