BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 6 insertions, 1 deletions

diff --git a/chromium/chrome/app/version_assembly/BUILD.gn b/chromium/chrome/app/version_assembly/BUILD.gn
index 56cfbad5ddb..f4025492b03 100644
--- a/chromium/chrome/app/version_assembly/BUILD.gn
+++ b/chromium/chrome/app/version_assembly/BUILD.gn
@@ -18,7 +18,8 @@ process_version("chrome_exe_version_manifest") {
 }
 
 # Generates the manifest for chrome.exe. This is the normal manifest stuff plus
-# the version information.
+# opting in to the segment heap (Windows 10 2004 and above) if enabled, and the
+# version information.
 windows_manifest("chrome_exe_manifest") {
   sources = [
     as_invoker_manifest,
@@ -27,6 +28,10 @@ windows_manifest("chrome_exe_manifest") {
     version_assembly_output_file,
   ]
 
+  if (enable_segment_heap) {
+    sources += [ segment_heap_manifest ]
+  }
+
   deps = [ ":chrome_exe_version_manifest" ]
 }