BASELINE: Update Chromium to 122.0.6261.72

Change-Id: I655fa6da670f5e82a4c0df33630e388663de2a8e
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/542310
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 16 insertions, 44 deletions

diff --git a/chromium/chrome/browser/resources/settings/BUILD.gn b/chromium/chrome/browser/resources/settings/BUILD.gn
index 22fdc428177..2bb89df87f6 100644
--- a/chromium/chrome/browser/resources/settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/BUILD.gn
@@ -18,6 +18,8 @@ build_webui("build") {
     "images/ad_privacy_banner.svg",
     "images/cookies_banner_dark.svg",
     "images/cookies_banner.svg",
+    "images/cvc.svg",
+    "images/cvc_amex.svg",
     "images/googleg_standard_clr_32px.svg",
     "images/iban.svg",
     "images/password_check_neutral_dark.svg",
@@ -58,15 +60,12 @@ build_webui("build") {
     "images/privacy_guide/waa_graphic.svg",
     "images/privacy_guide/welcome_banner_dark.svg",
     "images/privacy_guide/welcome_banner.svg",
-    "images/privacy_sandbox_banner_v3_dark.svg",
-    "images/privacy_sandbox_banner_v3.svg",
     "images/safe_browsing_banner_dark.svg",
     "images/safe_browsing_banner.svg",
     "images/sync_banner_dark.svg",
     "images/sync_banner.svg",
     "images/tracking_protection_banner_dark.svg",
     "images/tracking_protection_banner.svg",
-    "privacy_sandbox/privacy_sandbox.html",
     "settings.html",
   ]
 
@@ -74,6 +73,7 @@ build_webui("build") {
   web_component_files = [
     "a11y_page/a11y_page.ts",
     "about_page/about_page.ts",
+    "ai_page/ai_page.ts",
     "appearance_page/appearance_fonts_page.ts",
     "appearance_page/appearance_page.ts",
     "appearance_page/home_url_input.ts",
@@ -102,14 +102,14 @@ build_webui("build") {
     "performance_page/battery_page.ts",
     "performance_page/performance_page.ts",
     "performance_page/speed_page.ts",
-    "performance_page/tab_discard_exception_add_dialog.ts",
-    "performance_page/tab_discard_exception_add_input.ts",
-    "performance_page/tab_discard_exception_current_sites_list.ts",
-    "performance_page/tab_discard_exception_edit_dialog.ts",
-    "performance_page/tab_discard_exception_edit_input.ts",
-    "performance_page/tab_discard_exception_entry.ts",
-    "performance_page/tab_discard_exception_list.ts",
-    "performance_page/tab_discard_exception_tabbed_add_dialog.ts",
+    "performance_page/tab_discard/exception_add_dialog.ts",
+    "performance_page/tab_discard/exception_add_input.ts",
+    "performance_page/tab_discard/exception_current_sites_list.ts",
+    "performance_page/tab_discard/exception_edit_dialog.ts",
+    "performance_page/tab_discard/exception_edit_input.ts",
+    "performance_page/tab_discard/exception_entry.ts",
+    "performance_page/tab_discard/exception_list.ts",
+    "performance_page/tab_discard/exception_tabbed_add_dialog.ts",
     "people_page/page_content_page.ts",
     "people_page/people_page.ts",
     "people_page/signout_dialog.ts",
@@ -148,12 +148,11 @@ build_webui("build") {
     "privacy_page/security_keys_phones_list.ts",
     "privacy_page/security_keys_phones_dialog.ts",
     "privacy_page/security_page.ts",
-    "privacy_sandbox/app.ts",
-    "privacy_sandbox/interest_item.ts",
     "privacy_sandbox/privacy_sandbox_ad_measurement_subpage.ts",
     "privacy_sandbox/privacy_sandbox_fledge_subpage.ts",
     "privacy_sandbox/privacy_sandbox_interest_item.ts",
     "privacy_sandbox/privacy_sandbox_page.ts",
+    "privacy_sandbox/privacy_sandbox_manage_topics_subpage.ts",
     "privacy_sandbox/privacy_sandbox_topics_subpage.ts",
     "reset_page/reset_page.ts",
     "reset_page/reset_profile_banner.ts",
@@ -263,6 +262,9 @@ build_webui("build") {
   if (is_win || is_mac) {
     web_component_files += [ "autofill_page/passkeys_subpage.ts" ]
   }
+  if (is_win || is_mac || is_linux) {
+    web_component_files += [ "a11y_page/pdf_ocr_toggle.ts" ]
+  }
   if (is_chrome_branded) {
     web_component_files += [ "get_most_chrome_page/get_most_chrome_page.ts" ]
   }
@@ -297,13 +299,12 @@ build_webui("build") {
     "performance_page/discard_timer_options.ts",
     "performance_page/performance_browser_proxy.ts",
     "performance_page/performance_metrics_proxy.ts",
-    "performance_page/tab_discard_exception_validation_mixin.ts",
+    "performance_page/tab_discard/exception_validation_mixin.ts",
     "privacy_page/privacy_guide/constants.ts",
     "privacy_page/privacy_guide/privacy_guide_availability_mixin.ts",
     "privacy_page/privacy_guide/privacy_guide_browser_proxy.ts",
     "privacy_sandbox/privacy_sandbox_browser_proxy.ts",
     "privacy_page/security_keys_browser_proxy.ts",
-    "privacy_sandbox/icons.html.ts",
     "relaunch_mixin.ts",
     "reset_page/reset_browser_proxy.ts",
     "route.ts",
@@ -427,11 +428,6 @@ build_webui("build") {
     ts_extra_deps = [ "//ash/webui/common/resources:generate_definitions" ]
   }
 
-  if (optimize_webui) {
-    extra_grdp_deps = [ "privacy_sandbox:build_grdp" ]
-    extra_grdp_files = [ "$target_gen_dir/privacy_sandbox/resources.grdp" ]
-  }
-
   optimize = optimize_webui
   if (optimize) {
     optimize_webui_host = "settings"
diff --git a/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn b/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn
deleted file mode 100644
index 55f8be9bcc6..00000000000
--- a/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//ui/webui/resources/tools/generate_grd.gni")
-import("//ui/webui/webui_features.gni")
-
-# The privacy sandbox page lives outside the regular settings bundle, hence
-# needs to be separately included in the build when optimize_webui=true.
-if (optimize_webui) {
-  generate_grd("build_grdp") {
-    grd_prefix = "settings_privacy_sandbox"
-    out_grd = "$target_gen_dir/resources.grdp"
-    input_files = [
-      "privacy_sandbox/app.js",
-      "privacy_sandbox/app.html.js",
-      "privacy_sandbox/icons.html.js",
-      "privacy_sandbox/interest_item.js",
-      "privacy_sandbox/interest_item.html.js",
-    ]
-    input_files_base_dir = rebase_path("$target_gen_dir/../tsc", root_build_dir)
-    deps = [ "..:build_ts" ]
-  }
-}