BASELINE: Update Chromium to 83.0.4103.122

Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

13 files changed, 117 insertions, 85 deletions

diff --git a/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn
index 02f976656cf..af8c9e69867 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn
@@ -5,9 +5,7 @@
 chrome_camera_app_dir = "$root_out_dir/resources/chromeos/camera"
 
 group("closure_compile") {
-  deps = [
-    "src/js:closure_compile",
-  ]
+  deps = [ "src/js:closure_compile" ]
 }
 
 group("chrome_camera_app") {
@@ -25,6 +23,7 @@ group("chrome_camera_app") {
     ":chrome_camera_app_js",
     ":chrome_camera_app_js_browser_proxy",
     ":chrome_camera_app_js_device",
+    ":chrome_camera_app_js_lib",
     ":chrome_camera_app_js_models",
     ":chrome_camera_app_js_mojo",
     ":chrome_camera_app_js_views",
@@ -36,23 +35,15 @@ group("chrome_camera_app") {
 }
 
 copy("chrome_camera_app_base") {
-  sources = [
-    "src/manifest.json",
-  ]
+  sources = [ "src/manifest.json" ]
 
-  outputs = [
-    "$chrome_camera_app_dir/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_css") {
-  sources = [
-    "src/css/main.css",
-  ]
+  sources = [ "src/css/main.css" ]
 
-  outputs = [
-    "$chrome_camera_app_dir/css/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/css/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_images") {
@@ -101,21 +92,20 @@ copy("chrome_camera_app_images") {
     "src/images/spinner.svg",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/images/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/images/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_js") {
   sources = [
     "src/js/background.js",
+    "src/js/background_ops.js",
     "src/js/chrome_util.js",
     "src/js/gallerybutton.js",
-    "src/js/google-analytics-bundle.js",
     "src/js/intent.js",
     "src/js/main.js",
     "src/js/metrics.js",
     "src/js/nav.js",
+    "src/js/perf.js",
     "src/js/sound.js",
     "src/js/state.js",
     "src/js/toast.js",
@@ -124,19 +114,17 @@ copy("chrome_camera_app_js") {
     "src/js/util.js",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/js/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/js/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_js_browser_proxy") {
   sources = [
+    # TODO(b/129956426): Remove dependency used only in closure compiler check.
     "src/js/browser_proxy/browser_proxy.js",
+    "src/js/browser_proxy/browser_proxy_interface.js",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/js/browser_proxy/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/js/browser_proxy/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_js_device") {
@@ -147,25 +135,29 @@ copy("chrome_camera_app_js_device") {
     "src/js/device/error.js",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/js/device/{{source_file_part}}",
+  outputs = [ "$chrome_camera_app_dir/js/device/{{source_file_part}}" ]
+}
+
+copy("chrome_camera_app_js_lib") {
+  sources = [
+    "src/js/lib/comlink.js",
+    "src/js/lib/google-analytics-bundle.js",
   ]
+
+  outputs = [ "$chrome_camera_app_dir/js/lib/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_js_models") {
   sources = [
-    "src/js/models/file_video_saver.js",
+    "src/js/models/async_writer.js",
     "src/js/models/filenamer.js",
     "src/js/models/filesystem.js",
-    "src/js/models/gallery.js",
-    "src/js/models/intent_video_saver.js",
     "src/js/models/result_saver.js",
-    "src/js/models/video_saver_interface.js",
+    "src/js/models/video_processor.js",
+    "src/js/models/video_saver.js",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/js/models/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/js/models/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_js_mojo") {
@@ -175,9 +167,7 @@ copy("chrome_camera_app_js_mojo") {
     "src/js/mojo/image_capture.js",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/js/mojo/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/js/mojo/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_js_views") {
@@ -190,9 +180,7 @@ copy("chrome_camera_app_js_views") {
     "src/js/views/warning.js",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/js/views/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/js/views/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_js_views_camera") {
@@ -206,9 +194,7 @@ copy("chrome_camera_app_js_views_camera") {
     "src/js/views/camera/timertick.js",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/js/views/camera/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/js/views/camera/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_sounds") {
@@ -221,19 +207,16 @@ copy("chrome_camera_app_sounds") {
     "src/sounds/tick_start.ogg",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/sounds/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/sounds/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_views") {
   sources = [
+    "src/views/background.html",
     "src/views/main.html",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/views/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/views/{{source_file_part}}" ]
 }
 
 copy("chrome_camera_app_mojo_generated") {
@@ -246,6 +229,8 @@ copy("chrome_camera_app_mojo_generated") {
     "$root_gen_dir/media/capture/video/chromeos/mojom/camera_metadata.mojom-lite.js",
     "$root_gen_dir/media/capture/video/chromeos/mojom/camera_metadata_tags.mojom-lite.js",
     "$root_gen_dir/mojo/public/js/mojo_bindings_lite.js",
+    "$root_gen_dir/mojo/public/mojom/base/time.mojom-lite.js",
+    "$root_gen_dir/third_party/blink/public/mojom/idle/idle_manager.mojom-lite.js",
     "$root_gen_dir/ui/gfx/geometry/mojom/geometry.mojom-lite.js",
     "$root_gen_dir/ui/gfx/range/mojom/range.mojom-lite.js",
   ]
@@ -257,11 +242,10 @@ copy("chrome_camera_app_mojo_generated") {
     "//media/capture/mojom:image_capture_js",
     "//media/capture/video/chromeos/mojom:cros_camera_js",
     "//mojo/public/js:bindings_lite",
+    "//third_party/blink/public/mojom:mojom_platform_js",
     "//ui/gfx/geometry/mojom:mojom_js",
     "//ui/gfx/range/mojom:mojom_js",
   ]
 
-  outputs = [
-    "$chrome_camera_app_dir/js/mojo/{{source_file_part}}",
-  ]
+  outputs = [ "$chrome_camera_app_dir/js/mojo/{{source_file_part}}" ]
 }
diff --git a/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd b/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd
index 9bf9333cb40..eacbf35d140 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd
+++ b/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd
@@ -12,21 +12,23 @@
   </outputs>
   <release seq="1">
     <structures>
+      <structure name="IDR_CAMERA_ASYNC_WRITER_JS" file="src/js/models/async_writer.js" type="chrome_html" />
       <structure name="IDR_CAMERA_BACKGROUND_JS" file="src/js/background.js" type="chrome_html" />
-      <structure name="IDR_CAMERA_BUNDLE_JS" file="src/js/google-analytics-bundle.js" type="chrome_html" />
+      <structure name="IDR_CAMERA_BUNDLE_JS" file="src/js/lib/google-analytics-bundle.js" type="chrome_html" />
       <structure name="IDR_CAMERA_CAMERA3_DEVICE_INFO_JS" file="src/js/device/camera3_device_info.js" type="chrome_html" />
       <structure name="IDR_CAMERA_CAMERA_JS" file="src/js/views/camera.js" type="chrome_html" />
       <structure name="IDR_CAMERA_CAMERA_INTENT_JS" file="src/js/views/camera_intent.js" type="chrome_html" />
+      <structure name="IDR_CAMERA_COMLINK_JS" file="src/js/lib/comlink.js" type="chrome_html" />
       <structure name="IDR_CAMERA_CONSTRAINTS_PREFERRER_JS" file="src/js/device/constraints_preferrer.js" type="chrome_html" />
       <structure name="IDR_CAMERA_CHROME_HELPER_JS" file="src/js/mojo/chrome_helper.js" type="chrome_html" />
       <structure name="IDR_CAMERA_CHROME_UTIL_JS" file="src/js/chrome_util.js" type="chrome_html" />
+      <structure name="IDR_CAMERA_BACKGROUND_OPS_JS" file="src/js/background_ops.js" type="chrome_html" />
       <structure name="IDR_CAMERA_DEVICE_OPERATOR_JS" file="src/js/mojo/device_operator.js" type="chrome_html" />
       <structure name="IDR_CAMERA_DEVICE_INFO_UPDATER_JS" file="src/js/device/device_info_updater.js" type="chrome_html" />
       <structure name="IDR_CAMERA_DIALOG_JS" file="src/js/views/dialog.js" type="chrome_html" />
       <structure name="IDR_CAMERA_ERROR_JS" file="src/js/device/error.js" type="chrome_html" />
       <structure name="IDR_CAMERA_FILENAMER_JS" file="src/js/models/filenamer.js" type="chrome_html" />
       <structure name="IDR_CAMERA_FILESYSTEM_JS" file="src/js/models/filesystem.js" type="chrome_html" />
-      <structure name="IDR_CAMERA_GALLERY_JS" file="src/js/models/gallery.js" type="chrome_html" />
       <structure name="IDR_CAMERA_GALLERYBUTTON_JS" file="src/js/gallerybutton.js" type="chrome_html" />
       <structure name="IDR_CAMERA_IMAGECAPTURE_JS" file="src/js/mojo/image_capture.js" type="chrome_html" />
       <structure name="IDR_CAMERA_INTENT_JS" file="src/js/intent.js" type="chrome_html" />
@@ -39,6 +41,7 @@
       <structure name="IDR_CAMERA_MODES_JS" file="src/js/views/camera/modes.js" type="chrome_html" />
       <structure name="IDR_CAMERA_NAV_JS" file="src/js/nav.js" type="chrome_html" />
       <structure name="IDR_CAMERA_OPTIONS_JS" file="src/js/views/camera/options.js" type="chrome_html" />
+      <structure name="IDR_CAMERA_PERF_JS" file="src/js/perf.js" type="chrome_html" />
       <structure name="IDR_CAMERA_PREVIEW_JS" file="src/js/views/camera/preview.js" type="chrome_html" />
       <structure name="IDR_CAMERA_RECORDTIME_JS" file="src/js/views/camera/recordtime.js" type="chrome_html" />
       <structure name="IDR_CAMERA_RESULT_SAVER_JS" file="src/js/models/result_saver.js" type="chrome_html" />
@@ -51,9 +54,8 @@
       <structure name="IDR_CAMERA_TOOLTIP_JS" file="src/js/tooltip.js" type="chrome_html" />
       <structure name="IDR_CAMERA_TYPE_JS" file="src/js/type.js" type="chrome_html" />
       <structure name="IDR_CAMERA_UTIL_JS" file="src/js/util.js" type="chrome_html" />
-      <structure name="IDR_CAMERA_VIDEO_SAVER_INTERFACE_JS" file="src/js/models/video_saver_interface.js" type="chrome_html" />
-      <structure name="IDR_CAMERA_INTENT_VIDEO_SAVER_JS" file="src/js/models/file_video_saver.js" type="chrome_html" />
-      <structure name="IDR_CAMERA_FILE_VIDEO_SAVER_JS" file="src/js/models/intent_video_saver.js" type="chrome_html" />
+      <structure name="IDR_CAMERA_VIDEO_SAVER_JS" file="src/js/models/video_saver.js" type="chrome_html" />
+      <structure name="IDR_CAMERA_VIDEO_PROCESSOR_JS" file="src/js/models/video_processor.js" type="chrome_html" />
       <structure name="IDR_CAMERA_VIEW_JS" file="src/js/views/view.js" type="chrome_html" />
       <structure name="IDR_CAMERA_WARNING_JS" file="src/js/views/warning.js" type="chrome_html" />
       <structure name="IDR_CAMERA_WEBUI_BROWSER_PROXY" file="src/js/browser_proxy/webui_browser_proxy.js" type="chrome_html" />
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn
index 703e8951e28..eaf9be78d83 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn
@@ -18,12 +18,14 @@ group("closure_compile") {
 js_type_check("compile_resources") {
   deps = [
     ":background",
+    ":background_ops",
     ":chrome_util",
     ":gallerybutton",
     ":intent",
     ":main",
     ":metrics",
     ":nav",
+    ":perf",
     ":sound",
     ":state",
     ":toast",
@@ -38,6 +40,9 @@ js_library("chrome_util") {
 
 js_library("intent") {
   deps = [
+    ":chrome_util",
+    ":metrics",
+    ":type",
     "mojo:chrome_helper",
   ]
 }
@@ -45,7 +50,9 @@ js_library("intent") {
 js_library("gallerybutton") {
   deps = [
     ":chrome_util",
-    "models:gallery",
+    "models:filesystem",
+    "models:result_saver",
+    "models:video_saver",
   ]
   externs_list = [
     "$externs_path/file_manager_private.js",
@@ -55,6 +62,7 @@ js_library("gallerybutton") {
 
 js_library("metrics") {
   deps = [
+    ":state",
     "externs:chrome_platform_analytics",
   ]
 }
@@ -67,13 +75,14 @@ js_library("type") {
 
 js_library("main") {
   deps = [
+    ":background_ops",
     ":chrome_util",
     ":gallerybutton",
     ":intent",
     ":state",
+    ":type",
     "device:constraints_preferrer",
     "device:device_info_updater",
-    "models:gallery",
     "views:camera",
     "views:camera_intent",
     "views:dialog",
@@ -89,28 +98,46 @@ js_library("nav") {
   ]
 }
 
+js_library("perf") {
+}
+
 js_library("state") {
+  deps = [
+    ":perf",
+    ":type",
+    "views:view",
+  ]
 }
 
 js_library("background") {
   deps = [
+    ":background_ops",
     ":intent",
   ]
 }
 
-js_library("toast") {
+js_library("background_ops") {
   deps = [
-    ":util",
+    ":chrome_util",
+    ":intent",
+    ":perf",
   ]
 }
 
+js_library("toast") {
+  deps = [ ":util" ]
+}
+
 js_library("tooltip") {
+  deps = [ ":chrome_util" ]
 }
 
 js_library("util") {
   deps = [
     ":tooltip",
+    ":type",
     "browser_proxy:browser_proxy",
+    "externs:w3c_fileapi",
     "mojo:chrome_helper",
   ]
   externs_list = [ "$externs_path/chrome_extensions.js" ]
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/browser_proxy/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/browser_proxy/BUILD.gn
index aa71df45125..909b9b4aea2 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/src/js/browser_proxy/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/browser_proxy/BUILD.gn
@@ -5,16 +5,24 @@
 import("//third_party/closure_compiler/compile_js.gni")
 
 js_type_check("closure_compile") {
-  deps = [
-    ":browser_proxy",
-  ]
+  deps = [ ":browser_proxy" ]
 }
 
 js_library("browser_proxy") {
+  deps = [
+    "..:chrome_util",
+    "../mojo:chrome_helper",
+  ]
   sources = [
     "browser_proxy.js",
     "browser_proxy_interface.js",
     "webui_browser_proxy.js",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+  externs_list = [
+    "../externs/chrome.js",
+    "$externs_path/chrome_extensions.js",
+    "$externs_path/file_manager_private.js",
+    "$externs_path/file_system_provider.js",
+    "$externs_path/metrics_private.js",
+  ]
 }
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn
index 0a43ce9d653..f4b59b69732 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn
@@ -23,6 +23,7 @@ js_library("camera3_device_info") {
 js_library("constraints_preferrer") {
   deps = [
     ":camera3_device_info",
+    "..:chrome_util",
     "..:state",
     "..:type",
     "../browser_proxy:browser_proxy",
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/externs/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/externs/BUILD.gn
index e41499011b1..7db53bae1d7 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/src/js/externs/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/externs/BUILD.gn
@@ -9,3 +9,9 @@ js_library("chrome_platform_analytics") {
 
   externs_list = [ "chrome_platform_analytics.js" ]
 }
+
+js_library("w3c_fileapi") {
+  sources = []
+
+  externs_list = [ "w3c_fileapi.js" ]
+}
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/lib/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/lib/BUILD.gn
new file mode 100644
index 00000000000..b9241fdf28c
--- /dev/null
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/lib/BUILD.gn
@@ -0,0 +1,9 @@
+# Copyright 2020 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.
+
+import("//third_party/closure_compiler/compile_js.gni")
+
+js_library("comlink") {
+  sources = [ "comlink.js" ]
+}
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn
index 39e60221b1d..ec38d8a722b 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn
@@ -8,7 +8,6 @@ js_type_check("closure_compile") {
   deps = [
     ":filenamer",
     ":filesystem",
-    ":gallery",
     ":result_saver",
     ":video_saver",
   ]
@@ -19,13 +18,8 @@ js_library("filenamer") {
 
 js_library("filesystem") {
   deps = [
-    "..:util",
-  ]
-}
-
-js_library("gallery") {
-  deps = [
-    ":filesystem",
+    ":filenamer",
+    "../browser_proxy:browser_proxy",
   ]
 }
 
@@ -34,11 +28,13 @@ js_library("result_saver") {
 
 js_library("video_saver") {
   sources = [
-    "file_video_saver.js",
-    "intent_video_saver.js",
-    "video_saver_interface.js",
+    "async_writer.js",
+    "video_processor.js",
+    "video_saver.js",
   ]
   deps = [
     "..:intent",
+    "../externs:w3c_fileapi",
+    "../lib:comlink",
   ]
 }
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn
index 65264576c4d..b1bdcd32ae1 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn
@@ -16,6 +16,7 @@ js_library("chrome_helper") {
   deps = [
     "//components/arc/mojom:camera_intent_js_library_for_compile",
     "//components/chromeos_camera/common:camera_app_helper_js_library_for_compile",
+    "//third_party/blink/public/mojom:mojom_platform_js_library_for_compile",
   ]
   externs_list = [ "$externs_path/pending.js" ]
 }
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn
index c77f3a005e9..59804f3efa5 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn
@@ -24,6 +24,7 @@ js_type_check("compile_resources") {
 
 js_library("camera") {
   deps = [
+    "..:background_ops",
     "..:chrome_util",
     "..:metrics",
     "..:type",
@@ -59,9 +60,7 @@ js_library("settings") {
 }
 
 js_library("view") {
-  deps = [
-    "..:toast",
-  ]
+  deps = [ "..:toast" ]
 
   externs_list = [ "../externs/chrome.js" ]
 }
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/camera/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/camera/BUILD.gn
index b610cd28173..97fdd2dce89 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/camera/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/camera/BUILD.gn
@@ -5,9 +5,7 @@
 import("//third_party/closure_compiler/compile_js.gni")
 
 group("closure_compile") {
-  deps = [
-    ":compile_resources",
-  ]
+  deps = [ ":compile_resources" ]
 }
 
 js_type_check("compile_resources") {
@@ -36,7 +34,6 @@ js_library("modes") {
     "../..:sound",
     "../..:toast",
     "../..:type",
-    "../..:type",
     "../..:util",
     "../../device:constraints_preferrer",
     "../../models:filenamer",
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/strings/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/strings/BUILD.gn
index bfd9210b776..6535e9e8673 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/src/strings/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/strings/BUILD.gn
@@ -67,7 +67,5 @@ grit("camera_strings") {
   ]
   output_dir = chrome_camera_app_dir
 
-  # Don't pollute the extension directory with stamp and .d files.
-  depfile_dir = target_out_dir
   resource_ids = ""
 }
diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd b/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd
index 2068ed0af0f..f22c312b325 100644
--- a/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd
+++ b/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd
@@ -124,6 +124,7 @@
     <file path="camera_strings_sl.xtb" lang="sl" />
     <file path="camera_strings_sq.xtb" lang="sq" />
     <file path="camera_strings_sr.xtb" lang="sr" />
+    <file path="camera_strings_sr-Latn.xtb" lang="sr-Latn" />
     <file path="camera_strings_sv.xtb" lang="sv" />
     <file path="camera_strings_sw.xtb" lang="sw" />
     <file path="camera_strings_ta.xtb" lang="ta" />
@@ -258,6 +259,9 @@
       <message desc="Label for expert mode option: save metadata." name="IDS_EXPERT_SAVE_METADATA">
         Save metadata
       </message>
+      <message desc="Label for expert mode option: print performance logs." name="IDS_EXPERT_PRINT_PERFORMANCE_LOGS">
+        Print performance logs
+      </message>
       <message desc="Error message when the device does not support expert mode but tries to enable it." name="IDS_ERROR_MSG_EXPERT_MODE_NOT_SUPPORTED">
         Expert mode is not supported on this device
       </message>