From a216c74dae27f68bbc28103c9b7a4bcdb281d7b9 Mon Sep 17 00:00:00 2001
From: brave-builds <brave-builds+devops@brave.com>
Date: Wed, 17 Jan 2024 19:57:19 +0000
Subject: [PATCH 1/5] Upgrade from Chromium 121.0.6167.57 to Chromium
 121.0.6167.75

---
 package.json                                                  | 2 +-
 .../chrome-android-expectations-lint-suppressions.xml.patch   | 2 +-
 patches/chrome-browser-BUILD.gn.patch                         | 2 +-
 patches/chrome-browser-about_flags.cc.patch                   | 4 ++--
 ...rowser-resources-settings-site_settings-constants.ts.patch | 4 ++--
 ...es-settings-site_settings_page-site_settings_page.ts.patch | 2 +-
 ...ome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch | 2 +-
 patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch | 2 +-
 ...ebui-settings-settings_localized_strings_provider.cc.patch | 4 ++--
 .../chrome-common-extensions-api-developer_private.idl.patch  | 2 +-
 .../content-browser-renderer_host-navigation_request.cc.patch | 2 +-
 ...-blink-renderer-modules-webaudio-analyser_handler.cc.patch | 2 +-
 patches/tools-gritsettings-resource_ids.spec.patch            | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 3a7e2ef856ee..17881b194614 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "projects": {
       "chrome": {
         "dir": "src",
-        "tag": "121.0.6167.57",
+        "tag": "121.0.6167.75",
         "repository": {
           "url": "https://github.com/brave/chromium"
         }
diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch
index 180515034430..c78c829a4bbd 100644
--- a/patches/chrome-android-expectations-lint-suppressions.xml.patch
+++ b/patches/chrome-android-expectations-lint-suppressions.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml
-index 7fa97b7ab9d3b813db3408f6bc252681b3cb6fa5..6361954b78d82e6f49ac85f97e3a81a2583ba173 100644
+index 7fa97b7ab9d3b813db3408f6bc252681b3cb6fa5..976a8d704700ed81c68e45553e464f056ab0a32a 100644
 --- a/chrome/android/expectations/lint-suppressions.xml
 +++ b/chrome/android/expectations/lint-suppressions.xml
 @@ -269,4 +269,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
index 340e18a50c36..5a175c103cb4 100644
--- a/patches/chrome-browser-BUILD.gn.patch
+++ b/patches/chrome-browser-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 655429c1daa7bf68ddf90809c4789ef72a3decb4..8348cf73b19ce31a87e5cce7d85ab92ceca2d956 100644
+index afdf577837a494a354fb6045864fb462de379f96..109ad10fcf6ae2340ebd9a15e2886a5075438cd4 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -2692,6 +2692,7 @@ static_library("browser") {
diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
index f9acba0fed23..d225646c5a27 100644
--- a/patches/chrome-browser-about_flags.cc.patch
+++ b/patches/chrome-browser-about_flags.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index ae88943acc26f3d04fc68ac192911c57c9a602cd..913b0533cb350b2db6b476f7b6caf1b947b54eaf 100644
+index 2a2fde6ab7d90ddc19ff56690197f0380bf6c91e..2cdaf823e4a565c9858e48bb4fa624a0ff6d7865 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3960,6 +3960,7 @@ const flags_ui::FeatureEntry::FeatureVariation
+@@ -3971,6 +3971,7 @@ const flags_ui::FeatureEntry::FeatureVariation
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {
diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch
index ce5fdbdae300..1a3dcba96f4b 100644
--- a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch
+++ b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts
-index 83cac6858b32189269e0ed8198d4f84d882569e6..cb03bc31f592d1ebf28e3489ec670e5a3a9b4744 100644
+index 5770ecfa63538c064144fdc12feb34925d7c65c4..517787c3670f99ca685cee5247ce0281aaf8d2a7 100644
 --- a/chrome/browser/resources/settings/site_settings/constants.ts
 +++ b/chrome/browser/resources/settings/site_settings/constants.ts
-@@ -55,6 +55,7 @@ export enum ContentSettingsTypes {
+@@ -56,6 +56,7 @@ export enum ContentSettingsTypes {
    // are used everywhere where ContentSettingsTypes is used in JS.
    PDF_DOCUMENTS = 'pdfDocuments',
    SITE_DATA = 'site-data',
diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch
index 6600cbe7929b..af6034d8af22 100644
--- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch
+++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
-index 5c2ae18863a4a1e57d94bcb9bcbf594f14147d3f..a9f64eae9771436568e7ff78eb591f8262d57cc6 100644
+index fe505cba5815dbfe523f930466874fdd4ecd249b..512dbaa872d2e5b5035bbf741918792078ecf03b 100644
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
 @@ -8,6 +8,7 @@
diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch
index 48dcc49a9f85..44a9781cc2a6 100644
--- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch
+++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
-index 8bfec60f4d59296ef03e707a75a9d57f90602c77..78743eb3af3f163b3d6ddaa26adab67e67ee3e31 100644
+index 827d5f3f8650ccca7f9921dacd235dec02acd405..5b31fc0edaee6b6eb9c3bc7f412de618d62bb48d 100644
 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
 +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
 @@ -351,6 +351,7 @@ void RecentTabsSubMenuModel::Build() {
diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
index 8a84bf182980..45c17b0fd05b 100644
--- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
+++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-index f43c6d4d5f0305a50065ea129f041130b4417459..235da50107733919c1cb5d69036a335e7401b511 100644
+index 836617ff76c514a9f14c2286be64abbbaef2b195..c4a1930318dbfea07236888eb38b6fbe392554cc 100644
 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
 @@ -453,6 +453,7 @@ void ToolbarView::Init() {
diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
index 10d1e121ee0d..de193ea10654 100644
--- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
+++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-index 9c08c229211667da54a289c4702e473f1ae4f0f8..fbf0fac02c0f14ac556b279a9eccc387de9da59e 100644
+index 84f2c10359558057a34009749cccc254ab304182..68dfb8dc263f07cca8a37809fc13f27fbf722f55 100644
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -3615,6 +3615,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -3618,6 +3618,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
    policy_indicator::AddLocalizedStrings(html_source);
    AddSecurityKeysStrings(html_source);
  
diff --git a/patches/chrome-common-extensions-api-developer_private.idl.patch b/patches/chrome-common-extensions-api-developer_private.idl.patch
index 932093772ab8..ef513aeacdec 100644
--- a/patches/chrome-common-extensions-api-developer_private.idl.patch
+++ b/patches/chrome-common-extensions-api-developer_private.idl.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl
-index 34d594ef1e3197e8f90e53ff874eea4c6988bd12..760809fff648af2de4f56766adedcffabd3e3bf1 100644
+index ec860805092fb10b09712572656802059ad659e8..baafbc1cbb351cada4136bbd51f5df13ea41f336 100644
 --- a/chrome/common/extensions/api/developer_private.idl
 +++ b/chrome/common/extensions/api/developer_private.idl
 @@ -244,6 +244,7 @@ namespace developerPrivate {
diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch
index cf9cd6bf4402..50b13f4af48e 100644
--- a/patches/content-browser-renderer_host-navigation_request.cc.patch
+++ b/patches/content-browser-renderer_host-navigation_request.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index b0375e9e27ed9eb61b105e7ad85cd06a7d3734a0..7863310145b750f4942e6db13dba0cdc51c969f3 100644
+index bfe5677d66b328ba9b1d7dc2ddb3d949d9a2bb71..a96f4aa03e76cad24876fe5a594b1d033e3263f4 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
 @@ -3279,6 +3279,7 @@ void NavigationRequest::OnRequestRedirected(
diff --git a/patches/third_party-blink-renderer-modules-webaudio-analyser_handler.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-analyser_handler.cc.patch
index 0ad90f0b9cdd..af0897c4a330 100644
--- a/patches/third_party-blink-renderer-modules-webaudio-analyser_handler.cc.patch
+++ b/patches/third_party-blink-renderer-modules-webaudio-analyser_handler.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/webaudio/analyser_handler.cc b/third_party/blink/renderer/modules/webaudio/analyser_handler.cc
-index b2f3242426930b06694a12296206da1e7a7abfb7..9f523172e49757ac1f5524c6bbe8b814bf41c40f 100644
+index 490143f710dc51a93dd89fdc85035519db5e292b..a8088fbaa2edf23ea3bcc292d1576f2eac5c672e 100644
 --- a/third_party/blink/renderer/modules/webaudio/analyser_handler.cc
 +++ b/third_party/blink/renderer/modules/webaudio/analyser_handler.cc
 @@ -23,6 +23,7 @@ AnalyserHandler::AnalyserHandler(AudioNode& node, float sample_rate)
diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch
index aa5fefbf3f5d..4d87e0aa451f 100644
--- a/patches/tools-gritsettings-resource_ids.spec.patch
+++ b/patches/tools-gritsettings-resource_ids.spec.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index cdce083b1bea88408cce51d63a253394c2981d2a..d7b12f86498b8a3f095510dba2a55518b8031ce6 100644
+index fd39b79a88fc0ae01ba525b37c5f7ea6ed1d38e1..2c85f20c48bfb87a7769a04146cf1749146481db 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
 @@ -38,6 +38,9 @@

From 70dea1619e62bc459823b7bac5c89b5bb1a28898 Mon Sep 17 00:00:00 2001
From: brave-builds <brave-builds+devops@brave.com>
Date: Wed, 17 Jan 2024 19:58:11 +0000
Subject: [PATCH 2/5] Update pins list timestamp

---
 .../transport_security_state_generator/input_file_parsers.cc  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
index 56f5b018f6d2..856c27f2d6f9 100644
--- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
+++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
@@ -549,9 +549,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
                            Pinsets* pinsets,
                            base::Time* timestamp) {
   constexpr std::string_view brave_certs = R"brave_certs(
-# Last updated: Wed Jan 10 01:26:30 UTC 2024
+# Last updated: Wed Jan 17 19:58:09 UTC 2024
 PinsListTimestamp
-1704849990
+1705521489
 
 # =====BEGIN BRAVE ROOTS ASC=====
 #From https://www.amazontrust.com/repository/

From bd3ca78944361fa0b59ae8d95cc2424cfd150718 Mon Sep 17 00:00:00 2001
From: brave-builds <brave-builds+devops@brave.com>
Date: Wed, 17 Jan 2024 19:58:29 +0000
Subject: [PATCH 3/5] Updated strings for Chromium 121.0.6167.75

---
 app/generated_resources.grd           | 95 ++++++++++++++++++++++++---
 app/settings_strings.grdp             |  2 +-
 components/site_settings_strings.grdp |  6 ++
 3 files changed, 93 insertions(+), 10 deletions(-)

diff --git a/app/generated_resources.grd b/app/generated_resources.grd
index c52dc03ae46f..4f42d92a988d 100644
--- a/app/generated_resources.grd
+++ b/app/generated_resources.grd
@@ -7385,6 +7385,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_TITLE" desc="The label for the hue slider in the customization menu on the New Tab Page that allows a user to pick a color for their theme">
         Color picker
       </message>
+      <message name="IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_DELETE_TITLE" translateable="false" desc="The tooltip for the delete button in the hue slider that unselects the currently selected hue.">
+        Unselect
+      </message>
+      <message name="IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_DELETE_A11Y_LABEL" translateable="false" desc="The accessibility label for the delete button in the hue slider that unselects the currently selected hue.">
+        Unselect color
+      </message>
       <message name="IDS_NTP_THEME_MANAGED_DIALOG_TITLE" desc="Title text for the dialog informing users that their theme is managed when they try selecting a theme on the New Tab Page.">
         Theme is set by your Organization
       </message>
@@ -7541,9 +7547,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_HEADER" desc="Header for the wallpaper search section for showing past themes.">
         Your recent AI themes
       </message>
-      <message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_TILE_TITLE" desc="Title for each tile button in the wallpaper search section for showing past themes.">
-        Recent AI theme <ph name="TILE_INDEX">$1<ex>2</ex></ph>
-      </message>
       <message name="IDS_NTP_WALLPAPER_SEARCH_OFFLINE_DESCRIPTION" desc="The description of the message displayed by wallpaper search when the browser is offline.">
         Check your internet and try again.
       </message>
@@ -7583,27 +7586,51 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_NTP_WALLPAPER_SEARCH_TRY_AGAIN_CTA" desc="Call to action displayed when wallpaper search fails that asks user to try again.">
         Try again
       </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_NO_DESCRIPTOR" translateable="false" desc="Accessibility label for a wallpaper search history result, with only the index.">
+        Recent AI theme <ph name="INDEX">$1<ex>2</ex></ph>
+      </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL" translateable="false" desc="Accessibility label for a wallpaper search history result, with only descriptor A.">
+        Recent AI theme <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>
+      </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_WITH_DESCRIPTOR_B" translateable="false" desc="Accessibility label for a wallpaper search history result, with descriptors A and B.">
+        Recent AI theme <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, in <ph name="STYLE">$3</ph> style
+      </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_WITH_DESCRIPTOR_C" translateable="false" desc="Accessibility label for a wallpaper search history result, with descriptors A and C.">
+        Recent AI theme <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, with <ph name="MOOD">$3</ph> mood.
+      </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_WITH_DESCRIPTORS_B_AND_C" translateable="false" desc="Accessibility label for a wallpaper search history result, with descriptors A, B, and C.">
+        Recent AI theme <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, in <ph name="STYLE">$3</ph> style, with <ph name="MOOD">$4</ph> mood.
+      </message>
       <message name="IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL" desc="Accessibility label for a wallpaper search result, with only descriptor A.">
-        Image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="A">$2</ph>
+        Generated image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>
       </message>
       <message name="IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL_WITH_DESCRIPTOR_B" desc="Accessibility label for a wallpaper search result, with descriptors A and B.">
-        Image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="A">$2</ph>, in <ph name="B">$3</ph> style
+        Generated image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, in <ph name="STYLE">$3</ph> style
       </message>
       <message name="IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL_WITH_DESCRIPTOR_C" desc="Accessibility label for a wallpaper search result, with descriptors A and C.">
-        Image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="A">$2</ph>, with <ph name="C">$3</ph> mood.
+        Generated image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, with <ph name="MOOD">$3</ph> mood.
       </message>
       <message name="IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL_WITH_DESCRIPTORS_B_AND_C" desc="Accessibility label for a wallpaper search result, with descriptors A, B, and C.">
-        Image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="A">$2</ph>, in <ph name="B">$3</ph> style, with <ph name="C">$4</ph> mood.
+        Generated image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, in <ph name="STYLE">$3</ph> style, with <ph name="MOOD">$4</ph> mood.
       </message>
       <message name="IDS_NTP_WALLPAPER_SEARCH_SUBJECT_LABEL" desc="Label for the Create theme with AI dropdown for selecting subject of the image.">
         Subject
       </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_SUBJECT_DEFAULT_OPTION_LABEL" translateable="false" desc="Label for the option that a user can pick to unselect a previously selected subject. Also serves as a heading and label for the whole dropdown.">
+        Choose a subject
+      </message>
       <message name="IDS_NTP_WALLPAPER_SEARCH_MOOD_LABEL" desc="Label for the Create theme with AI dropdown for selecting mood of the image.">
         Mood
       </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_MOOD_DEFAULT_OPTION_LABEL" translateable="false" desc="Label for the option that a user can pick to unselect a previously selected mood. Also serves as a heading and label for the whole dropdown.">
+        Choose a mood
+      </message>
       <message name="IDS_NTP_WALLPAPER_SEARCH_STYLE_LABEL" desc="Label for the Create theme with AI dropdown for selecting style of the image.">
         Style
       </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_STYLE_DEFAULT_OPTION_LABEL" translateable="false" desc="Label for the option that a user can pick to unselect a previously selected style. Also serves as a heading and label for the whole dropdown.">
+        Choose a style
+      </message>
       <message name="IDS_LEARN_MORE_ABOUT_FEATURE_A11Y_LABEL" desc="Accessibility label for a link labeled 'Learn more' that links to a help article about creating themes with AI.">
         Learn more about creating themes with AI.
       </message>
@@ -7616,6 +7643,18 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_NTP_WALLPAPER_SEARCH_INSPIRATION_HEADER" desc="Header for the wallpaper search section for showing example results.">
         Inspiration
       </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_LOADING_A11Y_MESSAGE" translateable="false" desc="Accessibility string read to screen reader users that images are being created.">
+        Generating...
+      </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_SUCCESS_A11Y_MESSAGE" translateable="false" desc="Accessibility string read to screen reader users that images are being created.">
+        Generated <ph name="COUNT">$1<ex>2</ex></ph> images
+      </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_DISCLAIMER" translateable="false" desc="Disclaimer text used for the Create theme with AI feature.">
+        This is an experimental AI feature and won't always get it right.
+      </message>
+      <message name="IDS_NTP_WALLPAPER_SEARCH_MEADOW_INSPIRATION_TITLE" translateable="false" desc="Title for the wallpaper search's Meadow inspiration.">
+        Meadow, Oil Painting, Intellectual, Yellow
+      </message>
 
       <!-- NTP Modules -->
       <message name="IDS_NTP_MODULES_INFO_BUTTON_TITLE" desc="Text shown in tooltip of info button of an NTP module.">
@@ -8782,6 +8821,17 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Select the tab group and activate the context menu to edit
       </message>
 
+      <!-- Strings for experimental AI promo -->
+      <message name="IDS_IPH_EXPERIMENTAL_AI_PROMO" desc="The title text of the IPH promo for experimental AI." translateable="false">
+        Try out experimental AI features
+      </message>
+      <message name="IDS_IPH_EXPERIMENTAL_AI_PROMO_BODY" desc="The body text of the IPH promo for experimental AI." translateable="false">
+        Get help organizing tabs and creating custom themes
+      </message>
+      <message name="IDS_IPH_EXPERIMENTAL_AI_PROMO_BUTTON_CONTINUE" desc="The text of the continue button for the experimental AI IPH promo." translateable="false">
+        Continue
+      </message>
+
       <!-- Strings for intent picker -->
       <if expr="not is_android">
         <message name="IDS_TOOLTIP_INTENT_PICKER_ICON" desc="The tooltip for the intent picker bubble icon">
@@ -10331,6 +10381,21 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
       <message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_SYNC_PAUSED" desc="The label for the button in the not started state of the tab organization UI, when sync is paused" translateable="false">
         Sign in
       </message>
+      <message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_ARIA_LABEL" desc="The a11y label for the button in the not started state of the tab organization UI, when synced" is_accessibility_with_no_ui="true">
+        Check now if tabs can be organized
+      </message>
+      <message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_FRE_ARIA_LABEL" desc="The first run experience a11y label for the button in the not started state of the tab organization UI, when synced" is_accessibility_with_no_ui="true">
+        Let's go and organize your tabs
+      </message>
+      <message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_UNSYNCED_ARIA_LABEL" desc="The a11y label for the button in the not started state of the tab organization UI, when not signed in or signed in but unsynced" is_accessibility_with_no_ui="true">
+        Turn on sync to let Brave suggest tab groups
+      </message>
+      <message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_UNSYNCED_HISTORY_ARIA_LABEL" desc="The a11y label for the button in the not started state of the tab organization UI, when history sync is disabled" is_accessibility_with_no_ui="true">
+        Open settings to let Brave suggest tab groups
+      </message>
+      <message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_SYNC_PAUSED_ARIA_LABEL" desc="The a11y label for the button in the not started state of the tab organization UI, when sync is paused" is_accessibility_with_no_ui="true">
+        Sign in to let Brave suggest tab groups
+      </message>
       <message name="IDS_TAB_ORGANIZATION_IN_PROGRESS_TITLE" desc="The header text for the in progress state in the tab organization UI" translateable="false">
         Organizing into a tab group…
       </message>
@@ -10370,7 +10435,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
       <message name="IDS_TAB_ORGANIZATION_TIP_ACTION" desc="The actionable text of the tip in the tab organization UI" translateable="false">
         Show me how
       </message>
-      <message name="IDS_TAB_ORGANIZATION_TIP_ARIA_DESCRIPTION" desc="The a11y description of the tip in the tab organization UI" translateable="false" is_accessibility_with_no_ui="true">
+      <message name="IDS_TAB_ORGANIZATION_TIP_ARIA_DESCRIPTION" desc="The a11y label of the tip in the tab organization UI" translateable="false" is_accessibility_with_no_ui="true">
         Launch tab group tutorial
       </message>
       <message name="IDS_TAB_ORGANIZATION_DISCLAIMER" desc="The disclaimer text in the tab organization UI results state for getting more information" translateable="false">
@@ -10379,7 +10444,10 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
       <message name="IDS_TAB_ORGANIZATION_LEARN_MORE" desc="The actionable text in the tab organization UI results state for getting more information" translateable="false">
         Learn more
       </message>
-      <message name="IDS_TAB_ORGANIZATION_CLOSE_TAB_ARIA_LABEL" desc="The accessible label in the tab organization UI results state for removing a tab" translateable="false" is_accessibility_with_no_ui="true">
+      <message name="IDS_TAB_ORGANIZATION_LEARN_MORE_ARIA_LABEL" desc="The accessible label in the tab organization UI results state for getting more information" is_accessibility_with_no_ui="true">
+        Learn more about using AI tools
+      </message>
+      <message name="IDS_TAB_ORGANIZATION_CLOSE_TAB_ARIA_LABEL" desc="The accessible label in the tab organization UI results state for removing a tab" is_accessibility_with_no_ui="true">
         Remove <ph name="TAB_TITLE">$1<ex>New Tab</ex></ph> from tab group
       </message>
       <message name="IDS_TAB_ORGANIZATION_CLOSE_TAB_TOOLTIP" desc="Tooltip on the button in the tab organization UI results state for removing a tab" translateable="false">
@@ -10391,6 +10459,15 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
       <message name="IDS_TAB_ORGANIZATION_REJECT_FINAL_SUGGESTION" desc="The button text in the tab organization UI results state for rejecting the current (and final) suggestion" translateable="false">
         Clear
       </message>
+      <message name="IDS_TAB_ORGANIZATION_INPUT_ARIA_LABEL" desc="The a11y label of the tab group name input in the tab organization UI" is_accessibility_with_no_ui="true">
+        Tab group name: <ph name="NAME">$1<ex>My tab group</ex></ph>
+      </message>
+      <message name="IDS_TAB_ORGANIZATION_THUMBS_DOWN" desc="Accessibility label for the thumbs down icon that a user can click to provide negative feedback about a tab organization." is_accessibility_with_no_ui="true">
+        Thumbs down submits feedback that you dislike this tab group suggestion
+      </message>
+      <message name="IDS_TAB_ORGANIZATION_THUMBS_UP" desc="Accessibility label for the thumbs up icon that a user can click to provide positive feedback about a tab organization." is_accessibility_with_no_ui="true">
+        Thumbs up submits feedback that you like this tab group suggestion
+      </message>
 
       <!-- Strings for Window Titles in Menus -->
       <if expr="not use_titlecase">
diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp
index 5cf14606fa30..b0605066ee9a 100644
--- a/app/settings_strings.grdp
+++ b/app/settings_strings.grdp
@@ -4345,7 +4345,7 @@
     Enables autofill helper on certain input fields
   </message>
   <message name="IDS_SETTINGS_EXPERIMENTAL_ADVANCED_FEATURE2_LABEL" desc="Toggle primary description" translateable="false">
-    Tab Organizer
+    Tab organizer
   </message>
   <message name="IDS_SETTINGS_EXPERIMENTAL_ADVANCED_FEATURE2_SUBLABEL" desc="Toggle secondary description" translateable="false">
     Automatically creates tab groups based on your open tabs. To use this feature, right-click on a tab and click Organize similar tabs.
diff --git a/components/site_settings_strings.grdp b/components/site_settings_strings.grdp
index 3cc55788cf31..3dde3f04f7b3 100644
--- a/components/site_settings_strings.grdp
+++ b/components/site_settings_strings.grdp
@@ -239,5 +239,11 @@
   <message name="IDS_SITE_SETTINGS_TYPE_WINDOW_MANAGEMENT_MID_SENTENCE" desc="The label used for the window management site settings controls when used mid-sentence.">
     window management
   </message>
+  <message name="IDS_SITE_SETTINGS_TYPE_PERFORMANCE" desc="The label used for the performance site settings controls.">
+    Performance
+  </message>
+  <message name="IDS_SITE_SETTINGS_TYPE_PERFORMANCE_SUBLABEL" desc="The sublabel used for the performance site settings controls to manage the exclusion list.">
+    Manage sites that will always stay active and won't have memory freed up from them
+  </message>
   </if>
 </grit-part>

From fbc8ba3b817e0b370f505be6d80a651b3186ffd5 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 17 Jan 2024 15:38:29 -0500
Subject: [PATCH 4/5] TabSearchBubbleHost::ShowTabSearchBubble signature
 changed.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/60a77feece4d7af84fcbdd929827a45b75852b04

commit 60a77feece4d7af84fcbdd929827a45b75852b04
Author: Emily Shack <emshack@chromium.org>
Date:   Fri Jan 12 04:20:08 2024 +0000

    Tab Organization: Ensure tabs switch appropriately

    Adds a pref observer such that when the tab search tab index pref
    changes from outside the bubble, the bubble listens for that change and
    updates accordingly. Then, also explicitly sets the pref to show the tab
    search tab when the tab search keyboard shortcut is triggered.

    This addresses a couple bugs, one where the tab search keyboard shortcut
    might open to the tab organization tab, and the other where opening the
    bubble to tab search -> closing the bubble -> using any entry point
    other than the tab search button to open tab organization would open to
    the tab search tab.

    an exception for tab_search_page_handler.cc.

    Low-Coverage-Reason: HARD_TO_TEST. Test launch review team has granted
    Bug: 1469126
---
 browser/ui/views/brave_tab_search_bubble_host.cc | 7 ++++---
 browser/ui/views/brave_tab_search_bubble_host.h  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/browser/ui/views/brave_tab_search_bubble_host.cc b/browser/ui/views/brave_tab_search_bubble_host.cc
index e0f9d999aee3..8ce1f2aecc34 100644
--- a/browser/ui/views/brave_tab_search_bubble_host.cc
+++ b/browser/ui/views/brave_tab_search_bubble_host.cc
@@ -16,9 +16,10 @@ void BraveTabSearchBubbleHost::SetBubbleArrow(
 }
 
 bool BraveTabSearchBubbleHost::ShowTabSearchBubble(
-    bool triggered_by_keyboard_shortcut) {
-  bool result =
-      TabSearchBubbleHost::ShowTabSearchBubble(triggered_by_keyboard_shortcut);
+    bool triggered_by_keyboard_shortcut,
+    int tab_index) {
+  bool result = TabSearchBubbleHost::ShowTabSearchBubble(
+      triggered_by_keyboard_shortcut, tab_index);
   if (!arrow_ || !result) {
     return result;
   }
diff --git a/browser/ui/views/brave_tab_search_bubble_host.h b/browser/ui/views/brave_tab_search_bubble_host.h
index f1f41d778372..888bb89165b4 100644
--- a/browser/ui/views/brave_tab_search_bubble_host.h
+++ b/browser/ui/views/brave_tab_search_bubble_host.h
@@ -18,8 +18,8 @@ class BraveTabSearchBubbleHost : public TabSearchBubbleHost {
   void SetBubbleArrow(views::BubbleBorder::Arrow arrow);
 
   // TabSearchBubbleHost:
-  bool ShowTabSearchBubble(
-      bool triggered_by_keyboard_shortcut = false) override;
+  bool ShowTabSearchBubble(bool triggered_by_keyboard_shortcut = false,
+                           int tab_index = -1) override;
 
  private:
   std::optional<views::BubbleBorder::Arrow> arrow_;

From cdf7f5efd2bc3ec499eccd6c5053efc9d884ffc8 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 17 Jan 2024 18:18:54 -0500
Subject: [PATCH 5/5] Disabled crashing/failing upstream browser tests.

---
 test/filters/browser_tests.filter | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/filters/browser_tests.filter b/test/filters/browser_tests.filter
index e3a008e2edc3..3f242ec1f2e5 100644
--- a/test/filters/browser_tests.filter
+++ b/test/filters/browser_tests.filter
@@ -744,6 +744,7 @@
 -IpProtectionConfigProviderBrowserTest.BackoffTimeResetAfterProfileAvailabilityChange
 -IpProtectionConfigProviderBrowserTest.ExpectedReceiverSetStateAfterNetworkServiceCrash
 -IpProtectionConfigProviderBrowserTest.NetworkServiceCanRequestTokens
+-OptimizationGuideKeyedServiceEnterpriseBrowserTest.CheckUploadWithEnterprisePolicy
 -PersonalizedHintsFetcherBrowserTest.NoUserSignIn
 -PersonalizedHintsFetcherBrowserTest.UserSignedIn
 -PlusAddressCreationDialogTest.*
@@ -1057,6 +1058,9 @@
 -TabSearchContainerBrowserTest.DelayedHidesWhenOrganizeButtonTimesOut
 -TabSearchContainerBrowserTest.ImmediatelyHidesWhenOrganizeButtonClicked
 -TabSearchContainerBrowserTest.ImmediatelyHidesWhenOrganizeButtonDismissed
+-TabSearchContainerBrowserTest.LogsFailureWhenButtonDismissed
+-TabSearchContainerBrowserTest.LogsFailureWhenButtonTimeout
+-TabSearchContainerBrowserTest.LogsSuccessWhenButtonClicked
 -TabSearchContainerBrowserTest.TogglesActionUIState
 -TabStripModelBrowserTest.CommandOrganizeTabs
 -TestWebAppMenuModelCR2023.CommandStatusTest
@@ -1166,6 +1170,7 @@
 -AdHeuristicTPCDBrowserTestSkipSupportGrant.CookieBlocked
 -All/EligibilityServiceBrowserTest.EligibilityChanged_OnboardingServiceNotified/*
 -ExperimentManagerImplDisable3PCsSyntheticTrialTest.RegistersSyntheticTrial
+-ExperimentManagerImplDisable3PCsSyntheticTrialTest.RegistersSyntheticTrialWhenNoticeRequested
 -ThirdPartyCookieDeprecationObserverMechanismBrowserTest.ThirdPartyCookiesReadAndWrite/3
 -ThirdPartyCookieDeprecationObserverMechanismBrowserTest.ThirdPartyCookiesReadAndWrite/6
 -ThirdPartyCookieDeprecationObserverMechanismBrowserTest.ThirdPartyJavaScriptCookieReadAndWrite/3