BASELINE: Update Chromium to 98.0.4758.90

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

9 files changed, 764 insertions, 4 deletions

diff --git a/chromium/infra/archive_config/android-archive-rel.json b/chromium/infra/archive_config/android-archive-rel.json
new file mode 100644
index 00000000000..84b7549d7c8
--- /dev/null
+++ b/chromium/infra/archive_config/android-archive-rel.json
@@ -0,0 +1,24 @@
+{
+    "archive_datas": [
+        {
+            "files": [
+                "apks/ContentShell.apk",
+                "apks/ChromePublic.apk",
+                "apks/SystemWebViewShell.apk"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chrome-android"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Android/{%position%}/chrome-android.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP",
+            "latest_upload": {
+                "gcs_path": "Android/LAST_CHANGE",
+                "gcs_file_content": "{%position%}"
+            },
+            "revisions_file": {
+                "gcs_path": "Android/{%position%}/REVISIONS"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/chromium/infra/archive_config/linux-archive-rel.json b/chromium/infra/archive_config/linux-archive-rel.json
new file mode 100644
index 00000000000..2ba5e7ead01
--- /dev/null
+++ b/chromium/infra/archive_config/linux-archive-rel.json
@@ -0,0 +1,149 @@
+{
+    "archive_datas": [
+        {
+            "files": [
+                "chrome",
+                "chrome-wrapper",
+                "chrome_100_percent.pak",
+                "chrome_200_percent.pak",
+                "chrome_crashpad_handler",
+                "chrome_sandbox",
+                "icudtl.dat",
+                "libEGL.so",
+                "libGLESv2.so",
+                "libvk_swiftshader.so",
+                "libvulkan.so.1",
+                "MEIPreload/manifest.json",
+                "MEIPreload/preloaded_data.pb",
+                "nacl_helper",
+                "nacl_helper_bootstrap",
+                "nacl_irt_x86_64.nexe",
+                "product_logo_48.png",
+                "resources.pak",
+                "swiftshader/libGLESv2.so",
+                "swiftshader/libEGL.so",
+                "v8_context_snapshot.bin",
+                "vk_swiftshader_icd.json",
+                "xdg-mime",
+                "xdg-settings"
+            ],
+            "dirs": ["ClearKeyCdm", "locales", "resources"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chrome-linux"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Linux_x64/{%position%}/chrome-linux.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP",
+            "latest_upload": {
+                "gcs_path": "Linux_x64/LAST_CHANGE",
+                "gcs_file_content": "{%position%}"
+            },
+            "revisions_file": {
+                "gcs_path": "Linux_x64/{%position%}/REVISIONS"
+            }
+        },
+        {
+            "files": [
+                "chromedriver"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chromedriver_linux64"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Linux_x64/{%position%}/chromedriver_linux64.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "content_shell",
+                "content_shell.pak",
+                "dump_syms",
+                "icudtl.dat",
+                "libblink_deprecated_test_plugin.so",
+                "libblink_test_plugin.so",
+                "minidump_stackwalk",
+                "v8_context_snapshot.bin"
+            ],
+            "dirs": ["resources"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "content-shell"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Linux_x64/{%position%}/content-shell.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "dirs": ["gen/third_party/devtools-frontend/src/front_end"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "devtools-frontend"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Linux_x64/{%position%}/devtools-frontend.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "headless_lib.pak",
+                "headless_shell"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "headless-shell"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Linux_x64/{%position%}/headless-shell.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "gen/mojo/public/js/bindings.js",
+                "gen/third_party/blink/public/mojom/contacts/contacts_manager.mojom.m.js",
+                "gen/third_party/blink/public/mojom/content_index/content_index.mojom.m.js",
+                "gen/components/payments/mojom/payment_request_data.mojom.m.js",
+                "gen/third_party/blink/public/mojom/sms/webotp_service.mojom.m.js",
+                "gen/third_party/blink/public/mojom/idle/idle_manager.mojom.m.js",
+                "gen/media/capture/mojom/image_capture.mojom.m.js",
+                "gen/services/device/public/mojom/sensor_provider.mojom.m.js",
+                "gen/services/device/public/mojom/sensor.mojom.m.js",
+                "gen/skia/public/mojom/image_info.mojom.m.js",
+                "gen/skia/public/mojom/bitmap.mojom.m.js",
+                "gen/gpu/ipc/common/sync_token.mojom.m.js",
+                "gen/ui/display/mojom/display.mojom.m.js",
+                "gen/ui/gfx/geometry/mojom/geometry.mojom.m.js",
+                "gen/device/gamepad/public/mojom/gamepad.mojom.m.js",
+                "gen/device/vr/public/mojom/vr_service.mojom.m.js",
+                "gen/url/mojom/url.mojom.m.js",
+                "gen/third_party/blink/public/mojom/usb/web_usb_service.mojom.m.js",
+                "gen/device/bluetooth/public/mojom/uuid.mojom.m.js",
+                "gen/url/mojom/origin.mojom.m.js",
+                "gen/device/bluetooth/public/mojom/test/fake_bluetooth.mojom.m.js",
+                "gen/content/web_test/common/fake_bluetooth_chooser.mojom.m.js",
+                "gen/services/device/public/mojom/nfc.mojom.m.js",
+                "gen/services/device/public/mojom/serial.mojom.m.js",
+                "gen/third_party/blink/public/mojom/serial/serial.mojom.m.js"
+            ],
+            "file_globs": [
+                "gen/gpu/ipc/common/mailbox*.mojom.m.js",
+                "gen/mojo/public/mojom/base/*.mojom.m.js",
+                "gen/services/device/public/mojom/usb_*.mojom.m.js",
+                "gen/services/shape_detection/public/mojom/*.mojom.m.js",
+                "gen/ui/gfx/mojom/*.mojom.m.js"
+            ],
+            "dirs":["gen/layout_test_data/mojo/public/js"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "mojojs"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Linux_x64/{%position%}/mojojs.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "dirs": ["pnacl"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "pnacl"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Linux_x64/{%position%}/pnacl.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/chromium/infra/archive_config/linux-chromiumos-full.json b/chromium/infra/archive_config/linux-chromiumos-full.json
new file mode 100644
index 00000000000..f81db4bc2fb
--- /dev/null
+++ b/chromium/infra/archive_config/linux-chromiumos-full.json
@@ -0,0 +1,41 @@
+{
+    "archive_datas": [
+        {
+            "files": [
+                "chrome",
+                "chrome-wrapper",
+                "chrome_100_percent.pak",
+                "chrome_200_percent.pak",
+                "chrome_crashpad_handler",
+                "icudtl.dat",
+                "keyboard_resources.pak",
+                "libclearkeycdm.so",
+                "libminigbm.so",
+                "MEIPreload/manifest.json",
+                "MEIPreload/preloaded_data.pb",
+                "nacl_helper",
+                "nacl_helper_bootstrap",
+                "nacl_irt_x86_64.nexe",
+                "product_logo_48.png",
+                "resources.pak",
+                "snapshot_blob.bin",
+                "xdg-mime",
+                "xdg-settings"
+            ],
+            "dirs": ["locales", "resources"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chrome-chromeos"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Linux_ChromiumOS_Full/{%position%}/chrome-chromeos.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP",
+            "latest_upload": {
+                "gcs_path": "Linux_ChromiumOS_Full/LAST_CHANGE",
+                "gcs_file_content": "{%position%}"
+            },
+            "revisions_file": {
+                "gcs_path": "Linux_ChromiumOS_Full/{%position%}/REVISIONS"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/chromium/infra/archive_config/mac-archive-rel.json b/chromium/infra/archive_config/mac-archive-rel.json
new file mode 100644
index 00000000000..2be5a22f966
--- /dev/null
+++ b/chromium/infra/archive_config/mac-archive-rel.json
@@ -0,0 +1,91 @@
+{
+	"archive_datas": [
+        {
+            "dirs": ["Chromium.app"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chrome-mac"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac/{%position%}/chrome-mac.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP",
+            "latest_upload": {
+                "gcs_path": "Mac/LAST_CHANGE",
+                "gcs_file_content": "{%position%}"
+            },
+            "revisions_file": {
+                "gcs_path": "Mac/{%position%}/REVISIONS"
+            }
+        },
+        {
+            "files": [
+                "chromedriver"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chromedriver_mac64"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac/{%position%}/chromedriver_mac64.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "content_shell.pak",
+                "icudtl.dat"
+            ],
+            "dirs": [
+                "blink_deprecated_test_plugin.plugin",
+                "blink_test_plugin.plugin",
+                "Content Shell.app",
+                "resources"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "content-shell"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac/{%position%}/content-shell.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "dirs": ["gen/third_party/devtools-frontend/src/front_end"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "devtools-frontend"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac/{%position%}/devtools-frontend.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "dirs": ["pnacl"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "pnacl"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac/{%position%}/pncal.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "remoting-me2me-host-mac.zip"
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac/{%position%}",
+            "archive_type": "ARCHIVE_TYPE_FILES"
+        },
+        {
+            "files": [
+                "chrome/updater/.install"
+            ],
+            "dirs": [
+                "ChromiumUpdater.app",
+                "ChromiumUpdater_test.app",
+                "Updater Packaging"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "updater"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac/{%position%}/updater.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        }
+    ]
+}
diff --git a/chromium/infra/archive_config/mac-arm64-archive-rel.json b/chromium/infra/archive_config/mac-arm64-archive-rel.json
new file mode 100644
index 00000000000..7f2cd6ca907
--- /dev/null
+++ b/chromium/infra/archive_config/mac-arm64-archive-rel.json
@@ -0,0 +1,82 @@
+{
+	"archive_datas": [
+        {
+            "dirs": ["Chromium.app"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chrome-mac"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac_Arm/{%position%}/chrome-mac.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP",
+            "latest_upload": {
+                "gcs_path": "Mac_Arm/LAST_CHANGE",
+                "gcs_file_content": "{%position%}"
+            },
+            "revisions_file": {
+                "gcs_path": "Mac_Arm/{%position%}/REVISIONS"
+            }
+        },
+        {
+            "files": [
+                "chromedriver"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chromedriver_mac64"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac_Arm/{%position%}/chromedriver_mac64.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "content_shell.pak",
+                "icudtl.dat"
+            ],
+            "dirs": [
+                "blink_deprecated_test_plugin.plugin",
+                "blink_test_plugin.plugin",
+                "Content Shell.app",
+                "resources"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "content-shell"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac_Arm/{%position%}/content-shell.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "dirs": ["gen/third_party/devtools-frontend/src/front_end"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "devtools-frontend"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac_Arm/{%position%}/devtools-frontend.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "remoting-me2me-host-mac.zip"
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac_Arm/{%position%}",
+            "archive_type": "ARCHIVE_TYPE_FILES"
+        },
+        {
+            "files": [
+                "chrome/updater/.install"
+            ],
+            "dirs": [
+                "ChromiumUpdater.app",
+                "ChromiumUpdater_test.app",
+                "Updater Packaging"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "updater"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Mac_Arm/{%position%}/updater.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        }
+    ]
+}
diff --git a/chromium/infra/archive_config/mac-tagged.json b/chromium/infra/archive_config/mac-tagged.json
index 667746ef041..a5a9eb97802 100644
--- a/chromium/infra/archive_config/mac-tagged.json
+++ b/chromium/infra/archive_config/mac-tagged.json
@@ -3,7 +3,7 @@
         {
             "dirs": ["Chromium.app"],
             "gcs_bucket": "chromium-browser-versioned",
-            "gcs_path": "experimental/{$chromium_version%}/{%builder_name%}/chrome-mac.zip",
+            "gcs_path": "experimental/{%chromium_version%}/{%builder_name%}/chrome-mac.zip",
             "archive_type": "ARCHIVE_TYPE_ZIP"
         },
         {
@@ -11,7 +11,7 @@
                 "chromedriver"
             ],
             "gcs_bucket": "chromium-browser-versioned",
-            "gcs_path": "experimental/{$chromium_version%}/{%builder_name%}/chromedriver_mac64.zip",
+            "gcs_path": "experimental/{%chromium_version%}/{%builder_name%}/chromedriver_mac64.zip",
             "archive_type": "ARCHIVE_TYPE_ZIP"
         }
     ]
diff --git a/chromium/infra/archive_config/win-archive-rel.json b/chromium/infra/archive_config/win-archive-rel.json
new file mode 100644
index 00000000000..1e4d1ed4981
--- /dev/null
+++ b/chromium/infra/archive_config/win-archive-rel.json
@@ -0,0 +1,181 @@
+{
+	"archive_datas": [
+        {
+            "files": [
+                "chrome.exe",
+                "chrome.dll",
+                "chrome_100_percent.pak",
+                "chrome_200_percent.pak",
+                "chrome_elf.dll",
+                "chrome_proxy.exe",
+                "chrome_pwa_launcher.exe",
+                "D3DCompiler_47.dll",
+                "elevation_service.exe",
+                "eventlog_provider.dll",
+                "First Run",
+                "icudtl.dat",
+                "interactive_ui_tests.exe",
+                "libEGL.dll",
+                "libGLESv2.dll",
+                "MEIPreload\\manifest.json",
+                "MEIPreload\\preloaded_data.pb",
+                "mojo_core.dll",
+                "nacl_irt_x86_64.nexe",
+                "notification_helper.exe",
+                "resources.pak",
+                "swiftshader\\libEGL.dll",
+                "swiftshader\\libGLESv2.dll",
+                "v8_context_snapshot.bin",
+                "vk_swiftshader.dll",
+                "vk_swiftshader_icd.json",
+                "vulkan-1.dll"
+            ],
+            "file_globs": [
+                "locales\\*.pak",
+                "*.manifest"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chrome-win"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}/chrome-win.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP",
+            "latest_upload": {
+                "gcs_path": "Win_x64/LAST_CHANGE",
+                "gcs_file_content": "{%position%}"
+            },
+            "revisions_file": {
+                "gcs_path": "Win_x64/{%position%}/REVISIONS"
+            }
+        },
+        {
+            "files": [
+                "chrome.dll.pdb",
+                "chrome.exe.pdb",
+                "chrome_elf.dll.pdb",
+                "chrome_proxy.exe.pdb",
+                "chrome_pwa_launcher.exe.pdb",
+                "elevation_service.exe.pdb",
+                "eventlog_provider.dll.pdb",
+                "gaia1_0.dll.pdb",
+                "gcapi_dll.dll.pdb",
+                "gcp_setup.exe.pdb",
+                "libEGL.dll.pdb",
+                "libGLESv2.dll.pdb",
+                "mini_installer.exe.pdb",
+                "mojo_core.dll.pdb",
+                "notification_helper.exe.pdb",
+                "setup.exe.pdb",
+                "swiftshader\\libEGL.dll.pdb",
+                "swiftshader\\libGLESv2.dll.pdb",
+                "vk_swiftshader.dll.pdb",
+                "vulkan-1.dll.pdb"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chrome-win32-syms"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}/chrome-win32-syms.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "chromedriver.exe.pdb"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chromedriver_win32-syms"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}/chromedriver_win32-syms.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "chromedriver.exe"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chromedriver_win32"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}/chromedriver_win32.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "blink_deprecated_test_plugin.dll",
+                "blink_test_plugin.dll",
+                "content_shell.exe",
+                "content_shell.pak",
+                "icudtl.dat",
+                "v8_context_snapshot.bin"
+            ],
+            "dirs": ["resources"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "content-shell"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}/content-shell.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "dirs": ["gen\\third_party\\devtools-frontend\\src\\front_end"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "devtools-frontend"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}/devtools-frontend.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "gcapi.h",
+                "gcapi_dll.dll",
+                "gcapi_dll.dll.lib"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "gcapi"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}/gcapi.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "actions.xml",
+                "histograms.xml",
+                "ukm.xml"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "metrics-metadata"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}/metrics-metadata.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "mini_installer.exe"
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}",
+            "archive_type": "ARCHIVE_TYPE_FILES"
+        },
+        {
+            "dirs": ["pnacl"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "pnacl"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}/pnacl.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "updater.zip"
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win_x64/{%position%}",
+            "archive_type": "ARCHIVE_TYPE_FILES"
+        }
+    ]
+}
diff --git a/chromium/infra/archive_config/win-tagged.json b/chromium/infra/archive_config/win-tagged.json
index d7d043a2a84..dec56c0f9b9 100644
--- a/chromium/infra/archive_config/win-tagged.json
+++ b/chromium/infra/archive_config/win-tagged.json
@@ -33,7 +33,7 @@
             "file_globs": ["*.manifest"],
             "dirs": ["locales"],
             "gcs_bucket": "chromium-browser-versioned",
-            "gcs_path": "experimental/{$chromium_version%}/{%builder_name%}/chrome-win.zip",
+            "gcs_path": "experimental/{%chromium_version%}/{%builder_name%}/chrome-win.zip",
             "archive_type": "ARCHIVE_TYPE_ZIP"
         },
         {
@@ -41,7 +41,7 @@
                 "chromedriver.exe"
             ],
             "gcs_bucket": "chromium-browser-versioned",
-            "gcs_path": "experimental/{$chromium_version%}/{%builder_name%}/chromedriver_win32.zip",
+            "gcs_path": "experimental/{%chromium_version%}/{%builder_name%}/chromedriver_win32.zip",
             "archive_type": "ARCHIVE_TYPE_ZIP"
         }
     ]
diff --git a/chromium/infra/archive_config/win32-archive-rel.json b/chromium/infra/archive_config/win32-archive-rel.json
new file mode 100644
index 00000000000..9a2f312ea99
--- /dev/null
+++ b/chromium/infra/archive_config/win32-archive-rel.json
@@ -0,0 +1,192 @@
+{
+	"archive_datas": [
+        {
+            "files": [
+                "chrome.exe",
+                "chrome.dll",
+                "chrome_100_percent.pak",
+                "chrome_200_percent.pak",
+                "chrome_elf.dll",
+                "chrome_proxy.exe",
+                "chrome_pwa_launcher.exe",
+                "D3DCompiler_47.dll",
+                "elevation_service.exe",
+                "eventlog_provider.dll",
+                "First Run",
+                "icudtl.dat",
+                "interactive_ui_tests.exe",
+                "libEGL.dll",
+                "libGLESv2.dll",
+                "MEIPreload\\manifest.json",
+                "MEIPreload\\preloaded_data.pb",
+                "mojo_core.dll",
+                "nacl64.exe",
+                "nacl_irt_x86_32.nexe",
+                "nacl_irt_x86_64.nexe",
+                "notification_helper.exe",
+                "resources.pak",
+                "swiftshader\\libEGL.dll",
+                "swiftshader\\libGLESv2.dll",
+                "v8_context_snapshot.bin",
+                "vk_swiftshader.dll",
+                "vk_swiftshader_icd.json",
+                "vulkan-1.dll"
+            ],
+            "file_globs": [
+                "locales\\*.pak",
+                "*.manifest"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chrome-win"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}/chrome-win.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP",
+            "latest_upload": {
+                "gcs_path": "Win/LAST_CHANGE",
+                "gcs_file_content": "{%position%}"
+            },
+            "revisions_file": {
+                "gcs_path": "Win/{%position%}/REVISIONS"
+            }
+        },
+        {
+            "files": [
+                "chrome.dll.pdb",
+                "chrome.exe.pdb",
+                "chrome_elf.dll.pdb",
+                "chrome_proxy.exe.pdb",
+                "chrome_pwa_launcher.exe.pdb",
+                "elevation_service.exe.pdb",
+                "eventlog_provider.dll.pdb",
+                "gaia1_0.dll.pdb",
+                "gcapi_dll.dll.pdb",
+                "gcp_setup.exe.pdb",
+                "libEGL.dll.pdb",
+                "libGLESv2.dll.pdb",
+                "mini_installer.exe.pdb",
+                "mojo_core.dll.pdb",
+                "nacl64.exe.pdb",
+                "notification_helper.exe.pdb",
+                "setup.exe.pdb",
+                "swiftshader\\libEGL.dll.pdb",
+                "swiftshader\\libGLESv2.dll.pdb",
+                "vk_swiftshader.dll.pdb",
+                "vulkan-1.dll.pdb"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chrome-win32-syms"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}/chrome-win32-syms.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "chromedriver.exe.pdb"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chromedriver_win32-syms"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}/chromedriver_win32-syms.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "chromedriver.exe"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "chromedriver_win32"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}/chromedriver_win32.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "blink_deprecated_test_plugin.dll",
+                "blink_test_plugin.dll",
+                "content_shell.exe",
+                "content_shell.pak",
+                "icudtl.dat",
+                "v8_context_snapshot.bin"
+            ],
+            "dirs": ["resources"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "content-shell"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}/content-shell.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "dirs": ["gen\\third_party\\devtools-frontend\\src\\front_end"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "devtools-frontend"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}/devtools-frontend.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "gcapi.h",
+                "gcapi_dll.dll",
+                "gcapi_dll.dll.lib"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "gcapi"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}/gcapi.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "actions.xml",
+                "histograms.xml",
+                "ukm.xml"
+            ],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "metrics-metadata"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}/metrics-metadata.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "mini_installer.exe"
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}",
+            "archive_type": "ARCHIVE_TYPE_FILES"
+        },
+        {
+            "dirs": ["pnacl"],
+            "rename_dirs": [
+                {"from_dir": ".", "to_dir": "pnacl"}
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}/pnacl.zip",
+            "archive_type": "ARCHIVE_TYPE_ZIP"
+        },
+        {
+            "files": [
+                "remoting-me2me-host-win.zip"
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}",
+            "archive_type": "ARCHIVE_TYPE_FILES"
+        },
+        {
+            "files": [
+                "updater.zip"
+            ],
+            "gcs_bucket": "chromium-browser-snapshots",
+            "gcs_path": "Win/{%position%}",
+            "archive_type": "ARCHIVE_TYPE_FILES"
+        }
+    ]
+}