diff --git a/build/patches/00Enable-ImprovedBookmarks-by-default.patch b/build/patches/00Enable-ImprovedBookmarks-by-default.patch
index 3e068a90..b0341d06 100644
--- a/build/patches/00Enable-ImprovedBookmarks-by-default.patch
+++ b/build/patches/00Enable-ImprovedBookmarks-by-default.patch
@@ -4,36 +4,28 @@ Subject: Enable ImprovedBookmarks by default
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- chrome/android/java/res/layout/bookmark_search_box_row.xml  | 6 +++---
- .../chromium/chrome/browser/bookmarks/BookmarkFeatures.java | 2 +-
- .../browser/bookmarks/BookmarkSearchBoxRowViewBinder.java   | 2 ++
- .../chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java  | 2 +-
- .../chromium/chrome/browser/bookmarks/BookmarkUtils.java    | 3 ++-
- chrome/browser/flags/android/chrome_feature_list.cc         | 2 +-
- 6 files changed, 10 insertions(+), 7 deletions(-)
+ chrome/android/java/res/layout/bookmark_search_box_row.xml    | 4 ++--
+ .../chromium/chrome/browser/bookmarks/BookmarkFeatures.java   | 2 +-
+ .../browser/bookmarks/BookmarkSearchBoxRowViewBinder.java     | 2 ++
+ .../chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java    | 2 +-
+ .../org/chromium/chrome/browser/bookmarks/BookmarkUtils.java  | 3 ++-
+ chrome/browser/flags/android/chrome_feature_list.cc           | 2 +-
+ 6 files changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/chrome/android/java/res/layout/bookmark_search_box_row.xml b/chrome/android/java/res/layout/bookmark_search_box_row.xml
 --- a/chrome/android/java/res/layout/bookmark_search_box_row.xml
 +++ b/chrome/android/java/res/layout/bookmark_search_box_row.xml
-@@ -31,9 +31,9 @@ found in the LICENSE file.
-       android:textAppearance="@style/TextAppearance.TextLarge.Primary" />
+@@ -58,8 +58,8 @@ found in the LICENSE file.
  
-     <LinearLayout
--        android:layout_height="48dp"
-+        android:layout_height="wrap_content"
-         android:layout_width="match_parent"
--        android:layout_marginTop="6dp"
-+        android:layout_marginTop="0dp"
-         android:orientation="horizontal" >
+   <LinearLayout
+     android:layout_width="match_parent"
+-    android:layout_height="48dp"
+-    android:layout_marginTop="6dp"
++    android:layout_height="wrap_content"
++    android:layout_marginTop="0dp"
+     android:orientation="horizontal">
  
      <org.chromium.components.browser_ui.widget.chips.ChipView
-@@ -43,4 +43,4 @@ found in the LICENSE file.
- 
-     </LinearLayout>
- 
--</org.chromium.chrome.browser.bookmarks.BookmarkSearchBoxRow>
-\ No newline at end of file
-+</org.chromium.chrome.browser.bookmarks.BookmarkSearchBoxRow>
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java
@@ -57,14 +49,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  
  import androidx.annotation.DrawableRes;
  import androidx.annotation.StringRes;
-@@ -20,6 +21,7 @@ class BookmarkSearchBoxRowViewBinder {
-     static void bind(PropertyModel model, View view, PropertyKey key) {
+@@ -53,6 +54,7 @@ class BookmarkSearchBoxRowViewBinder {
+     private void bindInternal(PropertyModel model, View view, PropertyKey key) {
          BookmarkSearchBoxRow row = (BookmarkSearchBoxRow) view;
          ChipView shoppingChip = view.findViewById(R.id.shopping_filter_chip);
 +        shoppingChip.setVisibility(ViewGroup.GONE);
-         if (key == BookmarkSearchBoxRowProperties.QUERY_CALLBACK) {
-             row.setQueryCallback(model.get(BookmarkSearchBoxRowProperties.QUERY_CALLBACK));
-         } else if (key == BookmarkSearchBoxRowProperties.SHOPPING_CHIP_VISIBILITY) {
+         if (key == BookmarkSearchBoxRowProperties.SEARCH_TEXT_CHANGE_CALLBACK) {
+             Callback<String> callback =
+                     wrapCallback(model, BookmarkSearchBoxRowProperties.SEARCH_TEXT_CHANGE_CALLBACK);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java
@@ -75,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 -            BookmarkRowDisplayPref.VISUAL;
 +            BookmarkRowDisplayPref.COMPACT;
      private static final @BookmarkRowSortOrder int INITIAL_BOOKMARK_ROW_SORT_ORDER =
-             BookmarkRowSortOrder.REVERSE_CHRONOLOGICAL;
+             BookmarkRowSortOrder.MANUAL;
  
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
@@ -100,14 +92,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -495,7 +495,7 @@ BASE_FEATURE(kAndroidSearchEngineChoiceNotification,
+@@ -505,7 +505,7 @@ BASE_FEATURE(kAndroidSearchEngineChoiceNotification,
  
  BASE_FEATURE(kAndroidImprovedBookmarks,
               "AndroidImprovedBookmarks",
 -             base::FEATURE_DISABLED_BY_DEFAULT);
 +             base::FEATURE_ENABLED_BY_DEFAULT);
  
- BASE_FEATURE(kAnimatedImageDragShadow,
-              "AnimatedImageDragShadow",
+ BASE_FEATURE(kAndroidNoVisibleHintForTablets,
+              "AndroidNoVisibleHintForTablets",
 --
 2.25.1
diff --git a/build/patches/00Fix-chromium-build-bugs.patch b/build/patches/00Fix-chromium-build-bugs.patch
index 7ee078b5..37b6ce7b 100644
--- a/build/patches/00Fix-chromium-build-bugs.patch
+++ b/build/patches/00Fix-chromium-build-bugs.patch
@@ -3,34 +3,31 @@ Date: Wed, 6 Sep 2023 17:55:01 +0000
 Subject: Fix chromium build bugs
 
 ---
- android_webview/system_webview_bundle.gni       |  4 ++++
- build/config/android/rules.gni                  |  1 +
- .../chromium/chrome/browser/tab/TabImpl.java    |  2 +-
- chrome/browser/download/download_ui_model.cc    |  2 ++
- .../api/autofill_private/autofill_util.cc       |  2 ++
- chrome/browser/extensions/extension_util.cc     |  2 ++
- chrome/browser/safe_browsing/BUILD.gn           |  1 +
- .../safe_browsing/user_interaction_observer.cc  | 17 -----------------
- ...ction_consented_debugging_infobar_delegate.h |  2 +-
- chrome/browser/ui/views/tabs/tab.cc             |  2 +-
- .../browser/ui/views/tabs/tab_group_header.cc   |  2 +-
- .../app_management_page_handler.cc              |  2 ++
- chrome/browser/usb/chrome_usb_delegate.cc       |  2 ++
- .../autofill/core/browser/form_structure.cc     |  2 ++
- .../core/browser/ui/suggestion_selection.cc     | 12 +-----------
- .../core/browser/webdata/autofill_table.cc      | 12 ++++++------
- .../omnibox/browser/omnibox_field_trial.cc      |  4 ++--
- .../phishing_image_embedder.cc                  | 14 +++-----------
- content/browser/browser_interface_binders.cc    |  1 +
- crypto/BUILD.gn                                 |  1 +
- net/BUILD.gn                                    |  1 +
- third_party/libevent/BUILD.gn                   |  2 ++
- 22 files changed, 39 insertions(+), 51 deletions(-)
+ android_webview/system_webview_bundle.gni          |  4 ++++
+ .../org/chromium/chrome/browser/tab/TabImpl.java   |  2 +-
+ chrome/browser/download/download_ui_model.cc       |  2 ++
+ .../api/autofill_private/autofill_util.cc          |  2 ++
+ chrome/browser/safe_browsing/BUILD.gn              |  1 +
+ ..._auction_consented_debugging_infobar_delegate.h |  2 +-
+ chrome/browser/ui/views/tabs/tab.cc                |  2 +-
+ chrome/browser/ui/views/tabs/tab_group_header.cc   |  2 +-
+ .../app_management/app_management_page_handler.cc  |  2 ++
+ chrome/browser/usb/chrome_usb_delegate.cc          |  2 ++
+ components/autofill/core/browser/form_structure.cc |  2 ++
+ .../core/browser/ui/suggestion_selection.cc        | 12 +-----------
+ .../core/browser/webdata/autofill_table.cc         | 12 ++++++------
+ components/omnibox/browser/omnibox_field_trial.cc  |  4 ++--
+ .../phishing_classifier/phishing_image_embedder.cc | 14 +++-----------
+ content/browser/browser_interface_binders.cc       |  1 +
+ crypto/BUILD.gn                                    |  1 +
+ net/BUILD.gn                                       |  1 +
+ third_party/libevent/BUILD.gn                      |  2 ++
+ 19 files changed, 36 insertions(+), 34 deletions(-)
 
 diff --git a/android_webview/system_webview_bundle.gni b/android_webview/system_webview_bundle.gni
 --- a/android_webview/system_webview_bundle.gni
 +++ b/android_webview/system_webview_bundle.gni
-@@ -84,6 +84,10 @@ template("system_webview_bundle") {
+@@ -85,6 +85,10 @@ template("system_webview_bundle") {
          custom_assertion_handler = crash_reporting_assertion_handler
        }
      }
@@ -41,21 +38,10 @@ diff --git a/android_webview/system_webview_bundle.gni b/android_webview/system_
    }
  
    android_app_bundle(target_name) {
-diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
---- a/build/config/android/rules.gni
-+++ b/build/config/android/rules.gni
-@@ -4993,6 +4993,7 @@ if (enable_java_templates && is_android) {
-       _module_build_config = _module.build_config
-       _module_build_config_target = _module.build_config_target
-       _module_target_name = get_label_info(_module_target, "name")
-+      not_needed(["_module_target_name"])
- 
-       if (!_proguard_enabled) {
-         _dex_target = "${_module_target_name}__final_dex"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
-@@ -377,7 +377,7 @@ public class TabImpl implements Tab {
+@@ -385,7 +385,7 @@ public class TabImpl implements Tab {
      }
  
      @Override
@@ -67,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
 diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/download/download_ui_model.cc
 --- a/chrome/browser/download/download_ui_model.cc
 +++ b/chrome/browser/download/download_ui_model.cc
-@@ -176,6 +176,7 @@ bool ShouldShowWarningForNoSafeBrowsing(Profile* profile) {
+@@ -177,6 +177,7 @@ bool ShouldShowWarningForNoSafeBrowsing(Profile* profile) {
  #endif
  }
  
@@ -75,7 +61,7 @@ diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/downl
  bool CanUserTurnOnSafeBrowsing(Profile* profile) {
  #if BUILDFLAG(FULL_SAFE_BROWSING)
    return !safe_browsing::IsSafeBrowsingPolicyManaged(*profile->GetPrefs());
-@@ -183,6 +184,7 @@ bool CanUserTurnOnSafeBrowsing(Profile* profile) {
+@@ -184,6 +185,7 @@ bool CanUserTurnOnSafeBrowsing(Profile* profile) {
    return false;
  #endif
  }
@@ -102,25 +88,6 @@ diff --git a/chrome/browser/extensions/api/autofill_private/autofill_util.cc b/c
  
  // Gets the string corresponding to |type| from |profile|.
  std::string GetStringFromProfile(const autofill::AutofillProfile& profile,
-diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc
---- a/chrome/browser/extensions/extension_util.cc
-+++ b/chrome/browser/extensions/extension_util.cc
-@@ -71,6 +71,7 @@ std::string ReloadExtensionIfEnabled(const std::string& extension_id,
-   return ReloadExtension(extension_id, context);
- }
- 
-+#if BUILDFLAG(IS_CHROMEOS_ASH)
- // Returns true if the extension ID is found in the InstallForceList policy. Is
- // checked by HasIsolatedStorage() when the extension is not found in the
- // registry.
-@@ -91,6 +92,7 @@ bool IsForceInstalledExtension(const ExtensionId& extension_id,
-   }
-   return false;
- }
-+#endif
- 
- // Returns true if the profile is a sign-in profile and the extension is policy
- // installed. `is_policy_installed` can be passed to the method if its value is
 diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -132,33 +99,6 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
      ]
      if (safe_browsing_mode == 1) {
        # "Safe Browsing Full" files in addition to the "basic" ones to use for
-diff --git a/chrome/browser/safe_browsing/user_interaction_observer.cc b/chrome/browser/safe_browsing/user_interaction_observer.cc
---- a/chrome/browser/safe_browsing/user_interaction_observer.cc
-+++ b/chrome/browser/safe_browsing/user_interaction_observer.cc
-@@ -36,23 +36,6 @@ WEB_CONTENTS_USER_DATA_KEY_IMPL(SafeBrowsingUserInteractionObserver);
- 
- namespace {
- 
--bool IsUrlElisionDisabled(Profile* profile,
--                          const char* suspicious_site_reporter_extension_id) {
--  if (profile &&
--      profile->GetPrefs()->GetBoolean(omnibox::kPreventUrlElisionsInOmnibox)) {
--    return true;
--  }
--#if BUILDFLAG(ENABLE_EXTENSIONS)
--  DCHECK(suspicious_site_reporter_extension_id);
--  if (profile && extensions::ExtensionRegistry::Get(profile)
--                     ->enabled_extensions()
--                     .Contains(suspicious_site_reporter_extension_id)) {
--    return true;
--  }
--#endif
--  return false;
--}
--
- }  // namespace
- 
- // static
 diff --git a/chrome/browser/ui/startup/bidding_and_auction_consented_debugging_infobar_delegate.h b/chrome/browser/ui/startup/bidding_and_auction_consented_debugging_infobar_delegate.h
 --- a/chrome/browser/ui/startup/bidding_and_auction_consented_debugging_infobar_delegate.h
 +++ b/chrome/browser/ui/startup/bidding_and_auction_consented_debugging_infobar_delegate.h
@@ -174,7 +114,7 @@ diff --git a/chrome/browser/ui/startup/bidding_and_auction_consented_debugging_i
 diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
 --- a/chrome/browser/ui/views/tabs/tab.cc
 +++ b/chrome/browser/ui/views/tabs/tab.cc
-@@ -524,7 +524,7 @@ bool Tab::OnMousePressed(const ui::MouseEvent& event) {
+@@ -536,7 +536,7 @@ bool Tab::OnMousePressed(const ui::MouseEvent& event) {
  }
  
  bool Tab::OnMouseDragged(const ui::MouseEvent& event) {
@@ -198,7 +138,7 @@ diff --git a/chrome/browser/ui/views/tabs/tab_group_header.cc b/chrome/browser/u
 diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler.cc b/chrome/browser/ui/webui/app_management/app_management_page_handler.cc
 --- a/chrome/browser/ui/webui/app_management/app_management_page_handler.cc
 +++ b/chrome/browser/ui/webui/app_management/app_management_page_handler.cc
-@@ -134,6 +134,7 @@ bool CanShowDefaultAppAssociationsUi() {
+@@ -137,6 +137,7 @@ bool CanShowDefaultAppAssociationsUi() {
  #endif
  }
  
@@ -206,7 +146,7 @@ diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler.
  // Returns a list of intent filters that support http/https given an app ID.
  apps::IntentFilters GetSupportedLinkIntentFilters(Profile* profile,
                                                    const std::string& app_id) {
-@@ -167,6 +168,7 @@ std::vector<std::string> GetSupportedLinks(Profile* profile,
+@@ -171,6 +172,7 @@ std::vector<std::string> GetSupportedLinks(Profile* profile,
    return std::vector<std::string>(supported_links.begin(),
                                    supported_links.end());
  }
@@ -236,7 +176,7 @@ diff --git a/chrome/browser/usb/chrome_usb_delegate.cc b/chrome/browser/usb/chro
 diff --git a/components/autofill/core/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc
 --- a/components/autofill/core/browser/form_structure.cc
 +++ b/components/autofill/core/browser/form_structure.cc
-@@ -219,6 +219,7 @@ void EncodeRandomizedValue(const RandomizedEncoder& encoder,
+@@ -221,6 +221,7 @@ void EncodeRandomizedValue(const RandomizedEncoder& encoder,
  //   In that case, use the server prediction instead. In the special case that
  //   the last specified manual override is a pass through, copy all server
  //   predictions.
@@ -244,7 +184,7 @@ diff --git a/components/autofill/core/browser/form_structure.cc b/components/aut
  std::deque<FieldSuggestion> MergeManualAndServerOverrides(
      std::deque<FieldSuggestion> manual_overrides,
      std::deque<FieldSuggestion> server_overrides) {
-@@ -244,6 +245,7 @@ std::deque<FieldSuggestion> MergeManualAndServerOverrides(
+@@ -246,6 +247,7 @@ std::deque<FieldSuggestion> MergeManualAndServerOverrides(
  
    return result;
  }
@@ -255,7 +195,7 @@ diff --git a/components/autofill/core/browser/form_structure.cc b/components/aut
 diff --git a/components/autofill/core/browser/ui/suggestion_selection.cc b/components/autofill/core/browser/ui/suggestion_selection.cc
 --- a/components/autofill/core/browser/ui/suggestion_selection.cc
 +++ b/components/autofill/core/browser/ui/suggestion_selection.cc
-@@ -101,17 +101,7 @@ Suggestion GetFillFullNameSuggestion(Suggestion::BackendId backend_id) {
+@@ -152,17 +152,7 @@ Suggestion GetFillFullNameSuggestion(Suggestion::BackendId backend_id) {
  // whole form.
  // TODO(crbug.com/1459990): Use this once the new popup with submenus
  // implementation is complete.
@@ -271,13 +211,13 @@ diff --git a/components/autofill/core/browser/ui/suggestion_selection.cc b/compo
 -  return suggestion;
 -}
 +// (UAZO) removed due error: unused function
+ 
  // Append new suggestions to `suggestions` based on the `ServerFieldType` list
  // provided. Suggestions are not added if their info is not found in the
- // provided `profile`. Returns true if any suggestion was added.
 diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc
 --- a/components/autofill/core/browser/webdata/autofill_table.cc
 +++ b/components/autofill/core/browser/webdata/autofill_table.cc
-@@ -413,12 +413,12 @@ void InsertBuilder(sql::Database* db,
+@@ -412,12 +412,12 @@ void InsertBuilder(sql::Database* db,
  }
  
  // Renames the table `from` into `to` and returns true if successful.
@@ -299,7 +239,7 @@ diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/compon
 diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
 --- a/components/omnibox/browser/omnibox_field_trial.cc
 +++ b/components/omnibox/browser/omnibox_field_trial.cc
-@@ -1079,11 +1079,11 @@ MLConfig::MLConfig(const MLConfig&) = default;
+@@ -1091,11 +1091,11 @@ MLConfig::MLConfig(const MLConfig&) = default;
  
  ScopedMLConfigForTesting::ScopedMLConfigForTesting()
      : original_config_(std::make_unique<MLConfig>(GetMLConfig())) {
@@ -340,7 +280,7 @@ diff --git a/components/safe_browsing/content/renderer/phishing_classifier/phish
 diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc
 --- a/content/browser/browser_interface_binders.cc
 +++ b/content/browser/browser_interface_binders.cc
-@@ -350,6 +350,7 @@ void BindDateTimeChooserForFrame(
+@@ -353,6 +353,7 @@ void BindDateTimeChooserForFrame(
  void BindTextSuggestionHostForFrame(
      RenderFrameHost* host,
      mojo::PendingReceiver<blink::mojom::TextSuggestionHost> receiver) {
@@ -362,7 +302,7 @@ diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1657,6 +1657,7 @@ component("net") {
+@@ -1659,6 +1659,7 @@ component("net") {
      configs -= [ "//build/config/compiler:default_optimization" ]
      configs += [ "//build/config/compiler:optimize_max" ]
    }
diff --git a/build/patches/00Internal-firewall.patch b/build/patches/00Internal-firewall.patch
index c4fb4a71..96681f72 100644
--- a/build/patches/00Internal-firewall.patch
+++ b/build/patches/00Internal-firewall.patch
@@ -55,7 +55,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2468,6 +2468,7 @@ static_library("browser") {
+@@ -2493,6 +2493,7 @@ static_library("browser") {
      "//third_party/ungoogled:switches",
      "//services/device/public/mojom",
      "//services/device/public/mojom:usb",
@@ -66,7 +66,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -198,6 +198,7 @@
+@@ -201,6 +201,7 @@
  #include "sandbox/policy/features.h"
  #include "sandbox/policy/switches.h"
  #include "services/device/public/cpp/device_features.h"
@@ -74,7 +74,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #include "services/media_session/public/cpp/features.h"
  #include "services/network/public/cpp/features.h"
  #include "services/network/public/cpp/network_switches.h"
-@@ -8275,6 +8276,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8328,6 +8329,11 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(page_info::kPageInfoHideSiteSettings)},
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -83,9 +83,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 +     "Enable internal firewall", kOsDesktop | kOsAndroid,
 +     FEATURE_VALUE_TYPE(firewall::features::kEnableFirewall)},
 +
- #if BUILDFLAG(IS_ANDROID)
-     {"page-info-about-this-site-improved-bottomsheet",
-      flag_descriptions::kPageInfoAboutThisSiteImprovedBottomSheetName,
+ #if !BUILDFLAG(IS_ANDROID)
+     {"page-info-history-desktop",
+      flag_descriptions::kPageInfoHistoryDesktopName,
 diff --git a/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc b/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc
 --- a/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc
 +++ b/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc
@@ -235,7 +235,7 @@ diff --git a/components/webapps/browser/android/webapk/webapk_icon_hasher.cc b/c
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1096,6 +1096,7 @@ component("net") {
+@@ -1098,6 +1098,7 @@ component("net") {
      "//build:chromeos_buildflags",
      "//net/data/ssl/chrome_root_store:gen_root_store_inc",
      "//net/http:transport_security_state_generated_files",
@@ -260,7 +260,7 @@ diff --git a/net/traffic_annotation/network_traffic_annotation.h b/net/traffic_a
 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
 --- a/net/url_request/url_request_http_job.cc
 +++ b/net/url_request/url_request_http_job.cc
-@@ -241,6 +241,9 @@ URLRequestHttpJob::URLRequestHttpJob(
+@@ -261,6 +261,9 @@ URLRequestHttpJob::URLRequestHttpJob(
      throttling_entry_ = manager->RegisterRequestUrl(request->url());
  
    ResetTimer();
@@ -270,7 +270,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
  }
  
  URLRequestHttpJob::~URLRequestHttpJob() {
-@@ -545,6 +548,18 @@ void URLRequestHttpJob::MaybeStartTransactionInternal(int result) {
+@@ -574,6 +577,18 @@ void URLRequestHttpJob::MaybeStartTransactionInternal(int result) {
  void URLRequestHttpJob::StartTransactionInternal() {
    DCHECK(!override_response_headers_);
  
@@ -1536,7 +1536,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
  #include "services/network/brokered_client_socket_factory.h"
  #include "services/network/cookie_manager.h"
  #include "services/network/cors/cors_url_loader_factory.h"
-@@ -1580,6 +1581,9 @@ void NetworkContext::OnNewSCTAuditingReportSent() {
+@@ -1625,6 +1626,9 @@ void NetworkContext::OnNewSCTAuditingReportSent() {
  void NetworkContext::CreateUDPSocket(
      mojo::PendingReceiver<mojom::UDPSocket> receiver,
      mojo::PendingRemote<mojom::UDPSocketListener> listener) {
@@ -1546,7 +1546,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
    socket_factory_->CreateUDPSocket(std::move(receiver), std::move(listener));
  }
  
-@@ -1592,6 +1596,17 @@ void NetworkContext::CreateRestrictedUDPSocket(
+@@ -1637,6 +1641,17 @@ void NetworkContext::CreateRestrictedUDPSocket(
      mojo::PendingRemote<mojom::UDPSocketListener> listener,
      CreateRestrictedUDPSocketCallback callback) {
    // SimpleHostResolver is transitively owned by |this|.
@@ -1564,7 +1564,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
    socket_factory_->CreateRestrictedUDPSocket(
        addr, mode, traffic_annotation, std::move(params), std::move(receiver),
        std::move(listener), SimpleHostResolver::Create(this),
-@@ -1604,6 +1619,17 @@ void NetworkContext::CreateTCPServerSocket(
+@@ -1649,6 +1664,17 @@ void NetworkContext::CreateTCPServerSocket(
      const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
      mojo::PendingReceiver<mojom::TCPServerSocket> receiver,
      CreateTCPServerSocketCallback callback) {
@@ -1582,7 +1582,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
    socket_factory_->CreateTCPServerSocket(
        local_addr, std::move(options),
        static_cast<net::NetworkTrafficAnnotationTag>(traffic_annotation),
-@@ -1618,6 +1644,21 @@ void NetworkContext::CreateTCPConnectedSocket(
+@@ -1663,6 +1689,21 @@ void NetworkContext::CreateTCPConnectedSocket(
      mojo::PendingReceiver<mojom::TCPConnectedSocket> receiver,
      mojo::PendingRemote<mojom::SocketObserver> observer,
      CreateTCPConnectedSocketCallback callback) {
@@ -1604,7 +1604,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
    socket_factory_->CreateTCPConnectedSocket(
        local_addr, remote_addr_list, std::move(tcp_connected_socket_options),
        static_cast<net::NetworkTrafficAnnotationTag>(traffic_annotation),
-@@ -1629,6 +1670,20 @@ void NetworkContext::CreateTCPBoundSocket(
+@@ -1674,6 +1715,20 @@ void NetworkContext::CreateTCPBoundSocket(
      const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
      mojo::PendingReceiver<mojom::TCPBoundSocket> receiver,
      CreateTCPBoundSocketCallback callback) {
@@ -1625,7 +1625,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
    socket_factory_->CreateTCPBoundSocket(
        local_addr,
        static_cast<net::NetworkTrafficAnnotationTag>(traffic_annotation),
-@@ -1694,6 +1749,24 @@ void NetworkContext::CreateWebSocket(
+@@ -1739,6 +1794,24 @@ void NetworkContext::CreateWebSocket(
      mojo::PendingRemote<mojom::WebSocketAuthenticationHandler> auth_handler,
      mojo::PendingRemote<mojom::TrustedHeaderClient> header_client,
      const absl::optional<base::UnguessableToken>& throttling_profile_id) {
@@ -1708,7 +1708,7 @@ diff --git a/services/network/public/cpp/simple_url_loader.h b/services/network/
 diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/url_loader.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/url_loader.cc
 --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/url_loader.cc
 +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/url_loader.cc
-@@ -652,23 +652,150 @@ net::NetworkTrafficAnnotationTag URLLoader::Context::GetTrafficAnnotationTag(
+@@ -648,23 +648,150 @@ net::NetworkTrafficAnnotationTag URLLoader::Context::GetTrafficAnnotationTag(
        NOTREACHED();
        [[fallthrough]];
  
diff --git a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch
index 47138acf..4d44e304 100644
--- a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch
+++ b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch
@@ -44,8 +44,8 @@ diff --git a/net/base/features.cc b/net/base/features.cc
 +             "CookieDomainRejectNonASCII",          // guard this
 +             base::FEATURE_ENABLED_BY_DEFAULT);     // guard this
  
- BASE_FEATURE(kBlockSetCookieHeader,
-              "BlockSetCookieHeader",
+ // Enables partitioning of third party storage (IndexedDB, CacheStorage, etc.)
+ // by the top level site to reduce fingerprinting.
 diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
 --- a/net/cookies/canonical_cookie.cc
 +++ b/net/cookies/canonical_cookie.cc
@@ -99,7 +99,7 @@ diff --git a/net/cookies/parsed_cookie.h b/net/cookies/parsed_cookie.h
  #include "net/base/net_export.h"
  #include "net/cookies/cookie_constants.h"
  
-@@ -83,7 +84,11 @@ class NET_EXPORT ParsedCookie {
+@@ -86,7 +87,11 @@ class NET_EXPORT ParsedCookie {
        CookieSameSiteString* samesite_string = nullptr) const;
    CookiePriority Priority() const;
    bool IsSameParty() const { return same_party_index_ != 0; }
@@ -167,7 +167,7 @@ diff --git a/services/network/cookie_settings.cc b/services/network/cookie_setti
 diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
 --- a/services/network/restricted_cookie_manager.cc
 +++ b/services/network/restricted_cookie_manager.cc
-@@ -783,6 +783,9 @@ void RestrictedCookieManager::SetCookieFromString(
+@@ -798,6 +798,9 @@ void RestrictedCookieManager::SetCookieFromString(
    std::move(callback).Run(site_for_cookies_ok, top_frame_origin_ok);
    callback = base::DoNothing();
  
@@ -176,7 +176,7 @@ diff --git a/services/network/restricted_cookie_manager.cc b/services/network/re
 +
    net::CookieInclusionStatus status;
    std::unique_ptr<net::CanonicalCookie> parsed_cookie =
-       net::CanonicalCookie::Create(url, cookie, base::Time::Now(),
+       net::CanonicalCookie::Create(
 diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_init.idl b/third_party/blink/renderer/modules/cookie_store/cookie_init.idl
 --- a/third_party/blink/renderer/modules/cookie_store/cookie_init.idl
 +++ b/third_party/blink/renderer/modules/cookie_store/cookie_init.idl
diff --git a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch
index adcc9897..02f9896b 100644
--- a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch
+++ b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch
@@ -43,7 +43,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -42,7 +42,7 @@ const PrepopulatedEngine* const engines_AE[] = {
+@@ -43,7 +43,7 @@ const PrepopulatedEngine* const engines_AE[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -52,7 +52,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -60,7 +60,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+@@ -61,7 +61,7 @@ const PrepopulatedEngine* const engines_AR[] = {
      &googleen, &google,
      &bing,
      &yahoo_ar,
@@ -61,7 +61,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -68,7 +68,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+@@ -69,7 +69,7 @@ const PrepopulatedEngine* const engines_AR[] = {
  const PrepopulatedEngine* const engines_AT[] = {
      &googleen, &google,
      &bing,
@@ -70,7 +70,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &duckduckgo,
      &ecosia,
  };
-@@ -78,7 +78,7 @@ const PrepopulatedEngine* const engines_AU[] = {
+@@ -79,7 +79,7 @@ const PrepopulatedEngine* const engines_AU[] = {
      &googleen, &google,
      &bing,
      &yahoo_au,
@@ -79,7 +79,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -87,7 +87,7 @@ const PrepopulatedEngine* const engines_BA[] = {
+@@ -88,7 +88,7 @@ const PrepopulatedEngine* const engines_BA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -88,7 +88,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -97,7 +97,7 @@ const PrepopulatedEngine* const engines_BE[] = {
+@@ -98,7 +98,7 @@ const PrepopulatedEngine* const engines_BE[] = {
      &bing,
      &yahoo,
      &ecosia,
@@ -97,7 +97,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Bulgaria
-@@ -105,7 +105,7 @@ const PrepopulatedEngine* const engines_BG[] = {
+@@ -106,7 +106,7 @@ const PrepopulatedEngine* const engines_BG[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -106,7 +106,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -114,7 +114,7 @@ const PrepopulatedEngine* const engines_BH[] = {
+@@ -115,7 +115,7 @@ const PrepopulatedEngine* const engines_BH[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -115,7 +115,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -123,7 +123,7 @@ const PrepopulatedEngine* const engines_BI[] = {
+@@ -124,7 +124,7 @@ const PrepopulatedEngine* const engines_BI[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -124,7 +124,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -132,7 +132,7 @@ const PrepopulatedEngine* const engines_BN[] = {
+@@ -133,7 +133,7 @@ const PrepopulatedEngine* const engines_BN[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -133,7 +133,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -141,7 +141,7 @@ const PrepopulatedEngine* const engines_BO[] = {
+@@ -142,7 +142,7 @@ const PrepopulatedEngine* const engines_BO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -142,7 +142,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -150,7 +150,7 @@ const PrepopulatedEngine* const engines_BR[] = {
+@@ -151,7 +151,7 @@ const PrepopulatedEngine* const engines_BR[] = {
      &googleen, &google,
      &bing,
      &yahoo_br,
@@ -151,7 +151,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -160,7 +160,7 @@ const PrepopulatedEngine* const engines_BY[] = {
+@@ -161,7 +161,7 @@ const PrepopulatedEngine* const engines_BY[] = {
      &yandex_by,
      &mail_ru,
      &bing,
@@ -160,7 +160,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Belize
-@@ -177,7 +177,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+@@ -178,7 +178,7 @@ const PrepopulatedEngine* const engines_CA[] = {
      &googleen, &google,
      &bing,
      &yahoo_ca,
@@ -169,7 +169,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -185,7 +185,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+@@ -186,7 +186,7 @@ const PrepopulatedEngine* const engines_CA[] = {
  const PrepopulatedEngine* const engines_CH[] = {
      &googleen, &google,
      &bing,
@@ -178,7 +178,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_ch,
      &ecosia,
  };
-@@ -195,7 +195,7 @@ const PrepopulatedEngine* const engines_CL[] = {
+@@ -196,7 +196,7 @@ const PrepopulatedEngine* const engines_CL[] = {
      &googleen, &google,
      &bing,
      &yahoo_cl,
@@ -187,7 +187,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -214,7 +214,7 @@ const PrepopulatedEngine* const engines_CO[] = {
+@@ -215,7 +215,7 @@ const PrepopulatedEngine* const engines_CO[] = {
      &bing,
      &yahoo_co,
      &duckduckgo,
@@ -196,7 +196,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Costa Rica
-@@ -222,7 +222,7 @@ const PrepopulatedEngine* const engines_CR[] = {
+@@ -223,7 +223,7 @@ const PrepopulatedEngine* const engines_CR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -205,7 +205,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -232,7 +232,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
+@@ -233,7 +233,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
      &seznam_cz,
      &bing,
      &yahoo,
@@ -214,7 +214,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Germany
-@@ -240,7 +240,7 @@ const PrepopulatedEngine* const engines_DE[] = {
+@@ -241,7 +241,7 @@ const PrepopulatedEngine* const engines_DE[] = {
      &googleen, &google,
      &bing,
      &yahoo_de,
@@ -223,7 +223,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -249,7 +249,7 @@ const PrepopulatedEngine* const engines_DK[] = {
+@@ -250,7 +250,7 @@ const PrepopulatedEngine* const engines_DK[] = {
      &googleen, &google,
      &bing,
      &yahoo_dk,
@@ -232,7 +232,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -258,7 +258,7 @@ const PrepopulatedEngine* const engines_DO[] = {
+@@ -259,7 +259,7 @@ const PrepopulatedEngine* const engines_DO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -241,7 +241,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -268,7 +268,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
+@@ -269,7 +269,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
      &bing,
      &yahoo_fr,
      &yandex_com,
@@ -250,7 +250,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Ecuador
-@@ -295,7 +295,7 @@ const PrepopulatedEngine* const engines_EG[] = {
+@@ -296,7 +296,7 @@ const PrepopulatedEngine* const engines_EG[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -259,7 +259,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Spain
-@@ -303,7 +303,7 @@ const PrepopulatedEngine* const engines_ES[] = {
+@@ -304,7 +304,7 @@ const PrepopulatedEngine* const engines_ES[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -268,7 +268,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -312,7 +312,7 @@ const PrepopulatedEngine* const engines_FI[] = {
+@@ -313,7 +313,7 @@ const PrepopulatedEngine* const engines_FI[] = {
      &googleen, &google,
      &bing,
      &yahoo_fi,
@@ -277,7 +277,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -339,7 +339,7 @@ const PrepopulatedEngine* const engines_GB[] = {
+@@ -340,7 +340,7 @@ const PrepopulatedEngine* const engines_GB[] = {
      &googleen, &google,
      &bing,
      &yahoo_uk,
@@ -286,7 +286,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -348,7 +348,7 @@ const PrepopulatedEngine* const engines_GR[] = {
+@@ -349,7 +349,7 @@ const PrepopulatedEngine* const engines_GR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -295,7 +295,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -357,7 +357,7 @@ const PrepopulatedEngine* const engines_GT[] = {
+@@ -358,7 +358,7 @@ const PrepopulatedEngine* const engines_GT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -304,7 +304,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -367,7 +367,7 @@ const PrepopulatedEngine* const engines_HK[] = {
+@@ -368,7 +368,7 @@ const PrepopulatedEngine* const engines_HK[] = {
      &bing,
      &yahoo_hk,
      &baidu,
@@ -313,7 +313,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Honduras
-@@ -375,7 +375,7 @@ const PrepopulatedEngine* const engines_HN[] = {
+@@ -376,7 +376,7 @@ const PrepopulatedEngine* const engines_HN[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -322,7 +322,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -393,7 +393,7 @@ const PrepopulatedEngine* const engines_HU[] = {
+@@ -394,7 +394,7 @@ const PrepopulatedEngine* const engines_HU[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -331,7 +331,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -402,7 +402,7 @@ const PrepopulatedEngine* const engines_ID[] = {
+@@ -403,7 +403,7 @@ const PrepopulatedEngine* const engines_ID[] = {
      &googleen, &google,
      &bing,
      &yahoo_id,
@@ -340,7 +340,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IE[] = {
+@@ -412,7 +412,7 @@ const PrepopulatedEngine* const engines_IE[] = {
      &googleen, &google,
      &bing,
      &yahoo_uk,
@@ -349,7 +349,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -421,7 +421,7 @@ const PrepopulatedEngine* const engines_IL[] = {
+@@ -422,7 +422,7 @@ const PrepopulatedEngine* const engines_IL[] = {
      &bing,
      &yandex_ru,
      &yahoo,
@@ -358,7 +358,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // India
-@@ -429,7 +429,7 @@ const PrepopulatedEngine* const engines_IN[] = {
+@@ -430,7 +430,7 @@ const PrepopulatedEngine* const engines_IN[] = {
      &googleen, &google,
      &bing,
      &yahoo_in,
@@ -367,7 +367,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &info_com,
  };
  
-@@ -439,7 +439,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
+@@ -440,7 +440,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
      &bing,
      &yahoo,
      &yandex_tr,
@@ -376,7 +376,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Iran
-@@ -448,14 +448,14 @@ const PrepopulatedEngine* const engines_IR[] = {
+@@ -449,14 +449,14 @@ const PrepopulatedEngine* const engines_IR[] = {
      &bing,
      &yahoo,
      &duckduckgo,
@@ -393,7 +393,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &ecosia,
  };
-@@ -465,7 +465,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+@@ -466,7 +466,7 @@ const PrepopulatedEngine* const engines_IT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -402,7 +402,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+@@ -475,7 +475,7 @@ const PrepopulatedEngine* const engines_JM[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -411,7 +411,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -492,7 +492,7 @@ const PrepopulatedEngine* const engines_JP[] = {
+@@ -493,7 +493,7 @@ const PrepopulatedEngine* const engines_JP[] = {
      &googleen, &google,
      &bing,
      &yahoo_jp,
@@ -420,7 +420,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &baidu,
  };
  
-@@ -501,7 +501,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+@@ -502,7 +502,7 @@ const PrepopulatedEngine* const engines_KE[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -429,7 +429,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -529,7 +529,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
+@@ -530,7 +530,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
      &yandex_kz,
      &mail_ru,
      &bing,
@@ -438,7 +438,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Lebanon
-@@ -537,7 +537,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -538,7 +538,7 @@ const PrepopulatedEngine* const engines_LB[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -447,7 +447,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -545,7 +545,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -546,7 +546,7 @@ const PrepopulatedEngine* const engines_LB[] = {
  const PrepopulatedEngine* const engines_LI[] = {
      &googleen, &google,
      &bing,
@@ -456,7 +456,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &ecosia,
  };
-@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -556,7 +556,7 @@ const PrepopulatedEngine* const engines_LT[] = {
      &googleen, &google,
      &bing,
      &yandex_ru,
@@ -465,7 +465,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
  };
  
-@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -564,7 +564,7 @@ const PrepopulatedEngine* const engines_LT[] = {
  const PrepopulatedEngine* const engines_LU[] = {
      &googleen, &google,
      &bing,
@@ -474,7 +474,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &ecosia,
  };
-@@ -574,7 +574,7 @@ const PrepopulatedEngine* const engines_LV[] = {
+@@ -575,7 +575,7 @@ const PrepopulatedEngine* const engines_LV[] = {
      &bing,
      &yandex_ru,
      &yahoo,
@@ -483,7 +483,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Libya
-@@ -583,7 +583,7 @@ const PrepopulatedEngine* const engines_LY[] = {
+@@ -584,7 +584,7 @@ const PrepopulatedEngine* const engines_LY[] = {
      &bing,
      &yahoo,
      &yandex_tr,
@@ -492,7 +492,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Morocco
-@@ -592,14 +592,14 @@ const PrepopulatedEngine* const engines_MA[] = {
+@@ -593,14 +593,14 @@ const PrepopulatedEngine* const engines_MA[] = {
      &bing,
      &yahoo_fr,
      &yandex_com,
@@ -509,7 +509,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &duckduckgo,
      &qwant,
  };
-@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_ME[] = {
+@@ -620,7 +620,7 @@ const PrepopulatedEngine* const engines_ME[] = {
      &bing,
      &yandex_ru,
      &yahoo,
@@ -518,7 +518,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Macedonia
-@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+@@ -628,7 +628,7 @@ const PrepopulatedEngine* const engines_MK[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -527,7 +527,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -636,7 +636,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+@@ -637,7 +637,7 @@ const PrepopulatedEngine* const engines_MX[] = {
      &googleen, &google,
      &bing,
      &yahoo_mx,
@@ -536,7 +536,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -645,7 +645,7 @@ const PrepopulatedEngine* const engines_MY[] = {
+@@ -646,7 +646,7 @@ const PrepopulatedEngine* const engines_MY[] = {
      &googleen, &google,
      &bing,
      &yahoo_my,
@@ -545,7 +545,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -654,7 +654,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+@@ -655,7 +655,7 @@ const PrepopulatedEngine* const engines_NI[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -554,7 +554,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -663,7 +663,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+@@ -664,7 +664,7 @@ const PrepopulatedEngine* const engines_NL[] = {
      &googleen, &google,
      &bing,
      &yahoo_nl,
@@ -563,7 +563,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -672,7 +672,7 @@ const PrepopulatedEngine* const engines_NO[] = {
+@@ -673,7 +673,7 @@ const PrepopulatedEngine* const engines_NO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -572,7 +572,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -681,7 +681,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
+@@ -682,7 +682,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
      &googleen, &google,
      &bing,
      &yahoo_nz,
@@ -581,7 +581,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+@@ -700,7 +700,7 @@ const PrepopulatedEngine* const engines_PA[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -590,7 +590,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -709,7 +709,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+@@ -710,7 +710,7 @@ const PrepopulatedEngine* const engines_PE[] = {
      &bing,
      &yahoo_pe,
      &ecosia,
@@ -599,7 +599,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Philippines
-@@ -718,7 +718,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+@@ -719,7 +719,7 @@ const PrepopulatedEngine* const engines_PH[] = {
      &bing,
      &yahoo_ph,
      &ecosia,
@@ -608,7 +608,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Pakistan
-@@ -726,7 +726,7 @@ const PrepopulatedEngine* const engines_PK[] = {
+@@ -727,7 +727,7 @@ const PrepopulatedEngine* const engines_PK[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -617,7 +617,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -735,7 +735,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+@@ -736,7 +736,7 @@ const PrepopulatedEngine* const engines_PL[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -626,7 +626,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -744,7 +744,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -745,7 +745,7 @@ const PrepopulatedEngine* const engines_PR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -635,7 +635,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -753,7 +753,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -754,7 +754,7 @@ const PrepopulatedEngine* const engines_PT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -644,7 +644,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -763,7 +763,7 @@ const PrepopulatedEngine* const engines_PY[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -653,7 +653,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_QA[] = {
+@@ -772,7 +772,7 @@ const PrepopulatedEngine* const engines_QA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -662,7 +662,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
  };
  
-@@ -780,7 +780,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -781,7 +781,7 @@ const PrepopulatedEngine* const engines_RO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -671,7 +671,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
  };
  
-@@ -789,7 +789,7 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -790,7 +790,7 @@ const PrepopulatedEngine* const engines_RS[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -680,7 +680,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -799,7 +799,7 @@ const PrepopulatedEngine* const engines_RU[] = {
+@@ -800,7 +800,7 @@ const PrepopulatedEngine* const engines_RU[] = {
      &google,
      &duckduckgo,
      &bing,
@@ -689,7 +689,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Rwanda
-@@ -807,7 +807,7 @@ const PrepopulatedEngine* const engines_RW[] = {
+@@ -808,7 +808,7 @@ const PrepopulatedEngine* const engines_RW[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -698,7 +698,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -817,7 +817,7 @@ const PrepopulatedEngine* const engines_SA[] = {
+@@ -818,7 +818,7 @@ const PrepopulatedEngine* const engines_SA[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -707,7 +707,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Sweden
-@@ -825,7 +825,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -826,7 +826,7 @@ const PrepopulatedEngine* const engines_SE[] = {
      &googleen, &google,
      &bing,
      &yahoo_se,
@@ -716,7 +716,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -835,7 +835,7 @@ const PrepopulatedEngine* const engines_SG[] = {
      &googleen, &google,
      &bing,
      &yahoo_sg,
@@ -725,7 +725,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &duckduckgo,
  };
  
-@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -843,7 +843,7 @@ const PrepopulatedEngine* const engines_SG[] = {
  const PrepopulatedEngine* const engines_SI[] = {
      &googleen, &google,
      &bing,
@@ -734,7 +734,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &yandex_com,
  };
-@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+@@ -852,7 +852,7 @@ const PrepopulatedEngine* const engines_SI[] = {
  const PrepopulatedEngine* const engines_SK[] = {
      &googleen, &google,
      &bing,
@@ -743,7 +743,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &yandex_ru,
  };
-@@ -861,7 +861,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+@@ -862,7 +862,7 @@ const PrepopulatedEngine* const engines_SV[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -752,7 +752,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -871,7 +871,7 @@ const PrepopulatedEngine* const engines_SY[] = {
+@@ -872,7 +872,7 @@ const PrepopulatedEngine* const engines_SY[] = {
      &bing,
      &yandex_ru,
      &yahoo,
@@ -761,7 +761,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Thailand
-@@ -888,7 +888,7 @@ const PrepopulatedEngine* const engines_TN[] = {
+@@ -889,7 +889,7 @@ const PrepopulatedEngine* const engines_TN[] = {
      &googleen, &google,
      &bing,
      &yahoo_fr,
@@ -770,7 +770,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -898,7 +898,7 @@ const PrepopulatedEngine* const engines_TR[] = {
+@@ -899,7 +899,7 @@ const PrepopulatedEngine* const engines_TR[] = {
      &yandex_tr,
      &yahoo_tr,
      &bing,
@@ -779,7 +779,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Trinidad and Tobago
-@@ -906,7 +906,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+@@ -907,7 +907,7 @@ const PrepopulatedEngine* const engines_TT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -788,7 +788,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -915,8 +915,8 @@ const PrepopulatedEngine* const engines_TW[] = {
+@@ -916,8 +916,8 @@ const PrepopulatedEngine* const engines_TW[] = {
      &googleen, &google,
      &yahoo_tw,
      &bing,
@@ -799,7 +799,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Tanzania
-@@ -924,7 +924,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
+@@ -925,7 +925,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -808,7 +808,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -942,7 +942,7 @@ const PrepopulatedEngine* const engines_US[] = {
+@@ -943,7 +943,7 @@ const PrepopulatedEngine* const engines_US[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -817,7 +817,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -951,7 +951,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+@@ -952,7 +952,7 @@ const PrepopulatedEngine* const engines_UY[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -826,7 +826,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -978,8 +978,8 @@ const PrepopulatedEngine* const engines_YE[] = {
+@@ -979,8 +979,8 @@ const PrepopulatedEngine* const engines_YE[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -837,7 +837,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // South Africa
-@@ -987,7 +987,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+@@ -988,7 +988,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -846,7 +846,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -996,7 +996,7 @@ const PrepopulatedEngine* const engines_ZW[] = {
+@@ -997,7 +997,7 @@ const PrepopulatedEngine* const engines_ZW[] = {
      &googleen, &google,
      &bing,
      &yahoo,
diff --git a/build/patches/Add-English-only-search-engine.patch b/build/patches/Add-English-only-search-engine.patch
index 5c4226bf..43aa2243 100644
--- a/build/patches/Add-English-only-search-engine.patch
+++ b/build/patches/Add-English-only-search-engine.patch
@@ -57,7 +57,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -29,7 +29,7 @@ namespace {
+@@ -30,7 +30,7 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {
@@ -66,7 +66,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
  };
-@@ -39,7 +39,7 @@ const PrepopulatedEngine* const engines_default[] = {
+@@ -40,7 +40,7 @@ const PrepopulatedEngine* const engines_default[] = {
  // clang-format off
  // United Arab Emirates
  const PrepopulatedEngine* const engines_AE[] = {
@@ -75,7 +75,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -48,7 +48,7 @@ const PrepopulatedEngine* const engines_AE[] = {
+@@ -49,7 +49,7 @@ const PrepopulatedEngine* const engines_AE[] = {
  
  // Albania
  const PrepopulatedEngine* const engines_AL[] = {
@@ -84,7 +84,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -57,7 +57,7 @@ const PrepopulatedEngine* const engines_AL[] = {
+@@ -58,7 +58,7 @@ const PrepopulatedEngine* const engines_AL[] = {
  
  // Argentina
  const PrepopulatedEngine* const engines_AR[] = {
@@ -93,7 +93,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_ar,
      &duckduckgo,
-@@ -66,7 +66,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+@@ -67,7 +67,7 @@ const PrepopulatedEngine* const engines_AR[] = {
  
  // Austria
  const PrepopulatedEngine* const engines_AT[] = {
@@ -102,7 +102,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_at,
      &duckduckgo,
-@@ -75,7 +75,7 @@ const PrepopulatedEngine* const engines_AT[] = {
+@@ -76,7 +76,7 @@ const PrepopulatedEngine* const engines_AT[] = {
  
  // Australia
  const PrepopulatedEngine* const engines_AU[] = {
@@ -111,7 +111,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_au,
      &duckduckgo,
-@@ -84,7 +84,7 @@ const PrepopulatedEngine* const engines_AU[] = {
+@@ -85,7 +85,7 @@ const PrepopulatedEngine* const engines_AU[] = {
  
  // Bosnia and Herzegovina
  const PrepopulatedEngine* const engines_BA[] = {
@@ -120,7 +120,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -93,7 +93,7 @@ const PrepopulatedEngine* const engines_BA[] = {
+@@ -94,7 +94,7 @@ const PrepopulatedEngine* const engines_BA[] = {
  
  // Belgium
  const PrepopulatedEngine* const engines_BE[] = {
@@ -129,7 +129,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ecosia,
-@@ -102,7 +102,7 @@ const PrepopulatedEngine* const engines_BE[] = {
+@@ -103,7 +103,7 @@ const PrepopulatedEngine* const engines_BE[] = {
  
  // Bulgaria
  const PrepopulatedEngine* const engines_BG[] = {
@@ -138,7 +138,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -111,7 +111,7 @@ const PrepopulatedEngine* const engines_BG[] = {
+@@ -112,7 +112,7 @@ const PrepopulatedEngine* const engines_BG[] = {
  
  // Bahrain
  const PrepopulatedEngine* const engines_BH[] = {
@@ -147,7 +147,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -120,7 +120,7 @@ const PrepopulatedEngine* const engines_BH[] = {
+@@ -121,7 +121,7 @@ const PrepopulatedEngine* const engines_BH[] = {
  
  // Burundi
  const PrepopulatedEngine* const engines_BI[] = {
@@ -156,7 +156,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -129,7 +129,7 @@ const PrepopulatedEngine* const engines_BI[] = {
+@@ -130,7 +130,7 @@ const PrepopulatedEngine* const engines_BI[] = {
  
  // Brunei
  const PrepopulatedEngine* const engines_BN[] = {
@@ -165,7 +165,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -138,7 +138,7 @@ const PrepopulatedEngine* const engines_BN[] = {
+@@ -139,7 +139,7 @@ const PrepopulatedEngine* const engines_BN[] = {
  
  // Bolivia
  const PrepopulatedEngine* const engines_BO[] = {
@@ -174,7 +174,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -147,7 +147,7 @@ const PrepopulatedEngine* const engines_BO[] = {
+@@ -148,7 +148,7 @@ const PrepopulatedEngine* const engines_BO[] = {
  
  // Brazil
  const PrepopulatedEngine* const engines_BR[] = {
@@ -183,7 +183,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_br,
      &duckduckgo,
-@@ -156,7 +156,7 @@ const PrepopulatedEngine* const engines_BR[] = {
+@@ -157,7 +157,7 @@ const PrepopulatedEngine* const engines_BR[] = {
  
  // Belarus
  const PrepopulatedEngine* const engines_BY[] = {
@@ -192,7 +192,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_by,
      &mail_ru,
      &bing,
-@@ -165,7 +165,7 @@ const PrepopulatedEngine* const engines_BY[] = {
+@@ -166,7 +166,7 @@ const PrepopulatedEngine* const engines_BY[] = {
  
  // Belize
  const PrepopulatedEngine* const engines_BZ[] = {
@@ -201,7 +201,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -174,7 +174,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
+@@ -175,7 +175,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
  
  // Canada
  const PrepopulatedEngine* const engines_CA[] = {
@@ -210,7 +210,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_ca,
      &duckduckgo,
-@@ -183,7 +183,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+@@ -184,7 +184,7 @@ const PrepopulatedEngine* const engines_CA[] = {
  
  // Switzerland
  const PrepopulatedEngine* const engines_CH[] = {
@@ -219,7 +219,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo_ch,
-@@ -192,7 +192,7 @@ const PrepopulatedEngine* const engines_CH[] = {
+@@ -193,7 +193,7 @@ const PrepopulatedEngine* const engines_CH[] = {
  
  // Chile
  const PrepopulatedEngine* const engines_CL[] = {
@@ -228,7 +228,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_cl,
      &duckduckgo,
-@@ -203,14 +203,14 @@ const PrepopulatedEngine* const engines_CL[] = {
+@@ -204,14 +204,14 @@ const PrepopulatedEngine* const engines_CL[] = {
  const PrepopulatedEngine* const engines_CN[] = {
      &baidu,
      &bing,
@@ -245,7 +245,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_co,
      &duckduckgo,
-@@ -219,7 +219,7 @@ const PrepopulatedEngine* const engines_CO[] = {
+@@ -220,7 +220,7 @@ const PrepopulatedEngine* const engines_CO[] = {
  
  // Costa Rica
  const PrepopulatedEngine* const engines_CR[] = {
@@ -254,7 +254,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -228,7 +228,7 @@ const PrepopulatedEngine* const engines_CR[] = {
+@@ -229,7 +229,7 @@ const PrepopulatedEngine* const engines_CR[] = {
  
  // Czech Republic
  const PrepopulatedEngine* const engines_CZ[] = {
@@ -263,7 +263,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &seznam_cz,
      &bing,
      &yahoo,
-@@ -237,7 +237,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
+@@ -238,7 +238,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
  
  // Germany
  const PrepopulatedEngine* const engines_DE[] = {
@@ -272,7 +272,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_de,
      &duckduckgo,
-@@ -246,7 +246,7 @@ const PrepopulatedEngine* const engines_DE[] = {
+@@ -247,7 +247,7 @@ const PrepopulatedEngine* const engines_DE[] = {
  
  // Denmark
  const PrepopulatedEngine* const engines_DK[] = {
@@ -281,7 +281,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_dk,
      &duckduckgo,
-@@ -255,7 +255,7 @@ const PrepopulatedEngine* const engines_DK[] = {
+@@ -256,7 +256,7 @@ const PrepopulatedEngine* const engines_DK[] = {
  
  // Dominican Republic
  const PrepopulatedEngine* const engines_DO[] = {
@@ -290,7 +290,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -264,7 +264,7 @@ const PrepopulatedEngine* const engines_DO[] = {
+@@ -265,7 +265,7 @@ const PrepopulatedEngine* const engines_DO[] = {
  
  // Algeria
  const PrepopulatedEngine* const engines_DZ[] = {
@@ -299,7 +299,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &yandex_com,
-@@ -273,7 +273,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
+@@ -274,7 +274,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
  
  // Ecuador
  const PrepopulatedEngine* const engines_EC[] = {
@@ -308,7 +308,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &ecosia,
-@@ -282,7 +282,7 @@ const PrepopulatedEngine* const engines_EC[] = {
+@@ -283,7 +283,7 @@ const PrepopulatedEngine* const engines_EC[] = {
  
  // Estonia
  const PrepopulatedEngine* const engines_EE[] = {
@@ -317,7 +317,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &duckduckgo,
-@@ -291,7 +291,7 @@ const PrepopulatedEngine* const engines_EE[] = {
+@@ -292,7 +292,7 @@ const PrepopulatedEngine* const engines_EE[] = {
  
  // Egypt
  const PrepopulatedEngine* const engines_EG[] = {
@@ -326,7 +326,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -300,7 +300,7 @@ const PrepopulatedEngine* const engines_EG[] = {
+@@ -301,7 +301,7 @@ const PrepopulatedEngine* const engines_EG[] = {
  
  // Spain
  const PrepopulatedEngine* const engines_ES[] = {
@@ -335,7 +335,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -309,7 +309,7 @@ const PrepopulatedEngine* const engines_ES[] = {
+@@ -310,7 +310,7 @@ const PrepopulatedEngine* const engines_ES[] = {
  
  // Finland
  const PrepopulatedEngine* const engines_FI[] = {
@@ -344,7 +344,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fi,
      &duckduckgo,
-@@ -318,7 +318,7 @@ const PrepopulatedEngine* const engines_FI[] = {
+@@ -319,7 +319,7 @@ const PrepopulatedEngine* const engines_FI[] = {
  
  // Faroe Islands
  const PrepopulatedEngine* const engines_FO[] = {
@@ -353,7 +353,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_uk,
      &duckduckgo,
-@@ -327,7 +327,7 @@ const PrepopulatedEngine* const engines_FO[] = {
+@@ -328,7 +328,7 @@ const PrepopulatedEngine* const engines_FO[] = {
  
  // France
  const PrepopulatedEngine* const engines_FR[] = {
@@ -362,7 +362,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &qwant,
-@@ -336,7 +336,7 @@ const PrepopulatedEngine* const engines_FR[] = {
+@@ -337,7 +337,7 @@ const PrepopulatedEngine* const engines_FR[] = {
  
  // United Kingdom
  const PrepopulatedEngine* const engines_GB[] = {
@@ -371,7 +371,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_uk,
      &duckduckgo,
-@@ -345,7 +345,7 @@ const PrepopulatedEngine* const engines_GB[] = {
+@@ -346,7 +346,7 @@ const PrepopulatedEngine* const engines_GB[] = {
  
  // Greece
  const PrepopulatedEngine* const engines_GR[] = {
@@ -380,7 +380,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -354,7 +354,7 @@ const PrepopulatedEngine* const engines_GR[] = {
+@@ -355,7 +355,7 @@ const PrepopulatedEngine* const engines_GR[] = {
  
  // Guatemala
  const PrepopulatedEngine* const engines_GT[] = {
@@ -389,7 +389,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -363,7 +363,7 @@ const PrepopulatedEngine* const engines_GT[] = {
+@@ -364,7 +364,7 @@ const PrepopulatedEngine* const engines_GT[] = {
  
  // Hong Kong
  const PrepopulatedEngine* const engines_HK[] = {
@@ -398,7 +398,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_hk,
      &baidu,
-@@ -372,7 +372,7 @@ const PrepopulatedEngine* const engines_HK[] = {
+@@ -373,7 +373,7 @@ const PrepopulatedEngine* const engines_HK[] = {
  
  // Honduras
  const PrepopulatedEngine* const engines_HN[] = {
@@ -407,7 +407,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -381,7 +381,7 @@ const PrepopulatedEngine* const engines_HN[] = {
+@@ -382,7 +382,7 @@ const PrepopulatedEngine* const engines_HN[] = {
  
  // Croatia
  const PrepopulatedEngine* const engines_HR[] = {
@@ -416,7 +416,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -390,7 +390,7 @@ const PrepopulatedEngine* const engines_HR[] = {
+@@ -391,7 +391,7 @@ const PrepopulatedEngine* const engines_HR[] = {
  
  // Hungary
  const PrepopulatedEngine* const engines_HU[] = {
@@ -425,7 +425,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -399,7 +399,7 @@ const PrepopulatedEngine* const engines_HU[] = {
+@@ -400,7 +400,7 @@ const PrepopulatedEngine* const engines_HU[] = {
  
  // Indonesia
  const PrepopulatedEngine* const engines_ID[] = {
@@ -434,7 +434,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_id,
      &duckduckgo,
-@@ -408,7 +408,7 @@ const PrepopulatedEngine* const engines_ID[] = {
+@@ -409,7 +409,7 @@ const PrepopulatedEngine* const engines_ID[] = {
  
  // Ireland
  const PrepopulatedEngine* const engines_IE[] = {
@@ -443,7 +443,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_uk,
      &duckduckgo,
-@@ -417,7 +417,7 @@ const PrepopulatedEngine* const engines_IE[] = {
+@@ -418,7 +418,7 @@ const PrepopulatedEngine* const engines_IE[] = {
  
  // Israel
  const PrepopulatedEngine* const engines_IL[] = {
@@ -452,7 +452,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -426,7 +426,7 @@ const PrepopulatedEngine* const engines_IL[] = {
+@@ -427,7 +427,7 @@ const PrepopulatedEngine* const engines_IL[] = {
  
  // India
  const PrepopulatedEngine* const engines_IN[] = {
@@ -461,7 +461,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_in,
      &duckduckgo,
-@@ -435,7 +435,7 @@ const PrepopulatedEngine* const engines_IN[] = {
+@@ -436,7 +436,7 @@ const PrepopulatedEngine* const engines_IN[] = {
  
  // Iraq
  const PrepopulatedEngine* const engines_IQ[] = {
@@ -470,7 +470,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_tr,
-@@ -444,7 +444,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
+@@ -445,7 +445,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
  
  // Iran
  const PrepopulatedEngine* const engines_IR[] = {
@@ -479,7 +479,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -453,7 +453,7 @@ const PrepopulatedEngine* const engines_IR[] = {
+@@ -454,7 +454,7 @@ const PrepopulatedEngine* const engines_IR[] = {
  
  // Iceland
  const PrepopulatedEngine* const engines_IS[] = {
@@ -488,7 +488,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -462,7 +462,7 @@ const PrepopulatedEngine* const engines_IS[] = {
+@@ -463,7 +463,7 @@ const PrepopulatedEngine* const engines_IS[] = {
  
  // Italy
  const PrepopulatedEngine* const engines_IT[] = {
@@ -497,7 +497,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -471,7 +471,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+@@ -472,7 +472,7 @@ const PrepopulatedEngine* const engines_IT[] = {
  
  // Jamaica
  const PrepopulatedEngine* const engines_JM[] = {
@@ -506,7 +506,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -480,7 +480,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+@@ -481,7 +481,7 @@ const PrepopulatedEngine* const engines_JM[] = {
  
  // Jordan
  const PrepopulatedEngine* const engines_JO[] = {
@@ -515,7 +515,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &petal_search,
-@@ -489,7 +489,7 @@ const PrepopulatedEngine* const engines_JO[] = {
+@@ -490,7 +490,7 @@ const PrepopulatedEngine* const engines_JO[] = {
  
  // Japan
  const PrepopulatedEngine* const engines_JP[] = {
@@ -524,7 +524,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_jp,
      &duckduckgo,
-@@ -498,7 +498,7 @@ const PrepopulatedEngine* const engines_JP[] = {
+@@ -499,7 +499,7 @@ const PrepopulatedEngine* const engines_JP[] = {
  
  // Kenya
  const PrepopulatedEngine* const engines_KE[] = {
@@ -533,7 +533,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -507,7 +507,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+@@ -508,7 +508,7 @@ const PrepopulatedEngine* const engines_KE[] = {
  
  // South Korea
  const PrepopulatedEngine* const engines_KR[] = {
@@ -542,7 +542,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &naver,
      &bing,
      &daum,
-@@ -516,7 +516,7 @@ const PrepopulatedEngine* const engines_KR[] = {
+@@ -517,7 +517,7 @@ const PrepopulatedEngine* const engines_KR[] = {
  
  // Kuwait
  const PrepopulatedEngine* const engines_KW[] = {
@@ -551,7 +551,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -525,7 +525,7 @@ const PrepopulatedEngine* const engines_KW[] = {
+@@ -526,7 +526,7 @@ const PrepopulatedEngine* const engines_KW[] = {
  
  // Kazakhstan
  const PrepopulatedEngine* const engines_KZ[] = {
@@ -560,7 +560,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_kz,
      &mail_ru,
      &bing,
-@@ -534,7 +534,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
+@@ -535,7 +535,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
  
  // Lebanon
  const PrepopulatedEngine* const engines_LB[] = {
@@ -569,7 +569,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -543,7 +543,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -544,7 +544,7 @@ const PrepopulatedEngine* const engines_LB[] = {
  
  // Liechtenstein
  const PrepopulatedEngine* const engines_LI[] = {
@@ -578,7 +578,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -552,7 +552,7 @@ const PrepopulatedEngine* const engines_LI[] = {
+@@ -553,7 +553,7 @@ const PrepopulatedEngine* const engines_LI[] = {
  
  // Lithuania
  const PrepopulatedEngine* const engines_LT[] = {
@@ -587,7 +587,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &duckduckgo,
-@@ -561,7 +561,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -562,7 +562,7 @@ const PrepopulatedEngine* const engines_LT[] = {
  
  // Luxembourg
  const PrepopulatedEngine* const engines_LU[] = {
@@ -596,7 +596,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -570,7 +570,7 @@ const PrepopulatedEngine* const engines_LU[] = {
+@@ -571,7 +571,7 @@ const PrepopulatedEngine* const engines_LU[] = {
  
  // Latvia
  const PrepopulatedEngine* const engines_LV[] = {
@@ -605,7 +605,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -579,7 +579,7 @@ const PrepopulatedEngine* const engines_LV[] = {
+@@ -580,7 +580,7 @@ const PrepopulatedEngine* const engines_LV[] = {
  
  // Libya
  const PrepopulatedEngine* const engines_LY[] = {
@@ -614,7 +614,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_tr,
-@@ -588,7 +588,7 @@ const PrepopulatedEngine* const engines_LY[] = {
+@@ -589,7 +589,7 @@ const PrepopulatedEngine* const engines_LY[] = {
  
  // Morocco
  const PrepopulatedEngine* const engines_MA[] = {
@@ -623,7 +623,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &yandex_com,
-@@ -597,7 +597,7 @@ const PrepopulatedEngine* const engines_MA[] = {
+@@ -598,7 +598,7 @@ const PrepopulatedEngine* const engines_MA[] = {
  
  // Monaco
  const PrepopulatedEngine* const engines_MC[] = {
@@ -632,7 +632,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &duckduckgo,
-@@ -606,7 +606,7 @@ const PrepopulatedEngine* const engines_MC[] = {
+@@ -607,7 +607,7 @@ const PrepopulatedEngine* const engines_MC[] = {
  
  // Moldova
  const PrepopulatedEngine* const engines_MD[] = {
@@ -641,7 +641,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
      &bing,
      &mail_ru,
-@@ -615,7 +615,7 @@ const PrepopulatedEngine* const engines_MD[] = {
+@@ -616,7 +616,7 @@ const PrepopulatedEngine* const engines_MD[] = {
  
  // Montenegro
  const PrepopulatedEngine* const engines_ME[] = {
@@ -650,7 +650,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -624,7 +624,7 @@ const PrepopulatedEngine* const engines_ME[] = {
+@@ -625,7 +625,7 @@ const PrepopulatedEngine* const engines_ME[] = {
  
  // Macedonia
  const PrepopulatedEngine* const engines_MK[] = {
@@ -659,7 +659,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -633,7 +633,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+@@ -634,7 +634,7 @@ const PrepopulatedEngine* const engines_MK[] = {
  
  // Mexico
  const PrepopulatedEngine* const engines_MX[] = {
@@ -668,7 +668,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_mx,
      &duckduckgo,
-@@ -642,7 +642,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+@@ -643,7 +643,7 @@ const PrepopulatedEngine* const engines_MX[] = {
  
  // Malaysia
  const PrepopulatedEngine* const engines_MY[] = {
@@ -677,7 +677,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_my,
      &duckduckgo,
-@@ -651,7 +651,7 @@ const PrepopulatedEngine* const engines_MY[] = {
+@@ -652,7 +652,7 @@ const PrepopulatedEngine* const engines_MY[] = {
  
  // Nicaragua
  const PrepopulatedEngine* const engines_NI[] = {
@@ -686,7 +686,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -660,7 +660,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+@@ -661,7 +661,7 @@ const PrepopulatedEngine* const engines_NI[] = {
  
  // Netherlands
  const PrepopulatedEngine* const engines_NL[] = {
@@ -695,7 +695,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_nl,
      &duckduckgo,
-@@ -669,7 +669,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+@@ -670,7 +670,7 @@ const PrepopulatedEngine* const engines_NL[] = {
  
  // Norway
  const PrepopulatedEngine* const engines_NO[] = {
@@ -704,7 +704,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -678,7 +678,7 @@ const PrepopulatedEngine* const engines_NO[] = {
+@@ -679,7 +679,7 @@ const PrepopulatedEngine* const engines_NO[] = {
  
  // New Zealand
  const PrepopulatedEngine* const engines_NZ[] = {
@@ -713,7 +713,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_nz,
      &duckduckgo,
-@@ -687,7 +687,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
+@@ -688,7 +688,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
  
  // Oman
  const PrepopulatedEngine* const engines_OM[] = {
@@ -722,7 +722,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &petal_search,
-@@ -696,7 +696,7 @@ const PrepopulatedEngine* const engines_OM[] = {
+@@ -697,7 +697,7 @@ const PrepopulatedEngine* const engines_OM[] = {
  
  // Panama
  const PrepopulatedEngine* const engines_PA[] = {
@@ -731,7 +731,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -705,7 +705,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+@@ -706,7 +706,7 @@ const PrepopulatedEngine* const engines_PA[] = {
  
  // Peru
  const PrepopulatedEngine* const engines_PE[] = {
@@ -740,7 +740,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_pe,
      &ecosia,
-@@ -714,7 +714,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+@@ -715,7 +715,7 @@ const PrepopulatedEngine* const engines_PE[] = {
  
  // Philippines
  const PrepopulatedEngine* const engines_PH[] = {
@@ -749,7 +749,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_ph,
      &ecosia,
-@@ -723,7 +723,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+@@ -724,7 +724,7 @@ const PrepopulatedEngine* const engines_PH[] = {
  
  // Pakistan
  const PrepopulatedEngine* const engines_PK[] = {
@@ -758,7 +758,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -732,7 +732,7 @@ const PrepopulatedEngine* const engines_PK[] = {
+@@ -733,7 +733,7 @@ const PrepopulatedEngine* const engines_PK[] = {
  
  // Poland
  const PrepopulatedEngine* const engines_PL[] = {
@@ -767,7 +767,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -741,7 +741,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+@@ -742,7 +742,7 @@ const PrepopulatedEngine* const engines_PL[] = {
  
  // Puerto Rico
  const PrepopulatedEngine* const engines_PR[] = {
@@ -776,7 +776,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -750,7 +750,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -751,7 +751,7 @@ const PrepopulatedEngine* const engines_PR[] = {
  
  // Portugal
  const PrepopulatedEngine* const engines_PT[] = {
@@ -785,7 +785,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -759,7 +759,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -760,7 +760,7 @@ const PrepopulatedEngine* const engines_PT[] = {
  
  // Paraguay
  const PrepopulatedEngine* const engines_PY[] = {
@@ -794,7 +794,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -768,7 +768,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -769,7 +769,7 @@ const PrepopulatedEngine* const engines_PY[] = {
  
  // Qatar
  const PrepopulatedEngine* const engines_QA[] = {
@@ -803,7 +803,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -777,7 +777,7 @@ const PrepopulatedEngine* const engines_QA[] = {
+@@ -778,7 +778,7 @@ const PrepopulatedEngine* const engines_QA[] = {
  
  // Romania
  const PrepopulatedEngine* const engines_RO[] = {
@@ -812,7 +812,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -786,7 +786,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -787,7 +787,7 @@ const PrepopulatedEngine* const engines_RO[] = {
  
  // Serbia
  const PrepopulatedEngine* const engines_RS[] = {
@@ -821,7 +821,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -795,7 +795,7 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -796,7 +796,7 @@ const PrepopulatedEngine* const engines_RS[] = {
  
  // Russia
  const PrepopulatedEngine* const engines_RU[] = {
@@ -830,7 +830,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &google,
      &duckduckgo,
      &bing,
-@@ -804,7 +804,7 @@ const PrepopulatedEngine* const engines_RU[] = {
+@@ -805,7 +805,7 @@ const PrepopulatedEngine* const engines_RU[] = {
  
  // Rwanda
  const PrepopulatedEngine* const engines_RW[] = {
@@ -839,7 +839,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -813,7 +813,7 @@ const PrepopulatedEngine* const engines_RW[] = {
+@@ -814,7 +814,7 @@ const PrepopulatedEngine* const engines_RW[] = {
  
  // Saudi Arabia
  const PrepopulatedEngine* const engines_SA[] = {
@@ -848,7 +848,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -822,7 +822,7 @@ const PrepopulatedEngine* const engines_SA[] = {
+@@ -823,7 +823,7 @@ const PrepopulatedEngine* const engines_SA[] = {
  
  // Sweden
  const PrepopulatedEngine* const engines_SE[] = {
@@ -857,7 +857,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_se,
      &duckduckgo,
-@@ -831,7 +831,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -832,7 +832,7 @@ const PrepopulatedEngine* const engines_SE[] = {
  
  // Singapore
  const PrepopulatedEngine* const engines_SG[] = {
@@ -866,7 +866,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_sg,
      &baidu,
-@@ -840,7 +840,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -841,7 +841,7 @@ const PrepopulatedEngine* const engines_SG[] = {
  
  // Slovenia
  const PrepopulatedEngine* const engines_SI[] = {
@@ -875,7 +875,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -849,7 +849,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+@@ -850,7 +850,7 @@ const PrepopulatedEngine* const engines_SI[] = {
  
  // Slovakia
  const PrepopulatedEngine* const engines_SK[] = {
@@ -884,7 +884,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -858,7 +858,7 @@ const PrepopulatedEngine* const engines_SK[] = {
+@@ -859,7 +859,7 @@ const PrepopulatedEngine* const engines_SK[] = {
  
  // El Salvador
  const PrepopulatedEngine* const engines_SV[] = {
@@ -893,7 +893,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -867,7 +867,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+@@ -868,7 +868,7 @@ const PrepopulatedEngine* const engines_SV[] = {
  
  // Syria
  const PrepopulatedEngine* const engines_SY[] = {
@@ -902,7 +902,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -876,7 +876,7 @@ const PrepopulatedEngine* const engines_SY[] = {
+@@ -877,7 +877,7 @@ const PrepopulatedEngine* const engines_SY[] = {
  
  // Thailand
  const PrepopulatedEngine* const engines_TH[] = {
@@ -911,7 +911,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_th,
      &naver,
-@@ -885,7 +885,7 @@ const PrepopulatedEngine* const engines_TH[] = {
+@@ -886,7 +886,7 @@ const PrepopulatedEngine* const engines_TH[] = {
  
  // Tunisia
  const PrepopulatedEngine* const engines_TN[] = {
@@ -920,7 +920,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &duckduckgo,
-@@ -894,7 +894,7 @@ const PrepopulatedEngine* const engines_TN[] = {
+@@ -895,7 +895,7 @@ const PrepopulatedEngine* const engines_TN[] = {
  
  // Turkey
  const PrepopulatedEngine* const engines_TR[] = {
@@ -929,7 +929,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
      &yahoo_tr,
      &bing,
-@@ -903,7 +903,7 @@ const PrepopulatedEngine* const engines_TR[] = {
+@@ -904,7 +904,7 @@ const PrepopulatedEngine* const engines_TR[] = {
  
  // Trinidad and Tobago
  const PrepopulatedEngine* const engines_TT[] = {
@@ -938,7 +938,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -912,7 +912,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+@@ -913,7 +913,7 @@ const PrepopulatedEngine* const engines_TT[] = {
  
  // Taiwan
  const PrepopulatedEngine* const engines_TW[] = {
@@ -947,7 +947,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_tw,
      &bing,
      &baidu,
-@@ -921,7 +921,7 @@ const PrepopulatedEngine* const engines_TW[] = {
+@@ -922,7 +922,7 @@ const PrepopulatedEngine* const engines_TW[] = {
  
  // Tanzania
  const PrepopulatedEngine* const engines_TZ[] = {
@@ -956,7 +956,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -930,7 +930,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
+@@ -931,7 +931,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
  
  // Ukraine
  const PrepopulatedEngine* const engines_UA[] = {
@@ -965,7 +965,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
      &bing,
      &duckduckgo,
-@@ -939,7 +939,7 @@ const PrepopulatedEngine* const engines_UA[] = {
+@@ -940,7 +940,7 @@ const PrepopulatedEngine* const engines_UA[] = {
  
  // United States
  const PrepopulatedEngine* const engines_US[] = {
@@ -974,7 +974,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -948,7 +948,7 @@ const PrepopulatedEngine* const engines_US[] = {
+@@ -949,7 +949,7 @@ const PrepopulatedEngine* const engines_US[] = {
  
  // Uruguay
  const PrepopulatedEngine* const engines_UY[] = {
@@ -983,7 +983,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -957,7 +957,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+@@ -958,7 +958,7 @@ const PrepopulatedEngine* const engines_UY[] = {
  
  // Venezuela
  const PrepopulatedEngine* const engines_VE[] = {
@@ -992,7 +992,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -966,7 +966,7 @@ const PrepopulatedEngine* const engines_VE[] = {
+@@ -967,7 +967,7 @@ const PrepopulatedEngine* const engines_VE[] = {
  
  // Vietnam
  const PrepopulatedEngine* const engines_VN[] = {
@@ -1001,7 +1001,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &coccoc,
      &bing,
      &yahoo,
-@@ -975,7 +975,7 @@ const PrepopulatedEngine* const engines_VN[] = {
+@@ -976,7 +976,7 @@ const PrepopulatedEngine* const engines_VN[] = {
  
  // Yemen
  const PrepopulatedEngine* const engines_YE[] = {
@@ -1010,7 +1010,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -984,7 +984,7 @@ const PrepopulatedEngine* const engines_YE[] = {
+@@ -985,7 +985,7 @@ const PrepopulatedEngine* const engines_YE[] = {
  
  // South Africa
  const PrepopulatedEngine* const engines_ZA[] = {
@@ -1019,7 +1019,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -993,7 +993,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+@@ -994,7 +994,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
  
  // Zimbabwe
  const PrepopulatedEngine* const engines_ZW[] = {
diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch
index 6d8df893..bb386a87 100644
--- a/build/patches/Add-an-always-incognito-mode.patch
+++ b/build/patches/Add-an-always-incognito-mode.patch
@@ -95,7 +95,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -667,6 +667,7 @@ chrome_java_resources = [
+@@ -650,6 +650,7 @@ chrome_java_resources = [
    "java/res/xml/main_preferences.xml",
    "java/res/xml/manage_sync_preferences.xml",
    "java/res/xml/phone_as_a_security_key_accessory_filter.xml",
@@ -114,7 +114,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
    "java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
    "java/src/org/chromium/chrome/browser/ActivityUtils.java",
-@@ -953,6 +954,7 @@ chrome_java_sources = [
+@@ -955,6 +956,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",
    "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
    "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
@@ -250,8 +250,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
  import org.chromium.chrome.browser.IntentHandler.TabOpenType;
- import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout;
-@@ -583,9 +587,14 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+ import org.chromium.chrome.browser.app.ChromeActivity;
+@@ -578,9 +582,14 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              mTabModelOrchestrator.onNativeLibraryReady(getTabContentManager());
  
              // For saving non-incognito tab closures for Recent Tabs.
@@ -269,7 +269,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
              // Defer initialization of this helper so it triggers after TabModelFilter
              // observers.
              UndoRefocusHelper.initialize(
-@@ -1932,8 +1941,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1867,8 +1876,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          Bundle savedInstanceState = getSavedInstanceState();
  
          // We determine the model as soon as possible so every systems get initialized coherently.
@@ -284,7 +284,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -94,6 +94,7 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
+@@ -95,6 +95,7 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
  import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
  import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager.ContextualSearchTabPromotionDelegate;
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
@@ -292,7 +292,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
  import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
  import org.chromium.chrome.browser.device.DeviceClassManager;
-@@ -1881,6 +1882,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1888,6 +1889,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -313,7 +313,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  import org.chromium.chrome.browser.banners.AppMenuVerbiage;
  import org.chromium.chrome.browser.bookmarks.BookmarkFeatures;
  import org.chromium.chrome.browser.bookmarks.BookmarkModel;
-@@ -104,6 +105,10 @@ import java.lang.annotation.RetentionPolicy;
+@@ -102,6 +103,10 @@ import java.lang.annotation.RetentionPolicy;
  import java.util.ArrayList;
  import java.util.List;
  
@@ -324,7 +324,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  /**
   * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu
   * items based on activity state.
-@@ -567,6 +572,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -569,6 +574,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
      }
  
      private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
@@ -338,7 +338,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
          // We have to iterate all menu items since same menu item ID may be associated with more
          // than one menu items.
          boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU;
-@@ -627,7 +639,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -626,7 +638,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
              }
  
              if (item.getItemId() == R.id.recent_tabs_menu_id) {
@@ -355,7 +355,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
              }
              if (item.getItemId() == R.id.menu_select_tabs) {
                  item.setVisible(isMenuSelectTabsVisible);
-@@ -831,7 +851,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -840,7 +860,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
          //                is not persisted when adding to the homescreen.
          // * If creating shortcuts it not supported by the current home screen.
          return WebappsUtils.isAddToHomeIntentSupported() && !isChromeScheme && !isFileScheme
@@ -463,7 +463,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
-@@ -63,6 +63,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -64,6 +64,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
  import org.chromium.components.version_info.VersionInfo;
  import org.chromium.device.mojom.ScreenOrientationLockType;
  
@@ -473,7 +473,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.ArrayList;
-@@ -1210,7 +1213,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1218,7 +1221,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
  
      @Override
      public boolean isIncognito() {
@@ -485,7 +485,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
-@@ -33,6 +33,7 @@ import org.chromium.base.annotations.NativeMethods;
+@@ -34,6 +34,7 @@ import org.chromium.base.annotations.NativeMethods;
  import org.chromium.base.metrics.RecordHistogram;
  import org.chromium.base.metrics.RecordUserAction;
  import org.chromium.chrome.R;
@@ -493,7 +493,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
  import org.chromium.chrome.browser.ChromeTabbedActivity;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.app.download.home.DownloadActivity;
-@@ -74,6 +75,10 @@ import org.chromium.url.GURL;
+@@ -75,6 +76,10 @@ import org.chromium.url.GURL;
  
  import java.io.File;
  
@@ -504,7 +504,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
  /**
   * A class containing some utility static methods.
   */
-@@ -317,7 +322,16 @@ public class DownloadUtils {
+@@ -318,7 +323,16 @@ public class DownloadUtils {
          // Offline pages isn't supported in Incognito. This should be checked before calling
          // OfflinePageBridge.getForProfile because OfflinePageBridge instance will not be found
          // for incognito profile.
@@ -533,7 +533,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
  import org.chromium.base.supplier.ObservableSupplierImpl;
  import org.chromium.base.supplier.Supplier;
  import org.chromium.chrome.R;
-@@ -76,6 +77,12 @@ import java.io.Serializable;
+@@ -75,6 +76,12 @@ import java.io.Serializable;
  import java.util.List;
  import java.util.concurrent.atomic.AtomicReference;
  
@@ -546,7 +546,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
  /**
   * Combines and manages the different UI components of browsing history.
   */
-@@ -157,7 +164,7 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
+@@ -156,7 +163,7 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
  
          recordUserAction("Show");
          // If incognito placeholder is shown, we don't need to create History UI elements.
@@ -555,7 +555,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
              mSelectableListLayout = null;
              mRootView = getIncognitoHistoryPlaceholderView();
              return;
-@@ -594,7 +601,7 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
+@@ -597,7 +604,7 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
  
      private void swapContentView() {
          boolean toHistoryClusters;
@@ -564,7 +564,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
              return;
          } else if (isHistoryClustersUIShowing()) {
              toHistoryClusters = false;
-@@ -657,11 +664,24 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
+@@ -660,11 +667,24 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
                  && mContentView == mHistoryClustersCoordinator.getActivityContentView();
      }
  
@@ -590,7 +590,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
              // If Incognito placeholder is shown no need to call any destroy method.
              return;
          }
-@@ -681,7 +701,7 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
+@@ -684,7 +704,7 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
       * @return True if manager handles this event, false if it decides to ignore.
       */
      public boolean onBackPressed() {
@@ -880,7 +880,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -72,6 +72,7 @@ import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
+@@ -73,6 +73,7 @@ import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
  import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
  import org.chromium.chrome.browser.sync.SyncServiceFactory;
@@ -888,7 +888,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
  import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
-@@ -322,6 +323,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -323,6 +324,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
              ((PrivacySandboxSettingsBaseFragment) fragment)
                      .setSnackbarManager(getSnackbarManager());
          }
@@ -1010,7 +1010,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -124,6 +124,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto
+@@ -123,6 +123,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto
  import org.chromium.content_public.browser.WebContents;
  import org.chromium.ui.base.ActivityWindowAndroid;
  import org.chromium.ui.base.DeviceFormFactor;
@@ -1019,7 +1019,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
  import org.chromium.ui.base.IntentRequestTracker;
  import org.chromium.ui.modaldialog.ModalDialogManager;
  
-@@ -796,7 +798,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -794,7 +796,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                      mAppMenuCoordinator.getAppMenuHandler(), mActivityTabProvider,
                      mToolbarManager.getMenuButtonView(), () -> {
                          mTabCreatorManagerSupplier.get()
@@ -1042,7 +1042,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  /**
   * This class creates various kinds of new tabs and adds them to the right {@link TabModel}.
   */
-@@ -487,7 +491,6 @@ public class ChromeTabCreator extends TabCreator {
+@@ -510,7 +514,6 @@ public class ChromeTabCreator extends TabCreator {
      // TODO(crbug.com/1081924): Clean up the launches from SearchActivity/Chrome.
      public Tab launchUrlFromExternalApp(
              LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) {
@@ -1073,7 +1073,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
-@@ -55,6 +55,8 @@ import org.chromium.components.embedder_support.util.UrlUtilities;
+@@ -50,6 +50,8 @@ import org.chromium.components.embedder_support.util.UrlUtilities;
  import org.chromium.content_public.browser.LoadUrlParams;
  import org.chromium.url.GURL;
  
@@ -1082,7 +1082,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
  import java.io.BufferedInputStream;
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
-@@ -747,6 +749,13 @@ public class TabPersistentStore {
+@@ -651,6 +653,13 @@ public class TabPersistentStore {
                  }
              }
          }
@@ -1099,7 +1099,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -40,6 +40,7 @@ import org.chromium.base.supplier.OneshotSupplier;
+@@ -41,6 +41,7 @@ import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.base.supplier.Supplier;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
@@ -1107,7 +1107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController;
  import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
-@@ -509,7 +510,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -554,7 +555,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
                          return ret;
                      }
                  },
@@ -1120,9 +1120,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java
-@@ -32,6 +32,9 @@ import org.chromium.chrome.browser.flags.ActivityType;
- import org.chromium.components.browser_ui.widget.TintedDrawable;
+@@ -33,6 +33,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
  import org.chromium.device.mojom.ScreenOrientationLockType;
+ import org.chromium.ui.util.ColorUtils;
  
 +import org.chromium.base.ContextUtils;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
@@ -1130,7 +1130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
  /**
   * Stores info about a web app.
   */
-@@ -46,6 +49,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
+@@ -47,6 +50,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
      private final ColorProviderImpl mColorProvider;
      private final ColorProviderImpl mDarkColorProvider;
  
@@ -1139,7 +1139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
      /**
       * Returns the toolbar color to use if a custom color is not specified by the webapp.
       */
-@@ -77,6 +82,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
+@@ -78,6 +83,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
          mWebappExtras = webappExtras;
          mWebApkExtras = webApkExtras;
          mActivityType = (webApkExtras != null) ? ActivityType.WEB_APK : ActivityType.WEBAPP;
@@ -1150,7 +1150,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
      }
  
      @Override
-@@ -162,6 +171,11 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
+@@ -172,6 +181,11 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
          return mWebApkExtras;
      }
  
@@ -1165,7 +1165,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -5136,6 +5136,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5152,6 +5152,10 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kOfflinePagesLivePageSharingName,
       flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
@@ -1218,18 +1218,15 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
    if (!service) {
      return;
    }
-@@ -243,14 +254,15 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
+@@ -230,11 +241,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
      JNIEnv* env,
      const JavaParamRef<jobject>& jtab_android,
      const JavaParamRef<jobject>& state,
 -    jint saved_state_version) {
 +    jint saved_state_version,
 +    jboolean is_always_incognito) {
-   void* data = env->GetDirectBufferAddress(state);
-   int size = env->GetDirectBufferCapacity(state);
- 
-   WebContentsStateByteBuffer web_contents_state =
-       WebContentsStateByteBuffer(data, size, (int)saved_state_version);
+   WebContentsStateByteBuffer web_contents_state = WebContentsStateByteBuffer(
+       ScopedJavaLocalRef<jobject>(state), (int)saved_state_version);
    CreateHistoricalTab(TabAndroid::GetNativeTab(env, jtab_android),
 -                      std::move(web_contents_state));
 +                      std::move(web_contents_state), is_always_incognito);
@@ -1239,7 +1236,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -343,6 +343,15 @@ ChromeAutocompleteProviderClient::GetOnDeviceTailModelService() const {
+@@ -350,6 +350,15 @@ ChromeAutocompleteProviderClient::GetOnDeviceTailModelService() const {
  #endif  // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
  }
  
@@ -1277,7 +1274,7 @@ diff --git a/chrome/browser/autocomplete/remote_suggestions_service_factory.cc b
  #include "base/no_destructor.h"
  #include "chrome/browser/autocomplete/document_suggestions_service_factory.h"
  #include "chrome/browser/profiles/profile.h"
-@@ -39,7 +40,11 @@ RemoteSuggestionsServiceFactory::RemoteSuggestionsServiceFactory()
+@@ -40,7 +41,11 @@ RemoteSuggestionsServiceFactory::RemoteSuggestionsServiceFactory()
      : ProfileKeyedServiceFactory(
            "RemoteSuggestionsService",
            ProfileSelections::Builder()
@@ -1340,7 +1337,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -4111,6 +4111,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
+@@ -4134,6 +4134,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
      "Enables to share current loaded page as offline page by saving as MHTML "
      "first.";
  
@@ -1356,7 +1353,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2411,6 +2411,9 @@ extern const char kOmahaMinSdkVersionAndroidDescription[];
+@@ -2431,6 +2431,9 @@ extern const char kOmahaMinSdkVersionAndroidDescription[];
  extern const char kOmahaMinSdkVersionAndroidMinSdk1Description[];
  extern const char kOmahaMinSdkVersionAndroidMinSdk1000Description[];
  
@@ -1369,7 +1366,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -554,8 +554,8 @@ BASE_FEATURE(kCCTFeatureUsage,
+@@ -576,8 +576,8 @@ BASE_FEATURE(kCCTFeatureUsage,
  BASE_FEATURE(kCCTIncognito, "CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT);
  
  BASE_FEATURE(kCCTIncognitoAvailableToThirdParty,
@@ -1393,7 +1390,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
  #else
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
-@@ -476,6 +479,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
+@@ -482,6 +485,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
  history::HistoryService* HistoryTabHelper::GetHistoryService() {
    Profile* profile =
        Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ -1407,7 +1404,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
    if (profile->IsOffTheRecord())
      return nullptr;
  
-@@ -483,6 +493,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
+@@ -489,6 +499,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
        profile, ServiceAccessType::IMPLICIT_ACCESS);
  }
  
@@ -1582,9 +1579,9 @@ diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc
    // Depends on OfflinePageModelFactory in SimpleDependencyManager.
  }
  
-@@ -91,6 +91,12 @@ RequestCoordinator* RequestCoordinatorFactory::GetForBrowserContext(
- 
- KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor(
+@@ -92,6 +92,12 @@ RequestCoordinator* RequestCoordinatorFactory::GetForBrowserContext(
+ std::unique_ptr<KeyedService>
+ RequestCoordinatorFactory::BuildServiceInstanceForBrowserContext(
      content::BrowserContext* context) const {
 +  if (context->IsOffTheRecord() &&
 +      Profile::FromBrowserContext(context)->GetOriginalProfile()
@@ -1595,8 +1592,8 @@ diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc
    std::unique_ptr<OfflinerPolicy> policy(new OfflinerPolicy());
    std::unique_ptr<Offliner> offliner;
    OfflinePageModel* model =
-@@ -123,4 +129,16 @@ KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor(
-   return request_coordinator;
+@@ -122,4 +128,16 @@ RequestCoordinatorFactory::BuildServiceInstanceForBrowserContext(
+       std::make_unique<ActiveTabInfo>(profile));
  }
  
 +content::BrowserContext*
@@ -1693,7 +1690,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome
    static RequestCoordinator* GetForBrowserContext(
 @@ -36,6 +36,8 @@ class RequestCoordinatorFactory : public ProfileKeyedServiceFactory {
  
-   KeyedService* BuildServiceInstanceFor(
+   std::unique_ptr<KeyedService> BuildServiceInstanceForBrowserContext(
        content::BrowserContext* context) const override;
 +  content::BrowserContext* GetBrowserContextToUse(
 +      content::BrowserContext* context) const override;
@@ -1703,7 +1700,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -236,6 +236,7 @@
+@@ -239,6 +239,7 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h"
@@ -1711,7 +1708,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
  #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
  #include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"
-@@ -1796,6 +1797,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1692,6 +1693,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
    variations::VariationsService::RegisterProfilePrefs(registry);
    webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);
@@ -1956,7 +1953,7 @@ new file mode 100644
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -3942,6 +3942,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
+@@ -3935,6 +3935,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
      "net.out_of_process_system_dns_resolution_enabled";
  #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
  
@@ -2059,7 +2056,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                           bool store_last_modified,
                           bool restore_session,
                           bool should_record_metrics);
-@@ -521,6 +522,8 @@ class HostContentSettingsMap : public content_settings::Observer,
+@@ -523,6 +524,8 @@ class HostContentSettingsMap : public content_settings::Observer,
    // Whether this settings map is for an incognito or guest session.
    bool is_off_the_record_;
  
diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch
index f2392e45..b5c724e7 100644
--- a/build/patches/Add-bookmark-import-export-actions.patch
+++ b/build/patches/Add-bookmark-import-export-actions.patch
@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml b/chrome/and
 diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 --- a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 +++ b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
-@@ -49,6 +49,20 @@ found in the LICENSE file.
+@@ -51,6 +51,20 @@ found in the LICENSE file.
              android:title="@string/create_new_folder"
              app:showAsAction="ifRoom"
              app:iconTint="@color/default_icon_color_secondary_tint_list" />
@@ -554,7 +554,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
-@@ -47,6 +47,8 @@ import org.chromium.components.image_fetcher.ImageFetcher;
+@@ -49,6 +49,8 @@ import org.chromium.components.image_fetcher.ImageFetcher;
  import org.chromium.components.image_fetcher.ImageFetcherConfig;
  import org.chromium.components.image_fetcher.ImageFetcherFactory;
  import org.chromium.ui.KeyboardVisibilityDelegate;
@@ -563,7 +563,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
  import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
-@@ -225,6 +227,13 @@ public class BookmarkManagerCoordinator
+@@ -233,6 +235,13 @@ public class BookmarkManagerCoordinator
  
      // Public API implementation.
  
@@ -580,7 +580,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
-@@ -51,6 +51,8 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
+@@ -53,6 +53,8 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
  import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate.SelectionObserver;
  import org.chromium.components.commerce.core.CommerceSubscription;
  import org.chromium.components.commerce.core.ShoppingService;
@@ -589,7 +589,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.components.favicon.LargeIconBridge;
  import org.chromium.components.feature_engagement.EventConstants;
  import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
-@@ -77,6 +79,9 @@ class BookmarkManagerMediator
+@@ -80,6 +82,9 @@ class BookmarkManagerMediator
  
      private static boolean sPreventLoadingForTesting;
  
@@ -599,7 +599,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * Keeps track of whether drag is enabled / active for bookmark lists.
       */
-@@ -461,6 +466,14 @@ class BookmarkManagerMediator
+@@ -508,6 +513,14 @@ class BookmarkManagerMediator
          mNativePage = nativePage;
      }
  
@@ -614,7 +614,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * See BookmarkManager(Coordinator)#updateForUrl
       */
-@@ -635,6 +648,16 @@ class BookmarkManagerMediator
+@@ -684,6 +697,16 @@ class BookmarkManagerMediator
          }
      }
  
@@ -630,7 +630,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +
      @Override
      public void openSearchUi() {
-         onQueryCallback("");
+         onSearchTextChangeCallback("");
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
@@ -666,7 +666,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-@@ -116,6 +116,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -119,6 +119,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
          setOnMenuItemClickListener(dragEnabled ? null : this);
      }
  
@@ -684,7 +684,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      void setSearchButtonVisible(boolean visible) {
          // The improved bookmarks experience embeds search in the list.
          if (BookmarkFeatures.isAndroidImprovedBookmarksEnabled()) return;
-@@ -156,6 +167,8 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -172,6 +183,8 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
  
      void setCurrentFolder(BookmarkId folder) {
          mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
@@ -693,7 +693,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      }
  
      void setNavigateBackRunnable(Runnable navigateBackRunnable) {
-@@ -175,6 +188,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -191,6 +204,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
      @Override
      public boolean onMenuItemClick(MenuItem menuItem) {
          hideOverflowMenu();
@@ -707,7 +707,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          return mMenuIdClickedFunction.apply(menuItem.getItemId());
      }
  
-@@ -195,6 +215,9 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -211,6 +231,9 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
      protected void showNormalView() {
          super.showNormalView();
  
@@ -720,10 +720,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
-@@ -81,6 +81,10 @@ class BookmarkToolbarMediator implements BookmarkUiObserver, DragListener,
+@@ -109,6 +109,10 @@ class BookmarkToolbarMediator implements BookmarkUiObserver, DragListener,
+         bookmarkDelegateSupplier.onAvailable((bookmarkDelegate) -> {
              mBookmarkDelegate = bookmarkDelegate;
-             mModel.set(BookmarkToolbarProperties.NAVIGATE_BACK_RUNNABLE,
-                     this::openParentForCurrentFolder);
+             mModel.set(BookmarkToolbarProperties.NAVIGATE_BACK_RUNNABLE, this::onNavigateBack);
 +            mModel.set(
 +                    BookmarkToolbarProperties.IMPORT_BOOKMARK_RUNNABLE, mBookmarkDelegate::importBookmarks);
 +            mModel.set(
@@ -734,7 +734,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java
-@@ -61,11 +61,16 @@ class BookmarkToolbarProperties {
+@@ -66,11 +66,16 @@ class BookmarkToolbarProperties {
              new WritableObjectPropertyKey<>();
      static final WritableObjectPropertyKey<Runnable> NAVIGATE_BACK_RUNNABLE =
              new WritableObjectPropertyKey<>();
@@ -746,16 +746,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      static final PropertyKey[] ALL_KEYS = {BOOKMARK_MODEL, BOOKMARK_OPENER, SELECTION_DELEGATE,
              TITLE, BOOKMARK_UI_MODE, SOFT_KEYBOARD_VISIBLE, IS_DIALOG_UI, DRAG_ENABLED,
              SEARCH_BUTTON_VISIBLE, EDIT_BUTTON_VISIBLE, NEW_FOLDER_BUTTON_VISIBLE,
-             NEW_FOLDER_BUTTON_ENABLED, NAVIGATION_BUTTON_STATE, CURRENT_FOLDER,
-             CHECKED_SORT_MENU_ID, CHECKED_VIEW_MENU_ID, MENU_ID_CLICKED_FUNCTION,
--            NAVIGATE_BACK_RUNNABLE, FAKE_SELECTION_STATE_CHANGE};
-+            NAVIGATE_BACK_RUNNABLE, FAKE_SELECTION_STATE_CHANGE,
+             NEW_FOLDER_BUTTON_ENABLED, NAVIGATION_BUTTON_STATE, CURRENT_FOLDER, SORT_MENU_IDS,
+             SORT_MENU_IDS_ENABLED, CHECKED_SORT_MENU_ID, CHECKED_VIEW_MENU_ID,
+-            MENU_ID_CLICKED_FUNCTION, NAVIGATE_BACK_RUNNABLE, FAKE_SELECTION_STATE_CHANGE};
++            MENU_ID_CLICKED_FUNCTION, NAVIGATE_BACK_RUNNABLE, FAKE_SELECTION_STATE_CHANGE,
 +            IMPORT_BOOKMARK_RUNNABLE, EXPORT_BOOKMARK_RUNNABLE};
  }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java
-@@ -56,6 +56,12 @@ class BookmarkToolbarViewBinder {
+@@ -61,6 +61,12 @@ class BookmarkToolbarViewBinder {
                      model.get(BookmarkToolbarProperties.CHECKED_VIEW_MENU_ID));
          } else if (key == BookmarkToolbarProperties.CURRENT_FOLDER) {
              bookmarkToolbar.setCurrentFolder(model.get(BookmarkToolbarProperties.CURRENT_FOLDER));
@@ -827,7 +827,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -225,6 +225,8 @@ static_library("browser") {
+@@ -226,6 +226,8 @@ static_library("browser") {
      "bluetooth/chrome_bluetooth_delegate_impl_client.h",
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
@@ -836,7 +836,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "bookmarks/chrome_bookmark_client.cc",
      "bookmarks/chrome_bookmark_client.h",
      "bookmarks/managed_bookmark_service_factory.cc",
-@@ -1901,6 +1903,13 @@ static_library("browser") {
+@@ -1923,6 +1925,13 @@ static_library("browser") {
      ]
    }
  
@@ -850,7 +850,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    configs += [
      "//build/config/compiler:wexit_time_destructors",
      "//build/config:precompiled_headers",
-@@ -3583,8 +3592,6 @@ static_library("browser") {
+@@ -3621,8 +3630,6 @@ static_library("browser") {
        "badging/badge_manager_factory.h",
        "banners/app_banner_manager_desktop.cc",
        "banners/app_banner_manager_desktop.h",
@@ -862,7 +862,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -9471,6 +9471,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9529,6 +9529,14 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kForceOffTextAutosizing)},
  #endif
  
@@ -1380,9 +1380,9 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -7520,6 +7520,11 @@ const char kThirdPartyProfileManagementDescription[] =
-     "Enables profile management triggered by third-party sign-ins.";
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+@@ -7647,6 +7647,11 @@ const char kProfilesReorderingDescription[] =
+     "persisted.";
+ #endif
  
 +const char kBookmarksExportUseSafName[] = "Use saf for bookmarks export";
 +const char kBookmarksExportUseSafDescription[] =
@@ -1395,9 +1395,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -4350,6 +4350,9 @@ extern const char kThirdPartyProfileManagementName[];
- extern const char kThirdPartyProfileManagementDescription[];
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+@@ -4427,6 +4427,9 @@ extern const char kProfilesReorderingName[];
+ extern const char kProfilesReorderingDescription[];
+ #endif
  
 +extern const char kBookmarksExportUseSafName[];
 +extern const char kBookmarksExportUseSafDescription[];
@@ -1408,7 +1408,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -180,6 +180,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -187,6 +187,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kClearOmniboxFocusAfterNavigation,
      &kCloseTabSuggestions,
      &kCloseTabSaveTabList,
@@ -1416,7 +1416,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kCriticalPersistedTabData,
      &kCreateNewTabInitializeRenderer,
      &kCCTBackgroundTab,
-@@ -1173,5 +1174,10 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent,
+@@ -1179,5 +1180,10 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent,
               "WebApkTrampolineOnInitialIntent",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -1441,7 +1441,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -478,6 +478,7 @@ public abstract class ChromeFeatureList {
+@@ -485,6 +485,7 @@ public abstract class ChromeFeatureList {
      public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
              "UseLibunwindstackNativeUnwinderAndroid";
      public static final String USER_BYPASS_UI = "UserBypassUI";
@@ -1510,7 +1510,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -108,6 +108,8 @@ public final class ChromePreferenceKeys {
+@@ -100,6 +100,8 @@ public final class ChromePreferenceKeys {
              "enhanced_bookmark_last_used_parent_folder";
      public static final String BOOKMARKS_SORT_ORDER = "Chrome.Bookmarks.BookmarkRowSortOrder";
      public static final String BOOKMARKS_VISUALS_PREF = "Chrome.Bookmarks.BookmarkRowDisplay";
@@ -1519,7 +1519,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
  
      /**
       * Whether Chrome is set as the default browser.
-@@ -982,6 +984,7 @@ public final class ChromePreferenceKeys {
+@@ -964,6 +966,7 @@ public final class ChromePreferenceKeys {
                  AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED,
                  APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                  APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1725,7 +1725,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
      private static final String AUDIO_TYPE = "audio";
      private static final String ALL_TYPES = "*/*";
  
-@@ -264,6 +266,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -306,6 +308,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          ResettersForTesting.register(() -> mFileTypes = oldValue);
      }
  
@@ -1737,7 +1737,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
      /**
       * Creates and starts an intent based on the passed fileTypes and capture value.
       * @param fileTypes MIME types requested (i.e. "image/*")
-@@ -290,7 +297,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -332,7 +339,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          List<String> missingPermissions = new ArrayList<>();
          String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE;
          boolean shouldUsePhotoPicker = shouldUsePhotoPicker();
@@ -1746,7 +1746,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
              // The permission scenario for accessing media has evolved a bit over the years:
              // Early on, READ_EXTERNAL_STORAGE was required to access media, but that permission was
              // later deprecated. In its place (starting with Android T) READ_MEDIA_IMAGES and
-@@ -339,7 +346,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -381,7 +388,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                          }
  
                          // TODO(finnur): Remove once we figure out the cause of crbug.com/950024.
@@ -1755,7 +1755,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                              if (permissions.length != requestPermissions.length) {
                                  throw new RuntimeException(
                                          String.format("Permissions arrays misaligned: %d != %d",
-@@ -353,7 +360,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -395,7 +402,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                              }
                          }
  
@@ -1764,7 +1764,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                              if (permissions[i].equals(storagePermission)
                                      || permissions[i].equals(Manifest.permission.READ_MEDIA_IMAGES)
                                      || permissions[i].equals(
-@@ -630,6 +637,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -672,6 +679,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
              }
              if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
          }
@@ -1772,7 +1772,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
          return mimeTypes;
      }
  
-@@ -958,6 +966,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -1000,6 +1008,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          return countAcceptTypesFor(superType) == mFileTypes.size();
      }
  
diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch
index a16b5d4b..56a9dd0b 100644
--- a/build/patches/Add-lifetime-options-for-permissions.patch
+++ b/build/patches/Add-lifetime-options-for-permissions.patch
@@ -80,14 +80,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../android/permissions_android_strings.grd   | 17 ++++
  .../geolocation_permission_context_android.cc | 35 ++++++--
  .../geolocation_permission_context_android.h  | 14 +++-
- .../permissions/permission_context_base.cc    | 55 +++++++++++--
+ .../permissions/permission_context_base.cc    | 54 +++++++++++--
  .../permissions/permission_context_base.h     | 25 +++++-
  components/permissions/permission_prompt.h    |  3 +-
  components/permissions/permission_request.cc  | 34 +++++++-
  components/permissions/permission_request.h   | 18 ++++-
  .../permissions/permission_request_manager.cc | 45 +++++++----
  .../permissions/permission_request_manager.h  | 11 ++-
- 35 files changed, 521 insertions(+), 60 deletions(-)
+ 35 files changed, 520 insertions(+), 60 deletions(-)
 
 diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc
 --- a/chrome/browser/permissions/last_tab_standing_tracker.cc
@@ -219,25 +219,25 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.h b/chrome/
 diff --git a/chrome/browser/permissions/one_time_permissions_tracker_factory.cc b/chrome/browser/permissions/one_time_permissions_tracker_factory.cc
 --- a/chrome/browser/permissions/one_time_permissions_tracker_factory.cc
 +++ b/chrome/browser/permissions/one_time_permissions_tracker_factory.cc
-@@ -40,5 +40,5 @@ bool OneTimePermissionsTrackerFactory::ServiceIsCreatedWithBrowserContext()
- 
- KeyedService* OneTimePermissionsTrackerFactory::BuildServiceInstanceFor(
+@@ -41,5 +41,5 @@ bool OneTimePermissionsTrackerFactory::ServiceIsCreatedWithBrowserContext()
+ std::unique_ptr<KeyedService>
+ OneTimePermissionsTrackerFactory::BuildServiceInstanceForBrowserContext(
      content::BrowserContext* context) const {
--  return new OneTimePermissionsTracker();
-+  return new OneTimePermissionsTracker(context);
+-  return std::make_unique<OneTimePermissionsTracker>();
++  return std::make_unique<OneTimePermissionsTracker>(context);
  }
 diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
 +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
-@@ -336,7 +336,7 @@ void PermissionPromptBubbleBaseView::RunButtonCallbacks(
-       delegate_->Accept();
+@@ -345,7 +345,7 @@ void PermissionPromptBubbleBaseView::RunButtonCallbacks(
        return;
      case PermissionDialogButton::kAcceptOnce:
+       RecordDecision(permissions::PermissionAction::GRANTED_ONCE);
 -      delegate_->AcceptThisTime();
 +      delegate_->AcceptThisTime(content_settings::LifetimeMode::Always);
        return;
      case PermissionDialogButton::kDeny:
-       delegate_->Deny();
+       RecordDecision(permissions::PermissionAction::DENIED);
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java
@@ -594,7 +594,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -1171,6 +1171,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+@@ -1177,6 +1177,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
    permission_info.source = info.source;
    permission_info.is_one_time = (info.metadata.session_model() ==
                                   content_settings::SessionModel::OneTime);
@@ -679,9 +679,9 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 -        return new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS)
 +        PropertyModel pm = new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS)
                  .with(ModalDialogProperties.CONTROLLER, controller)
+                 .with(ModalDialogProperties.FOCUS_DIALOG, true)
                  .with(ModalDialogProperties.CUSTOM_VIEW, customView)
-                 .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, delegate.getPrimaryButtonText())
-@@ -45,6 +56,74 @@ class PermissionDialogModel {
+@@ -46,6 +57,74 @@ class PermissionDialogModel {
                  .with(ModalDialogProperties.BUTTON_TAP_PROTECTION_PERIOD_MS,
                          UiUtils.PROMPT_INPUT_PROTECTION_SHORT_DELAY_MS)
                  .build();
@@ -870,7 +870,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co
 diff --git a/components/permissions/contexts/geolocation_permission_context_android.cc b/components/permissions/contexts/geolocation_permission_context_android.cc
 --- a/components/permissions/contexts/geolocation_permission_context_android.cc
 +++ b/components/permissions/contexts/geolocation_permission_context_android.cc
-@@ -161,7 +161,20 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -163,7 +163,20 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
      bool is_final_decision) {
    DCHECK(!is_one_time);
    DCHECK(is_final_decision);
@@ -891,7 +891,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
    bool is_default_search = IsRequestingOriginDSE(requesting_origin);
    if (content_setting == CONTENT_SETTING_ALLOW &&
        !location_settings_->IsSystemLocationSettingEnabled()) {
-@@ -174,7 +187,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -176,7 +189,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
      if (IsInLocationSettingsBackOff(is_default_search)) {
        FinishNotifyPermissionSet(id, requesting_origin, embedding_origin,
                                  std::move(callback), false /* persist */,
@@ -901,7 +901,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
        return;
      }
  
-@@ -192,7 +206,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -194,7 +208,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
          !location_settings_dialog_callback_.is_null()) {
        FinishNotifyPermissionSet(id, requesting_origin, embedding_origin,
                                  std::move(callback), false /* persist */,
@@ -911,7 +911,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
        return;
      }
  
-@@ -204,12 +219,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -206,12 +221,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
          base::BindOnce(
              &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown,
              weak_factory_.GetWeakPtr(), requesting_origin, embedding_origin,
@@ -926,8 +926,8 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 +                            is_one_time, lifetime_option);
  }
  
- PermissionResult
-@@ -376,6 +392,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
+ content::PermissionResult
+@@ -377,6 +393,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
      const GURL& embedding_origin,
      bool persist,
      ContentSetting content_setting,
@@ -935,7 +935,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
      LocationSettingsDialogOutcome prompt_outcome) {
    bool is_default_search = IsRequestingOriginDSE(requesting_origin);
    if (prompt_outcome == GRANTED) {
-@@ -393,7 +410,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
+@@ -394,7 +411,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
  
    FinishNotifyPermissionSet(
        location_settings_dialog_request_id_, requesting_origin, embedding_origin,
@@ -945,7 +945,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
  
    location_settings_dialog_request_id_ =
        PermissionRequestID(content::GlobalRenderFrameHostId(0, 0),
-@@ -406,10 +424,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
+@@ -407,10 +425,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
      const GURL& embedding_origin,
      BrowserPermissionCallback callback,
      bool persist,
@@ -963,7 +963,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 diff --git a/components/permissions/contexts/geolocation_permission_context_android.h b/components/permissions/contexts/geolocation_permission_context_android.h
 --- a/components/permissions/contexts/geolocation_permission_context_android.h
 +++ b/components/permissions/contexts/geolocation_permission_context_android.h
-@@ -91,6 +91,15 @@ class GeolocationPermissionContextAndroid
+@@ -89,6 +89,15 @@ class GeolocationPermissionContextAndroid
                             ContentSetting content_setting,
                             bool is_one_time,
                             bool is_final_decision) override;
@@ -976,10 +976,10 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 +                           bool is_one_time,
 +                           bool is_final_decision,
 +                           content_settings::LifetimeMode lifetime_option) override;
-   PermissionResult UpdatePermissionStatusWithDeviceStatus(
-       PermissionResult result,
+   content::PermissionResult UpdatePermissionStatusWithDeviceStatus(
+       content::PermissionResult result,
        const GURL& requesting_origin,
-@@ -133,6 +142,7 @@ class GeolocationPermissionContextAndroid
+@@ -131,6 +140,7 @@ class GeolocationPermissionContextAndroid
        const GURL& embedding_origin,
        bool persist,
        ContentSetting content_setting,
@@ -987,7 +987,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
        LocationSettingsDialogOutcome prompt_outcome);
  
    void FinishNotifyPermissionSet(const PermissionRequestID& id,
-@@ -140,7 +150,9 @@ class GeolocationPermissionContextAndroid
+@@ -138,7 +148,9 @@ class GeolocationPermissionContextAndroid
                                   const GURL& embedding_origin,
                                   BrowserPermissionCallback callback,
                                   bool persist,
@@ -1001,12 +1001,11 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc
 --- a/components/permissions/permission_context_base.cc
 +++ b/components/permissions/permission_context_base.cc
-@@ -249,6 +249,20 @@ PermissionContextBase::CreatePermissionRequest(
+@@ -257,6 +257,19 @@ PermissionContextBase::CreatePermissionRequest(
        std::move(delete_callback));
  }
  
-+std::unique_ptr<PermissionRequest>
-+PermissionContextBase::CreatePermissionRequest(
++std::unique_ptr<PermissionRequest> PermissionContextBase::CreatePermissionRequest(
 +    const GURL& request_origin,
 +    ContentSettingsType content_settings_type,
 +    bool has_gesture,
@@ -1019,10 +1018,10 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
 +      std::move(delete_callback));
 +}
 +
- PermissionResult PermissionContextBase::GetPermissionStatus(
+ content::PermissionResult PermissionContextBase::GetPermissionStatus(
      content::RenderFrameHost* render_frame_host,
      const GURL& requesting_origin,
-@@ -428,7 +442,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
+@@ -466,7 +479,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
                                                const GURL& embedding_origin,
                                                ContentSetting content_setting,
                                                bool is_one_time,
@@ -1032,7 +1031,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
           content_setting == CONTENT_SETTING_BLOCK ||
           content_setting == CONTENT_SETTING_DEFAULT);
-@@ -443,13 +458,14 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
+@@ -481,13 +495,14 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
    // missing if a permission prompt was preignored and we already notified an
    // origin about it.
    if (request->second.second) {
@@ -1051,7 +1050,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    }
  }
  
-@@ -501,11 +517,27 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -539,11 +554,27 @@ void PermissionContextBase::NotifyPermissionSet(
      ContentSetting content_setting,
      bool is_one_time,
      bool is_final_decision) {
@@ -1080,7 +1079,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    }
  
    if (is_final_decision) {
-@@ -535,6 +567,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
+@@ -573,6 +604,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
                                                   const GURL& embedding_origin,
                                                   ContentSetting content_setting,
                                                   bool is_one_time) {
@@ -1096,7 +1095,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    DCHECK_EQ(requesting_origin, requesting_origin.DeprecatedGetOriginAsURL());
    DCHECK_EQ(embedding_origin, embedding_origin.DeprecatedGetOriginAsURL());
    DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
-@@ -544,6 +585,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
+@@ -582,6 +622,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
    constraints.set_session_model(is_one_time
                                      ? content_settings::SessionModel::OneTime
                                      : content_settings::SessionModel::Durable);
@@ -1136,7 +1135,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
    virtual void UpdateContentSetting(const GURL& requesting_origin,
                                      const GURL& embedding_origin,
                                      ContentSetting content_setting,
-@@ -196,6 +210,14 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -194,6 +208,14 @@ class PermissionContextBase : public content_settings::Observer {
        PermissionRequest::PermissionDecidedCallback permission_decided_callback,
        base::OnceClosure delete_callback) const;
  
@@ -1148,10 +1147,10 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
 +      PermissionRequest::PermissionDecidedCallbackWithLifetime permission_decided_callback,
 +      base::OnceClosure delete_callback) const;
 +
-   ContentSettingsType content_settings_type() const {
-     return content_settings_type_;
-   }
-@@ -222,7 +244,8 @@ class PermissionContextBase : public content_settings::Observer {
+   base::ObserverList<permissions::Observer> permission_observers_;
+ 
+   // Set by subclasses to inform the base class that they will handle adding
+@@ -216,7 +238,8 @@ class PermissionContextBase : public content_settings::Observer {
                           const GURL& embedding_origin,
                           ContentSetting content_setting,
                           bool is_one_time,
@@ -1178,7 +1177,7 @@ diff --git a/components/permissions/permission_prompt.h b/components/permissions
 diff --git a/components/permissions/permission_request.cc b/components/permissions/permission_request.cc
 --- a/components/permissions/permission_request.cc
 +++ b/components/permissions/permission_request.cc
-@@ -28,6 +28,18 @@ PermissionRequest::PermissionRequest(
+@@ -35,6 +35,18 @@ PermissionRequest::PermissionRequest(
        permission_decided_callback_(std::move(permission_decided_callback)),
        delete_callback_(std::move(delete_callback)) {}
  
@@ -1197,7 +1196,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
  PermissionRequest::~PermissionRequest() {
    DCHECK(delete_callback_.is_null());
  }
-@@ -257,19 +269,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
+@@ -274,19 +286,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
               permissions::features::kPermissionStorageAccessAPI);
  }
  
@@ -1240,7 +1239,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
 diff --git a/components/permissions/permission_request.h b/components/permissions/permission_request.h
 --- a/components/permissions/permission_request.h
 +++ b/components/permissions/permission_request.h
-@@ -43,6 +43,11 @@ class PermissionRequest {
+@@ -44,6 +44,11 @@ class PermissionRequest {
                                     bool /*is_one_time*/,
                                     bool /*is_final_decision*/)>;
  
@@ -1252,7 +1251,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
    // `permission_decided_callback` is called when the permission request is
    // resolved by the user (see comment on PermissionDecidedCallback above).
    // `delete_callback` is called when the permission request is no longer needed
-@@ -58,6 +63,12 @@ class PermissionRequest {
+@@ -63,6 +68,12 @@ class PermissionRequest {
                      PermissionDecidedCallback permission_decided_callback,
                      base::OnceClosure delete_callback);
  
@@ -1265,7 +1264,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
    PermissionRequest(const PermissionRequest&) = delete;
    PermissionRequest& operator=(const PermissionRequest&) = delete;
  
-@@ -119,10 +130,10 @@ class PermissionRequest {
+@@ -128,10 +139,10 @@ class PermissionRequest {
    // If |is_one_time| is true the permission will last until all tabs of
    // |origin| are closed or navigated away from, and then the permission will
    // automatically expire after 1 day.
diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch
index d0976db6..7dda8c50 100644
--- a/build/patches/Add-option-to-use-home-page-as-NTP.patch
+++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch
@@ -31,7 +31,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import org.chromium.chrome.browser.tab.Tab;
  import org.chromium.chrome.browser.tab.TabCreationState;
  import org.chromium.chrome.browser.tab.TabLaunchType;
-@@ -578,9 +579,13 @@ public class TabGridDialogMediator
+@@ -565,9 +566,13 @@ public class TabGridDialogMediator
  
              assert relatedTabs.size() > 0;
  
@@ -57,10 +57,10 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import org.chromium.chrome.browser.layouts.LayoutStateProvider;
  import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver;
  import org.chromium.chrome.browser.layouts.LayoutType;
-@@ -350,8 +351,12 @@ public class TabGroupUiMediator implements BackPressHandler {
+@@ -345,8 +346,12 @@ public class TabGroupUiMediator implements BackPressHandler {
+             assert relatedTabs.size() > 0;
  
-                 parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
-             }
+             parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
 +            String url = UrlConstants.NTP_URL;
 +            if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
 +                url = HomepageManager.getInstance().getHomepageUri();
@@ -170,7 +170,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
  import org.chromium.chrome.browser.ntp.NewTabPageUtils;
  import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
-@@ -472,6 +473,12 @@ public class ChromeTabCreator extends TabCreator {
+@@ -495,6 +496,12 @@ public class ChromeTabCreator extends TabCreator {
       * @return the created tab.
       */
      public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) {
@@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -385,6 +385,7 @@ public final class ChromePreferenceKeys {
+@@ -366,6 +366,7 @@ public final class ChromePreferenceKeys {
      public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL =
              "Chrome.Homepage.PartnerCustomizedDefaultGurl";
  
@@ -197,7 +197,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -70,6 +70,7 @@ public class LegacyChromePreferenceKeys {
+@@ -67,6 +67,7 @@ public class LegacyChromePreferenceKeys {
                  ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI,
                  ChromePreferenceKeys.HOMEPAGE_ENABLED,
                  ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI,
@@ -221,7 +221,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -65,6 +65,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -70,6 +70,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
                                  GetHomeButtonAndHomePageIsNewTabPageFlags());
    registry->RegisterBooleanPref(prefs::kShowHomeButton, false,
                                  GetHomeButtonAndHomePageIsNewTabPageFlags());
@@ -233,7 +233,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1310,6 +1310,10 @@ inline constexpr char kUsedPolicyCertificates[] =
+@@ -1297,6 +1297,10 @@ inline constexpr char kUsedPolicyCertificates[] =
  // visible on the toolbar.
  inline constexpr char kShowHomeButton[] = "browser.show_home_button";
  
diff --git a/build/patches/Bromite-subresource-adblocker.patch b/build/patches/Bromite-subresource-adblocker.patch
index b2539b80..baea1ab3 100644
--- a/build/patches/Bromite-subresource-adblocker.patch
+++ b/build/patches/Bromite-subresource-adblocker.patch
@@ -29,8 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/browser_process_impl.cc        |  20 ++
  chrome/browser/browser_process_impl.h         |   2 +
  chrome/browser/chrome_browser_main.cc         |   3 +
- .../flags/android/cached_feature_flags.cc     |  11 +
- .../browser/flags/CachedFeatureFlags.java     |  10 +
+ .../browser/flags/CachedFeatureFlags.java     |  14 +
  .../net/system_network_context_manager.cc     |   3 +
  .../sessions/session_restore_android.cc       |   6 +-
  .../strings/android_chrome_strings.grd        |  14 +
@@ -51,7 +50,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/subresource_filter_features.cc    | 116 +-------
  .../core/common/indexed_ruleset.cc            |   5 +-
  third_party/blink/common/features.cc          |  12 +-
- 39 files changed, 1188 insertions(+), 135 deletions(-)
+ 38 files changed, 1181 insertions(+), 135 deletions(-)
  create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
  create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
@@ -64,7 +63,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -293,6 +293,7 @@ if (current_toolchain == default_toolchain) {
+@@ -301,6 +301,7 @@ if (current_toolchain == default_toolchain) {
        "//chrome/android/modules/image_editor/provider:java",
        "//chrome/android/modules/stack_unwinder/provider:java",
        "//chrome/android/webapk/libs/client:client_java",
@@ -75,7 +74,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -460,6 +460,7 @@ chrome_java_resources = [
+@@ -441,6 +441,7 @@ chrome_java_resources = [
    "java/res/layout/account_chooser_dialog_title.xml",
    "java/res/layout/account_divider_preference.xml",
    "java/res/layout/account_management_account_row.xml",
@@ -83,7 +82,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
    "java/res/layout/auto_sign_in_first_run_dialog.xml",
    "java/res/layout/autofill_billing_address_dropdown.xml",
    "java/res/layout/autofill_card_name_and_number.xml",
-@@ -656,6 +657,7 @@ chrome_java_resources = [
+@@ -639,6 +640,7 @@ chrome_java_resources = [
    "java/res/xml/about_chrome_preferences.xml",
    "java/res/xml/account_management_preferences.xml",
    "java/res/xml/ad_services_config.xml",
@@ -94,7 +93,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -946,6 +946,8 @@ chrome_java_sources = [
+@@ -948,6 +948,8 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
    "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
    "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
@@ -437,7 +436,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -14277,6 +14277,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -14314,6 +14314,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  
@@ -508,7 +507,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1129,6 +1129,26 @@ BrowserProcessImpl::component_updater() {
+@@ -1128,6 +1128,26 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -557,7 +556,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -427,6 +427,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -429,6 +429,9 @@ StartupProfileInfo CreateInitialProfile(
    // missing code in the above test.
    CHECK(profile_info.profile) << "Cannot get default profile.";
  
@@ -567,61 +566,32 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows
  #else
  #if BUILDFLAG(IS_CHROMEOS_LACROS)
    // Lacros has a special "primary" profile that is tied to the active ChromeOS
-diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/browser/flags/android/cached_feature_flags.cc
---- a/chrome/browser/flags/android/cached_feature_flags.cc
-+++ b/chrome/browser/flags/android/cached_feature_flags.cc
-@@ -8,6 +8,9 @@
- 
- #include "base/android/jni_string.h"
- #include "base/feature_list.h"
-+#include "chrome/browser/browser_process.h"
-+#include "chrome/common/pref_names.h"
-+#include "components/prefs/pref_service.h"
- #include "content/public/browser/network_service_util.h"
- #include "content/public/common/content_features.h"
- 
-@@ -41,3 +44,11 @@ static jboolean JNI_CachedFeatureFlags_IsNetworkServiceWarmUpEnabled(
-   return content::IsOutOfProcessNetworkService() &&
-          base::FeatureList::IsEnabled(features::kWarmUpNetworkProcess);
- }
-+
-+static ScopedJavaLocalRef<jstring> JNI_CachedFeatureFlags_GetAdBlockFiltersURL(JNIEnv* env) {
-+  return base::android::ConvertUTF8ToJavaString(env, g_browser_process->local_state()->GetString(prefs::kAdBlockFiltersURL));
-+}
-+
-+static void JNI_CachedFeatureFlags_SetAdBlockFiltersURL(JNIEnv* env, const JavaParamRef<jstring>& url) {
-+  g_browser_process->local_state()->SetString(prefs::kAdBlockFiltersURL, base::android::ConvertJavaStringToUTF8(env, url));
-+}
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -101,6 +101,14 @@ public class CachedFeatureFlags {
-                 ChromeFeatureList.isEnabled(ChromeFeatureList.CACHE_ACTIVITY_TASKID));
+@@ -224,4 +224,18 @@ public class CachedFeatureFlags {
+     static void setOverrideForTesting(String preferenceKey, String overrideValue) {
+         sValuesOverridden.setOverrideForTesting(preferenceKey, overrideValue);
      }
- 
-+     public static void setAdBlockFiltersURL(String url) {
-+         CachedFeatureFlagsJni.get().setAdBlockFiltersURL(url);
-+     }
 +
-+     public static String getAdBlockFiltersURL() {
-+         return CachedFeatureFlagsJni.get().getAdBlockFiltersURL();
-+     }
++    public static void setAdBlockFiltersURL(String url) {
++        CachedFeatureFlagsJni.get().setAdBlockFiltersURL(url);
++    }
 +
-     /**
-      * Caches flags that must take effect on startup but are set via native code.
-      */
-@@ -319,5 +327,7 @@ public class CachedFeatureFlags {
-     @NativeMethods
-     interface Natives {
-         boolean isNetworkServiceWarmUpEnabled();
++    public static String getAdBlockFiltersURL() {
++        return CachedFeatureFlagsJni.get().getAdBlockFiltersURL();
++    }
++
++    @NativeMethods
++    interface Natives {
 +        void setAdBlockFiltersURL(String url);
 +        String getAdBlockFiltersURL();
-     }
++    }
  }
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -567,6 +567,9 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
+@@ -588,6 +588,9 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
  void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
    StubResolverConfigReader::RegisterPrefs(registry);
  
@@ -674,7 +644,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -2608,6 +2608,9 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2610,6 +2610,9 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  inline constexpr char kAudioCaptureAllowedUrls[] =
      "hardware.audio_capture_allowed_urls";
  
@@ -1918,7 +1888,7 @@ diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/comp
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -144,8 +144,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKeyAfterFill,
+@@ -152,8 +152,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKeyAfterFill,
  // Apply lazy-loading to ad frames which have embeds likely impacting Core Web
  // Vitals.
  BASE_FEATURE(kAutomaticLazyFrameLoadingToAds,
@@ -1929,7 +1899,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
  
  // The timeout value that forces loading iframes that are lazy loaded by
  // LazyAds. After this timeout, the frame loading is triggered even when the
-@@ -165,8 +165,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyAds(
+@@ -173,8 +173,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyAds(
  // Apply lazy-loading to frames which have embeds likely impacting Core Web
  // Vitals.
  BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbeds,
@@ -1940,7 +1910,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
  
  // The timeout value that forces loading iframes that are lazy loaded by
  // LazyEmbeds. After this timeout, the frame loading is triggered even when the
-@@ -188,8 +188,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyEmbeds(
+@@ -196,8 +196,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyEmbeds(
  // to gather Blink.AutomaticLazyLoadFrame.LazyEmbedFrameCount UKM data even when
  // kAutomaticLazyFrameLoadingToEmbeds is disabled.
  BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbedUrls,
diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch
index b0e2d080..abc0c09f 100644
--- a/build/patches/Content-settings-infrastructure.patch
+++ b/build/patches/Content-settings-infrastructure.patch
@@ -17,7 +17,7 @@ Require: bromite-build-utils.patch
  .../settings/privacy_page/privacy_page.ts     |  44 ++-
  chrome/browser/resources/settings/route.ts    |   2 +
  .../settings_category_default_radio_group.ts  |   7 +
- .../settings/site_settings/site_details.html  |   1 +
+ .../settings/site_settings/site_details.html  |   2 +
  .../settings/site_settings/site_details.ts    |  16 +-
  .../site_settings_page/site_settings_page.ts  |  28 +-
  .../site_settings_page_util.ts                |  55 ++++
@@ -45,7 +45,7 @@ Require: bromite-build-utils.patch
  components/content_settings/android/BUILD.gn  |   1 +
  .../content_settings/core/browser/BUILD.gn    |   7 +
  .../bromite_content_settings/placeholder.txt  |   1 +
- .../core/browser/content_settings_registry.cc |   3 +
+ .../core/browser/content_settings_registry.cc |   2 +
  .../core/browser/content_settings_uma_util.cc |   3 +-
  .../core/browser/content_settings_utils.cc    |  12 +
  .../core/browser/website_settings_info.h      |  35 ++
@@ -96,7 +96,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
  /**
   * A SiteSettingsDelegate instance that contains Chrome-specific Site Settings logic.
   */
-@@ -278,6 +282,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+@@ -272,6 +276,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
          return PrivacySandboxBridge.getFirstPartySetOwner(memberOrigin);
      }
  
@@ -129,9 +129,9 @@ diff --git a/chrome/browser/installable/installed_webapp_bridge.cc b/chrome/brow
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -1147,4 +1147,5 @@
+@@ -1177,4 +1177,5 @@
            </settings-subpage>
-         </template>
+        </template>
        </template>
 +      <div id="bromite-placeholder"/>
      </settings-animated-pages>
@@ -200,7 +200,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
  
  /**
   * Add all of the child routes that originate from the privacy route,
-@@ -131,6 +132,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
+@@ -136,6 +137,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
      r.SITE_SETTINGS_STORAGE_ACCESS =
          r.SITE_SETTINGS.createChild('storageAccess');
    }
@@ -211,7 +211,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
 diff --git a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
 --- a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
 +++ b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
-@@ -159,6 +159,13 @@ export class SettingsCategoryDefaultRadioGroupElement extends
+@@ -160,6 +160,13 @@ export class SettingsCategoryDefaultRadioGroupElement extends
          // "Ask" vs "Blocked".
          return ContentSetting.ASK;
        default:
@@ -228,12 +228,15 @@ diff --git a/chrome/browser/resources/settings/site_settings/settings_category_d
 diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html
 --- a/chrome/browser/resources/settings/site_settings/site_details.html
 +++ b/chrome/browser/resources/settings/site_settings/site_details.html
-@@ -266,4 +266,5 @@
-           category="[[contentSettingsTypesEnum_.LOCAL_FONTS]]"
+@@ -267,6 +267,8 @@
            icon="settings:local-fonts" label="$i18n{fonts}">
        </site-details-permission>
+       <template is="dom-if" if="[[autoPictureInPictureEnabled_]]">
 +      <div id="bromite-placeholder"/>
-     </div>
++    </div>
+         <!-- TODO(https://crbug.com/1471051): Use real icon. -->
+         <site-details-permission
+             category="[[contentSettingsTypesEnum_.AUTO_PICTURE_IN_PICTURE]]"
 diff --git a/chrome/browser/resources/settings/site_settings/site_details.ts b/chrome/browser/resources/settings/site_settings/site_details.ts
 --- a/chrome/browser/resources/settings/site_settings/site_details.ts
 +++ b/chrome/browser/resources/settings/site_settings/site_details.ts
@@ -272,7 +275,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
      {
        route: routes.SITE_SETTINGS_ADS,
        id: Id.ADS,
-@@ -347,10 +347,34 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
+@@ -357,10 +357,34 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
      },
    ];
  
@@ -307,7 +310,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
  function buildItemListFromIds(orderedIdList: ContentSettingsTypes[]):
      CategoryListItem[] {
    const map = getCategoryItemMap();
-@@ -439,7 +463,7 @@ export class SettingsSiteSettingsPageElement extends
+@@ -450,7 +474,7 @@ export class SettingsSiteSettingsPageElement extends
                Id.IMAGES,
                Id.POPUPS,
              ]),
@@ -374,7 +377,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
  /**
   * Determine localization string for i18n for a given content settings type.
   * Sorted alphabetically by |ContentSettingsType|.
-@@ -86,6 +134,13 @@ export function getLocalizationStringForContentType(
+@@ -88,6 +136,13 @@ export function getLocalizationStringForContentType(
      case ContentSettingsTypes.SITE_DATA:
        return null;
      default:
@@ -391,10 +394,10 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1923,6 +1923,7 @@ static_library("ui") {
-       "//components/commerce/core:shopping_service",
+@@ -1930,6 +1930,7 @@ static_library("ui") {
        "//components/commerce/core/mojom:mojo_bindings",
        "//components/commerce/core/webui",
+       "//components/endpoint_fetcher:endpoint_fetcher",
 +      "//components/content_settings/core/browser:browser",
        "//components/enterprise/common:files_scan_data",
        "//components/feedback/proto",
@@ -411,8 +414,8 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom
  #include "components/page_info/core/features.h"
  #include "components/page_info/core/proto/about_this_site_metadata.pb.h"
  #include "components/page_info/page_info.h"
-@@ -498,6 +500,17 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
-       icon = &vector_icons::kStorageAccessIcon;
+@@ -502,6 +504,17 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
+       icon = &vector_icons::kSelectWindowIcon;
        break;
      default:
 +      bool found = false;
@@ -440,7 +443,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
  #include "build/branding_buildflags.h"
  #include "build/build_config.h"
  #include "build/buildflag.h"
-@@ -74,6 +75,8 @@
+@@ -72,6 +73,8 @@
  #include "components/google/core/common/google_util.h"
  #include "components/history/core/common/pref_names.h"
  #include "components/omnibox/common/omnibox_features.h"
@@ -449,7 +452,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
  #include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
  #include "components/password_manager/core/browser/manage_passwords_referrer.h"
  #include "components/password_manager/core/common/password_manager_features.h"
-@@ -3711,6 +3714,42 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -3534,6 +3537,42 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
    policy_indicator::AddLocalizedStrings(html_source);
    AddSecurityKeysStrings(html_source);
  
@@ -495,7 +498,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
 diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
 +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
-@@ -44,6 +44,8 @@
+@@ -41,6 +41,8 @@
  #include "chrome/common/url_constants.h"
  #include "chrome/grit/generated_resources.h"
  #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -504,7 +507,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
  #include "components/content_settings/core/common/content_settings.h"
  #include "components/content_settings/core/common/content_settings_pattern.h"
  #include "components/content_settings/core/common/content_settings_utils.h"
-@@ -203,7 +205,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
+@@ -202,7 +204,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
  
  static_assert(std::size(kContentSettingsTypeGroupNames) ==
                    // ContentSettingsType starts at -1, so add 1 here.
@@ -513,7 +516,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
                "kContentSettingsTypeGroupNames should have "
                "CONTENT_SETTINGS_NUM_TYPES elements");
  
-@@ -487,6 +489,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
+@@ -457,6 +459,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
        return true;
      }
    }
@@ -527,7 +530,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
    return false;
  }
  
-@@ -500,11 +509,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) {
+@@ -470,11 +479,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) {
        return entry.type;
      }
    }
@@ -553,7 +556,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
    for (const auto& entry : kContentSettingsTypeGroupNames) {
      if (type == entry.type) {
        // Content setting types that aren't represented in the settings UI
-@@ -519,7 +541,6 @@ base::StringPiece ContentSettingsTypeToGroupName(ContentSettingsType type) {
+@@ -489,7 +511,6 @@ base::StringPiece ContentSettingsTypeToGroupName(ContentSettingsType type) {
        return entry.name ? entry.name : base::StringPiece();
      }
    }
@@ -561,8 +564,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
    NOTREACHED() << static_cast<int32_t>(type)
                 << " is not a recognized content settings type.";
    return base::StringPiece();
-@@ -588,6 +609,13 @@ const std::vector<ContentSettingsType>& GetVisiblePermissionCategories() {
-       base_types->push_back(ContentSettingsType::PRIVATE_NETWORK_GUARD);
+@@ -563,6 +584,13 @@ const std::vector<ContentSettingsType>& GetVisiblePermissionCategories() {
+       base_types->push_back(ContentSettingsType::AUTO_PICTURE_IN_PICTURE);
      }
  
 +    content_settings::WebsiteSettingsRegistry* website_settings =
@@ -578,7 +581,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
 diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
-@@ -145,6 +145,21 @@ android_library("java") {
+@@ -147,6 +147,21 @@ android_library("java") {
      ":site_settings_jni_headers",
      "//components/content_settings/android:java_pref_names_srcjar",
    ]
@@ -600,7 +603,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
  }
  
  android_library("javatests") {
-@@ -190,6 +205,7 @@ robolectric_library("junit") {
+@@ -192,6 +207,7 @@ robolectric_library("junit") {
  }
  
  android_resources("java_resources") {
@@ -1485,7 +1488,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
-@@ -173,6 +173,8 @@ public interface SiteSettingsDelegate {
+@@ -168,6 +168,8 @@ public interface SiteSettingsDelegate {
       */
      String getFirstPartySetOwner(String memberOrigin);
  
@@ -1541,7 +1544,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
-@@ -245,6 +245,12 @@ public final class Website implements WebsiteEntry {
+@@ -246,6 +246,12 @@ public final class Website implements WebsiteEntry {
                  RecordUserAction.record("SoundContentSetting.UnmuteBy.SiteSettings");
              }
          }
@@ -1557,7 +1560,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
-@@ -93,7 +93,7 @@ public class WebsitePermissionsFetcher {
+@@ -98,7 +98,7 @@ public class WebsitePermissionsFetcher {
              case ContentSettingsType.USB_GUARD:
                  return WebsitePermissionsType.CHOSEN_OBJECT_INFO;
              default:
@@ -1566,8 +1569,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          }
      }
  
-@@ -209,7 +209,7 @@ public class WebsitePermissionsFetcher {
-             if (SiteSettingsFeatureList.isEnabled(SiteSettingsFeatureList.SITE_DATA_IMPROVEMENTS)) {
+@@ -214,7 +214,7 @@ public class WebsitePermissionsFetcher {
+             if (SiteSettingsFeatureMap.isEnabled(SiteSettingsFeatureList.SITE_DATA_IMPROVEMENTS)) {
                  queue.add(new CookiesInfoFetcher());
              }
 -            for (@ContentSettingsType int type = 0; type < ContentSettingsType.NUM_TYPES; type++) {
@@ -1705,11 +1708,10 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
  
  namespace content_settings {
  
-@@ -609,6 +610,8 @@ void ContentSettingsRegistry::Init() {
-            WebsiteSettingsRegistry::ALL_PLATFORMS,
-            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
-            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
-+
+@@ -629,6 +630,7 @@ void ContentSettingsRegistry::Init() {
+            WebsiteSettingsRegistry::DESKTOP,
+            ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
+            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
 +#include "components/content_settings/core/browser/bromite_content_settings.inc"
  }
  
@@ -1717,7 +1719,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/components/content_settings/core/browser/content_settings_uma_util.cc b/components/content_settings/core/browser/content_settings_uma_util.cc
 --- a/components/content_settings/core/browser/content_settings_uma_util.cc
 +++ b/components/content_settings/core/browser/content_settings_uma_util.cc
-@@ -173,8 +173,9 @@ void RecordContentSettingsHistogram(const std::string& name,
+@@ -175,8 +175,9 @@ void RecordContentSettingsHistogram(const std::string& name,
  }
  
  int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting) {
@@ -2032,9 +2034,9 @@ diff --git a/components/content_settings/core/common/content_settings_param_trai
 diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
 --- a/components/content_settings/core/common/content_settings_types.h
 +++ b/components/content_settings/core/common/content_settings_types.h
-@@ -343,7 +343,9 @@ enum class ContentSettingsType : int32_t {
-   // Setting for supporting 3PCD.
-   TPCD_SUPPORT,
+@@ -356,7 +356,9 @@ enum class ContentSettingsType : int32_t {
+   // `net::features::kTpcdMetadataGrants` is enabled.
+   TPCD_METADATA_GRANTS,
  
 -  NUM_TYPES,
 +  NUM_TYPES_CHROMIUM,
@@ -2184,7 +2186,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
  #include "components/content_settings/browser/ui/cookie_controls_controller.h"
  #include "components/content_settings/core/browser/content_settings_registry.h"
  #include "components/content_settings/core/browser/content_settings_uma_util.h"
-@@ -1232,6 +1233,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+@@ -1239,6 +1240,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
  // applies to permissions listed in |kPermissionType|.
  bool PageInfo::ShouldShowPermission(
      const PageInfo::PermissionInfo& info) const {
@@ -2199,7 +2201,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
    // Note |ContentSettingsType::ADS| will show up regardless of its default
    // value when it has been activated on the current origin.
    if (info.type == ContentSettingsType::ADS) {
-@@ -1320,7 +1329,19 @@ void PageInfo::PresentSitePermissions() {
+@@ -1339,7 +1348,19 @@ void PageInfo::PresentSitePermissions() {
  
    HostContentSettingsMap* content_settings = GetContentSettings();
    DCHECK(web_contents_);
@@ -2223,15 +2225,15 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
 diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_info_ui.cc
 --- a/components/page_info/page_info_ui.cc
 +++ b/components/page_info/page_info_ui.cc
-@@ -13,6 +13,7 @@
- #include "build/build_config.h"
+@@ -14,6 +14,7 @@
  #include "build/chromeos_buildflags.h"
  #include "components/content_settings/core/common/content_settings.h"
+ #include "components/content_settings/core/common/content_settings_types.h"
 +#include "components/content_settings/core/browser/website_settings_registry.h"
  #include "components/page_info/core/features.h"
  #include "components/page_info/page_info.h"
  #include "components/page_info/page_info_ui_delegate.h"
-@@ -571,6 +572,12 @@ PageInfoUI::~PageInfoUI() = default;
+@@ -597,6 +598,12 @@ PageInfoUI::~PageInfoUI() = default;
  
  // static
  std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
@@ -2244,7 +2246,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) {
      if (info.type == type)
        return l10n_util::GetStringUTF16(info.string_id);
-@@ -582,6 +589,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
+@@ -608,6 +615,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
  // static
  std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence(
      ContentSettingsType type) {
@@ -2257,7 +2259,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) {
      if (info.type == type)
        return l10n_util::GetStringUTF16(info.string_id_mid_sentence);
-@@ -990,6 +1003,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
+@@ -1034,6 +1047,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
      if (info.type == type)
        return true;
    }
@@ -2352,7 +2354,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java b/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java
 --- a/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java
 +++ b/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java
-@@ -163,6 +163,9 @@ public class WebLayerSiteSettingsDelegate
+@@ -160,6 +160,9 @@ public class WebLayerSiteSettingsDelegate
      @Override
      public void dismissPrivacySandboxSnackbar() {}
  
diff --git a/build/patches/Dictionary-suggestions-for-the-Omnibox.patch b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch
index 07b7e742..7b977440 100644
--- a/build/patches/Dictionary-suggestions-for-the-Omnibox.patch
+++ b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch
@@ -11,8 +11,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/android/java/res/layout/url_bar.xml    |   1 +
  .../chrome/browser/omnibox/UrlBar.java        | 931 ++++++++++++++++++
- .../chrome/browser/omnibox/UrlBar.java        |   3 +-
- 3 files changed, 933 insertions(+), 2 deletions(-)
+ .../chrome/browser/omnibox/UrlBar.java        |   2 +-
+ 3 files changed, 933 insertions(+), 1 deletion(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 
 diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/res/layout/url_bar.xml
@@ -21,9 +21,9 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re
 @@ -15,5 +15,6 @@ found in the LICENSE file.
      android:singleLine="true"
      android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
-     android:textSize="@dimen/location_bar_url_text_size"
+     android:textAppearance="@style/TextAppearance.SearchBoxText"
 +    android:inputType="textUri"
-     android:hint="@string/search_or_type_web_address"
+     android:hint="@string/omnibox_empty_hint"
      android:importantForAutofill="no" />
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 new file mode 100644
@@ -964,15 +964,14 @@ new file mode 100644
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
-@@ -228,8 +228,7 @@ public abstract class UrlBar extends AutocompleteEditText {
+@@ -233,7 +233,7 @@ public abstract class UrlBar extends AutocompleteEditText {
              setFocusableInTouchMode(mAllowFocus);
          });
  
--        setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI
--                | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-+        setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
+-        setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
++        setInputType(InputType.TYPE_CLASS_TEXT);
  
-         // The HTC Sense IME will attempt to autocomplete words in the Omnibox when Prediction is
-         // enabled.  We want to disable this feature and rely on the Omnibox's implementation.
+         mKeyboardHideHelper = new KeyboardHideHelper(this, () -> {
+             if (mUrlBarDelegate != null && !BackPressManager.isEnabled()) {
 --
 2.25.1
diff --git a/build/patches/Disable-FLoC-and-privacy-sandbox.patch b/build/patches/Disable-FLoC-and-privacy-sandbox.patch
index fb127fc6..c76d7868 100644
--- a/build/patches/Disable-FLoC-and-privacy-sandbox.patch
+++ b/build/patches/Disable-FLoC-and-privacy-sandbox.patch
@@ -13,16 +13,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/chrome_content_browser_client.cc  |  3 +++
  .../PrivacySandboxSettingsFragmentV3.java     |  1 +
  .../privacy_sandbox_settings_delegate.cc      |  1 +
- .../history/core/browser/history_backend.cc   | 13 +-----------
- .../privacy_sandbox_features.cc               | 10 ++++-----
+ .../privacy_sandbox/privacy_sandbox_prompt.cc |  1 +
+ .../history/core/browser/history_backend.cc   | 13 +---------
+ .../privacy_sandbox_attestations.cc           |  1 +
+ .../privacy_sandbox_features.cc               | 14 +++++------
  .../privacy_sandbox/privacy_sandbox_prefs.cc  |  2 +-
- .../privacy_sandbox_settings_impl.cc          | 21 +++++++++++++------
- 7 files changed, 27 insertions(+), 24 deletions(-)
+ .../privacy_sandbox_settings_impl.cc          | 24 +++++++++++++------
+ 9 files changed, 33 insertions(+), 27 deletions(-)
 
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -3424,6 +3424,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -3416,6 +3416,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* source_origin,
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin) {
@@ -54,10 +56,21 @@ diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
    auto* identity_manager = IdentityManagerFactory::GetForProfile(profile_);
  
    if (!identity_manager ||
+diff --git a/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt.cc b/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt.cc
+--- a/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt.cc
++++ b/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt.cc
+@@ -8,6 +8,7 @@
+ 
+ void ShowPrivacySandboxPrompt(Browser* browser,
+                               PrivacySandboxService::PromptType prompt_type) {
++  if ((true)) return;
+   if (prompt_type == PrivacySandboxService::PromptType::kNotice) {
+     ShowPrivacySandboxNoticeBubble(browser);
+   } else {
 diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
 --- a/components/history/core/browser/history_backend.cc
 +++ b/components/history/core/browser/history_backend.cc
-@@ -669,18 +669,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id,
+@@ -679,18 +679,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id,
    if (!visit_id)
      return;
  
@@ -77,11 +90,22 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
    ScheduleCommit();
  }
  
+diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc b/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
+--- a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
++++ b/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
+@@ -286,6 +286,7 @@ void PrivacySandboxAttestations::LoadAttestationsInternal(
+ void PrivacySandboxAttestations::SetParsedAttestations(
+     base::Version version,
+     PrivacySandboxAttestationsMap attestations_map) {
++  if ((true)) return;
+   file_version_ = std::move(version);
+   attestations_map_ = std::move(attestations_map);
+   attestations_parse_progress_ = Progress::kFinished;
 diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components/privacy_sandbox/privacy_sandbox_features.cc
 --- a/components/privacy_sandbox/privacy_sandbox_features.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_features.cc
-@@ -7,8 +7,8 @@
- namespace privacy_sandbox {
+@@ -12,8 +12,8 @@ BASE_FEATURE(kPrivacySandboxSuppressDialogOnNonNormalBrowsers,
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
  BASE_FEATURE(kPrivacySandboxSettings4,
 -             "PrivacySandboxSettings4",
@@ -91,8 +115,8 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components
  
  const char kPrivacySandboxSettings4ConsentRequiredName[] = "consent-required";
  const char kPrivacySandboxSettings4NoticeRequiredName[] = "notice-required";
-@@ -66,8 +66,8 @@ const base::FeatureParam<bool>
-         true};
+@@ -74,8 +74,8 @@ const base::FeatureParam<bool> kPrivacySandboxSettings4CloseAllPrompts{
+     &kPrivacySandboxSettings4, "close-all-prompts", true};
  
  BASE_FEATURE(kPrivacySandboxSettings3,
 -             "PrivacySandboxSettings3",
@@ -102,7 +126,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components
  const base::FeatureParam<bool> kPrivacySandboxSettings3ConsentRequired{
      &kPrivacySandboxSettings3, "consent-required", false};
  const base::FeatureParam<bool> kPrivacySandboxSettings3NoticeRequired{
-@@ -90,7 +90,7 @@ BASE_FEATURE(kOverridePrivacySandboxSettingsLocalTesting,
+@@ -98,7 +98,7 @@ BASE_FEATURE(kOverridePrivacySandboxSettingsLocalTesting,
  
  BASE_FEATURE(kDisablePrivacySandboxPrompts,
               "DisablePrivacySandboxPrompts",
@@ -111,10 +135,21 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components
  
  BASE_FEATURE(kPrivacySandboxFirstPartySetsUI,
               "PrivacySandboxFirstPartySetsUI",
+@@ -107,8 +107,8 @@ const base::FeatureParam<bool> kPrivacySandboxFirstPartySetsUISampleSets{
+     &kPrivacySandboxFirstPartySetsUI, "use-sample-sets", false};
+ 
+ BASE_FEATURE(kEnforcePrivacySandboxAttestations,
+-             "EnforcePrivacySandboxAttestations",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "EnforcePrivacySandboxAttestations",  // if enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);    // log to console
+ 
+ const char kPrivacySandboxEnrollmentOverrides[] =
+     "privacy-sandbox-enrollment-overrides";
 diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/privacy_sandbox/privacy_sandbox_prefs.cc
 --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
-@@ -11,7 +11,7 @@ namespace privacy_sandbox {
+@@ -12,7 +12,7 @@ namespace privacy_sandbox {
  
  void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
@@ -126,7 +161,16 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/pr
 diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
 --- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
-@@ -204,7 +204,8 @@ PrivacySandboxSettingsImpl::GetFinchDisabledTopics() {
+@@ -102,7 +102,7 @@ base::Value::Dict CreateBlockedTopicEntry(const CanonicalTopic& topic) {
+ 
+ // static
+ bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
+-  return status == Status::kAllowed;
++  return false;
+ }
+ 
+ // static
+@@ -203,7 +203,8 @@ PrivacySandboxSettingsImpl::GetFinchDisabledTopics() {
    return finch_disabled_topics_;
  }
  
@@ -136,7 +180,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    // M1 specific
    if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings4)) {
      Status status = GetM1TopicAllowedStatus();
-@@ -261,7 +262,8 @@ bool PrivacySandboxSettingsImpl::IsTopicsAllowedForContext(
+@@ -260,7 +261,8 @@ bool PrivacySandboxSettingsImpl::IsTopicsAllowedForContext(
           IsPrivacySandboxEnabledForContext(top_frame_origin, url);
  }
  
@@ -146,7 +190,15 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    const auto& blocked_topics =
        pref_service_->GetList(prefs::kPrivacySandboxBlockedTopics);
  
-@@ -517,7 +519,8 @@ void PrivacySandboxSettingsImpl::ClearFledgeJoiningAllowedSettings(
+@@ -446,6 +448,7 @@ bool PrivacySandboxSettingsImpl::MaySendAttributionReport(
+ void PrivacySandboxSettingsImpl::SetFledgeJoiningAllowed(
+     const std::string& top_frame_etld_plus1,
+     bool allowed) {
++  if ((true)) return;
+   ScopedDictPrefUpdate scoped_pref_update(
+       pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
+ 
+@@ -516,7 +519,8 @@ void PrivacySandboxSettingsImpl::ClearFledgeJoiningAllowedSettings(
  }
  
  bool PrivacySandboxSettingsImpl::IsFledgeJoiningAllowed(
@@ -156,7 +208,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    ScopedDictPrefUpdate scoped_pref_update(
        pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
    auto& pref_data = scoped_pref_update.Get();
-@@ -672,7 +675,8 @@ bool PrivacySandboxSettingsImpl::IsPrivateAggregationAllowed(
+@@ -671,7 +675,8 @@ bool PrivacySandboxSettingsImpl::IsPrivateAggregationAllowed(
                                             reporting_origin.GetURL());
  }
  
@@ -166,7 +218,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    PrivacySandboxSettingsImpl::Status status = GetPrivacySandboxAllowedStatus();
    if (!IsAllowed(status)) {
      return false;
-@@ -710,7 +714,8 @@ void PrivacySandboxSettingsImpl::SetTopicsBlockedForTesting() {
+@@ -709,7 +714,8 @@ void PrivacySandboxSettingsImpl::SetTopicsBlockedForTesting() {
    pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, false);
  }
  
@@ -176,7 +228,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, enabled);
  }
  
-@@ -772,7 +777,10 @@ bool PrivacySandboxSettingsImpl::IsPrivacySandboxEnabledForContext(
+@@ -771,7 +777,10 @@ bool PrivacySandboxSettingsImpl::IsPrivacySandboxEnabledForContext(
        net::CookieSettingOverrides());
  }
  
@@ -188,7 +240,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    pref_service_->SetTime(prefs::kPrivacySandboxTopicsDataAccessibleSince,
                           base::Time::Now());
  
-@@ -785,6 +793,7 @@ PrivacySandboxSettingsImpl::Status
+@@ -784,6 +793,7 @@ PrivacySandboxSettingsImpl::Status
  PrivacySandboxSettingsImpl::GetSiteAccessAllowedStatus(
      const url::Origin& top_frame_origin,
      const GURL& url) const {
diff --git a/build/patches/Disable-PrivacyGuide.patch b/build/patches/Disable-PrivacyGuide.patch
index 0862813e..c614cb72 100644
--- a/build/patches/Disable-PrivacyGuide.patch
+++ b/build/patches/Disable-PrivacyGuide.patch
@@ -4,13 +4,26 @@ Subject: Disable PrivacyGuide
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/common/chrome_features.cc | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ chrome/browser/ui/webui/settings/settings_ui.cc | 2 +-
+ chrome/common/chrome_features.cc                | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
 
+diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
+--- a/chrome/browser/ui/webui/settings/settings_ui.cc
++++ b/chrome/browser/ui/webui/settings/settings_ui.cc
+@@ -331,7 +331,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+ #endif  // !BUILDFLAG(IS_CHROMEOS_LACROS)
+ 
+   bool show_privacy_guide =
+-      !chrome::ShouldDisplayManagedUi(profile) && !profile->IsChild();
++      false;
+   html_source->AddBoolean("showPrivacyGuide", show_privacy_guide);
+ 
+   html_source->AddBoolean("enablePrivacyGuide3", base::FeatureList::IsEnabled(
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -480,8 +480,8 @@ BASE_FEATURE(kPrivacyGuide3,
+@@ -518,8 +518,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP,
  
  // Enables or disables the Happiness Tracking System for Desktop Privacy Guide.
  BASE_FEATURE(kHappinessTrackingSurveysForDesktopPrivacyGuide,
@@ -21,7 +34,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
  const base::FeatureParam<base::TimeDelta>
      kHappinessTrackingSurveysForDesktopPrivacyGuideTime{
          &kHappinessTrackingSurveysForDesktopPrivacyGuide, "settings-time",
-@@ -992,8 +992,8 @@ BASE_FEATURE(kPrintPreviewSetupAssistance,
+@@ -1042,8 +1042,8 @@ BASE_FEATURE(kPrintPreviewSetupAssistance,
  #endif
  
  BASE_FEATURE(kPrivacyGuideAndroid,
diff --git a/build/patches/Do-not-compile-QR-code-sharing.patch b/build/patches/Do-not-compile-QR-code-sharing.patch
index 2a8a9fd5..4fb07f0a 100644
--- a/build/patches/Do-not-compile-QR-code-sharing.patch
+++ b/build/patches/Do-not-compile-QR-code-sharing.patch
@@ -8,14 +8,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../chrome/browser/ui/RootUiCoordinator.java  |  5 -----
  chrome/browser/share/BUILD.gn                 |  2 --
  ...omeProvidedSharingOptionsProviderBase.java | 19 -------------------
- .../qrcode/scan_tab/QrCodeScanMediator.java   | 11 -----------
- chrome/browser/share/android/java_sources.gni | 18 ------------------
- 6 files changed, 56 deletions(-)
+ chrome/browser/share/android/java_sources.gni | 11 -----------
+ 5 files changed, 38 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -3304,7 +3304,6 @@ generate_jni("chrome_jni_headers") {
+@@ -3329,7 +3329,6 @@ generate_jni("chrome_jni_headers") {
      "../browser/share/android/java/src/org/chromium/chrome/browser/share/link_to_text/LinkToTextBridge.java",
      "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",
      "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",
@@ -26,7 +25,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -111,7 +111,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
+@@ -112,7 +112,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
  import org.chromium.chrome.browser.share.ShareDelegate;
  import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
  import org.chromium.chrome.browser.share.ShareUtils;
@@ -34,7 +33,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
  import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
  import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
-@@ -532,10 +531,6 @@ public class RootUiCoordinator
+@@ -536,10 +535,6 @@ public class RootUiCoordinator
      }
  
      public void onAttachFragment(Fragment fragment) {
@@ -100,30 +99,10 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s
      private FirstPartyOption createPrintingFirstPartyOption() {
          return new FirstPartyOptionBuilder(ContentType.LINK_PAGE_VISIBLE)
                  .setIcon(R.drawable.sharing_print, R.string.print_share_activity_title)
-diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java
---- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java
-+++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java
-@@ -232,16 +232,5 @@ public class QrCodeScanMediator implements Camera.PreviewCallback {
-     }
- 
-     private void initBarcodeDetectorAsync() {
--        new AsyncTask<BarcodeDetector>() {
--            @Override
--            protected BarcodeDetector doInBackground() {
--                return new BarcodeDetector.Builder(mContext).build();
--            }
--
--            @Override
--            protected void onPostExecute(BarcodeDetector detector) {
--                mDetector = detector;
--            }
--        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-     }
- }
 diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/share/android/java_sources.gni
 --- a/chrome/browser/share/android/java_sources.gni
 +++ b/chrome/browser/share/android/java_sources.gni
-@@ -28,24 +28,6 @@ share_java_sources = [
+@@ -28,17 +28,6 @@ share_java_sources = [
    "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",
    "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",
    "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/ScreenshotBoundsManager.java",
@@ -133,13 +112,6 @@ diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/shar
 -  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java",
 -  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodePageAdapter.java",
 -  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/TabLayoutPageListener.java",
--  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreview.java",
--  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreviewOverlay.java",
--  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanCoordinator.java",
--  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java",
--  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanView.java",
--  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewBinder.java",
--  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewProperties.java",
 -  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareCoordinator.java",
 -  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareMediator.java",
 -  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch
index 69a7670d..e7750e02 100644
--- a/build/patches/Enable-native-Android-autofill.patch
+++ b/build/patches/Enable-native-Android-autofill.patch
@@ -27,7 +27,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../ui/autofill/chrome_autofill_client.cc     |  8 +-
  .../browser/android_autofill_manager.cc       |  2 +-
  .../browser/android_autofill_manager.h        |  4 +-
- .../browser/content_autofill_driver.cc        | 50 ++++++++++++
+ .../browser/content_autofill_driver.cc        | 53 ++++++++++++
  .../content/browser/content_autofill_driver.h |  9 ++-
  .../content_autofill_driver_factory.cc        | 11 ++-
  .../browser/content_autofill_driver_factory.h |  1 +
@@ -36,7 +36,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../autofill/core/common/autofill_prefs.h     |  2 +
  .../embedder_support/view/ContentView.java    | 46 +++++++++++
  .../chromium/ui/base/ViewAndroidDelegate.java |  8 ++
- 21 files changed, 323 insertions(+), 9 deletions(-)
+ 21 files changed, 326 insertions(+), 9 deletions(-)
 
 diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc
 --- a/android_webview/browser/aw_contents.cc
@@ -54,8 +54,8 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -405,6 +405,7 @@ if (current_toolchain == default_toolchain) {
-       "//chrome/browser/ui/android/hats:java",
+@@ -417,6 +417,7 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/ui/android/hats/internal:controller_java",
        "//chrome/browser/ui/android/layouts:java",
        "//chrome/browser/ui/android/layouts/glue:java",
 +    "//components/android_autofill/browser:java",
@@ -65,7 +65,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-@@ -62,6 +62,11 @@ import java.lang.annotation.Retention;
+@@ -63,6 +63,11 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.Locale;
  
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
  /**
   * The "Passwords" screen in Settings, which allows the user to enable or disable password saving,
   * to view saved passwords (just the username and URL), and to delete saved passwords.
-@@ -69,7 +74,7 @@ import java.util.Locale;
+@@ -70,7 +75,7 @@ import java.util.Locale;
  public class PasswordSettings extends PreferenceFragmentCompat
          implements PasswordListObserver, Preference.OnPreferenceClickListener,
                     SyncService.SyncStateChangedListener, FragmentHelpAndFeedbackLauncher,
@@ -86,7 +86,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
      @IntDef({TrustedVaultBannerState.NOT_SHOWN, TrustedVaultBannerState.OFFER_OPT_IN,
              TrustedVaultBannerState.OPTED_IN})
      @Retention(RetentionPolicy.SOURCE)
-@@ -96,6 +101,12 @@ public class PasswordSettings extends PreferenceFragmentCompat
+@@ -97,6 +102,12 @@ public class PasswordSettings extends PreferenceFragmentCompat
      public static final String PREF_TRUSTED_VAULT_BANNER = "trusted_vault_banner";
      public static final String PREF_KEY_MANAGE_ACCOUNT_LINK = "manage_account_link";
  
@@ -99,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
      private static final String PREF_KEY_CATEGORY_SAVED_PASSWORDS = "saved_passwords";
      private static final String PREF_KEY_CATEGORY_EXCEPTIONS = "exceptions";
      private static final String PREF_KEY_SAVED_PASSWORDS_NO_TEXT = "saved_passwords_no_text";
-@@ -128,6 +139,8 @@ public class PasswordSettings extends PreferenceFragmentCompat
+@@ -129,6 +140,8 @@ public class PasswordSettings extends PreferenceFragmentCompat
      private Preference mLinkPref;
      private Menu mMenu;
  
@@ -108,15 +108,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
      private @ManagePasswordsReferrer int mManagePasswordsReferrer;
      private HelpAndFeedbackLauncher mHelpAndFeedbackLauncher;
      private Profile mProfile;
-@@ -303,6 +316,7 @@ public class PasswordSettings extends PreferenceFragmentCompat
+@@ -304,6 +317,7 @@ public class PasswordSettings extends PreferenceFragmentCompat
          }
  
          createSavePasswordsSwitch();
 +        createEnableAndroidAutofillSwitch();
-         createAutoSignInCheckbox();
- 
-         if (mTrustedVaultBannerState == TrustedVaultBannerState.OPTED_IN) {
-@@ -556,6 +570,71 @@ public class PasswordSettings extends PreferenceFragmentCompat
+         if (shouldShowAutoSigninOption()) {
+             createAutoSignInCheckbox();
+         }
+@@ -563,6 +577,71 @@ public class PasswordSettings extends PreferenceFragmentCompat
                  getPrefService().getBoolean(Pref.CREDENTIALS_ENABLE_SERVICE));
      }
  
@@ -191,9 +191,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
-@@ -76,6 +76,17 @@ import org.chromium.ui.base.WindowAndroid;
- import org.chromium.ui.util.ColorUtils;
- import org.chromium.url.GURL;
+@@ -78,6 +78,17 @@ import org.chromium.url.GURL;
+ 
+ import java.nio.ByteBuffer;
  
 +import android.os.Build;
 +import android.util.SparseArray;
@@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
  /**
   * Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}.
   * This class is not intended to be extended.
-@@ -212,6 +223,8 @@ public class TabImpl implements Tab {
+@@ -214,6 +225,8 @@ public class TabImpl implements Tab {
      private boolean mUsedCriticalPersistedTabData;
      private boolean mIsWebContentObscured;
  
@@ -218,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
      /**
       * Creates an instance of a {@link TabImpl}.
       *
-@@ -798,6 +811,11 @@ public class TabImpl implements Tab {
+@@ -806,6 +819,11 @@ public class TabImpl implements Tab {
          for (TabObserver observer : mObservers) observer.onDestroyed(this);
          mObservers.clear();
  
@@ -230,8 +230,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
          mUserDataHost.destroy();
          mTabViewManager.destroy();
          hideNativePage(false, null);
-@@ -1386,6 +1404,16 @@ public class TabImpl implements Tab {
-         return tabsPtrArray;
+@@ -1421,6 +1439,16 @@ public class TabImpl implements Tab {
+         return webContentsState == null ? -1 : webContentsState.version();
      }
  
 +    public void onProvideAutofillVirtualStructure(ViewStructure structure, int flags) {
@@ -247,7 +247,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
      /**
       * Initializes the {@link WebContents}. Completes the browser content components initialization
       * around a native WebContents pointer.
-@@ -1435,6 +1463,28 @@ public class TabImpl implements Tab {
+@@ -1470,6 +1498,28 @@ public class TabImpl implements Tab {
                              mDelegateFactory.createContextMenuPopulatorFactory(this), this));
  
              mWebContents.notifyRendererPreferenceUpdate();
@@ -276,7 +276,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
              TabHelpers.initWebContentsHelpers(this);
              notifyContentChanged();
          } finally {
-@@ -1790,6 +1840,7 @@ public class TabImpl implements Tab {
+@@ -1827,6 +1877,7 @@ public class TabImpl implements Tab {
          void setActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url, String title);
          void loadOriginalImage(long nativeTabAndroid);
          boolean handleNonNavigationAboutURL(GURL url);
@@ -318,7 +318,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2576,6 +2576,13 @@ static_library("browser") {
+@@ -2612,6 +2612,13 @@ static_library("browser") {
      deps += [ "//chrome/browser/error_reporting" ]
    }
  
@@ -335,7 +335,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
 --- a/chrome/browser/android/tab_android.cc
 +++ b/chrome/browser/android/tab_android.cc
-@@ -68,6 +68,13 @@
+@@ -53,6 +53,13 @@
  #include "url/android/gurl_android.h"
  #include "url/gurl.h"
  
@@ -351,7 +351,7 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_
  using base::android::JavaParamRef;
 @@ -506,3 +513,11 @@ static void JNI_TabImpl_Init(JNIEnv* env,
    // This will automatically bind to the Java object and pass ownership there.
-   new TabAndroid(env, obj, id);
+   new TabAndroid(env, obj, profile, id);
  }
 +
 +void TabAndroid::InitializeAutofillIfNecessary(JNIEnv* env) {
@@ -364,15 +364,15 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_
 diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
 --- a/chrome/browser/android/tab_android.h
 +++ b/chrome/browser/android/tab_android.h
-@@ -169,6 +169,8 @@ class TabAndroid : public base::SupportsUserData {
+@@ -173,6 +173,8 @@ class TabAndroid : public base::SupportsUserData {
  
    void SetDevToolsAgentHost(scoped_refptr<content::DevToolsAgentHost> host);
  
 +  void InitializeAutofillIfNecessary(JNIEnv* env);
 +
-  private:
-   JavaObjectWeakGlobalRef weak_java_tab_;
- 
+   // This should never return null, unless it is called in a state where no
+   // tabs exist (such as on FRE), which should never happen. If it is called
+   // then, a nullptr will be returned and must be handled accordingly.
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -392,7 +392,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc
 --- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
 +++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
-@@ -1270,7 +1270,13 @@ ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents)
+@@ -1265,7 +1265,13 @@ ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents)
            web_contents,
            base::BindRepeating(&BrowserDriverInitHook,
                                this,
@@ -410,7 +410,7 @@ diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/brows
 diff --git a/components/android_autofill/browser/android_autofill_manager.cc b/components/android_autofill/browser/android_autofill_manager.cc
 --- a/components/android_autofill/browser/android_autofill_manager.cc
 +++ b/components/android_autofill/browser/android_autofill_manager.cc
-@@ -19,7 +19,7 @@ using base::TimeTicks;
+@@ -24,7 +24,7 @@ using base::TimeTicks;
  void AndroidDriverInitHook(AutofillClient* client,
                             ContentAutofillDriver* driver) {
    driver->set_autofill_manager(
@@ -422,7 +422,7 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.cc b/c
 diff --git a/components/android_autofill/browser/android_autofill_manager.h b/components/android_autofill/browser/android_autofill_manager.h
 --- a/components/android_autofill/browser/android_autofill_manager.h
 +++ b/components/android_autofill/browser/android_autofill_manager.h
-@@ -86,12 +86,12 @@ class AndroidAutofillManager : public AutofillManager {
+@@ -95,12 +95,12 @@ class AndroidAutofillManager : public AutofillManager,
                           const FieldTypeGroup field_type_group,
                           const url::Origin& triggered_origin);
  
@@ -440,18 +440,20 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.h b/co
 diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc
 --- a/components/autofill/content/browser/content_autofill_driver.cc
 +++ b/components/autofill/content/browser/content_autofill_driver.cc
-@@ -406,6 +406,8 @@ void ContentAutofillDriver::FormsSeen(
-          const std::vector<FormGlobalId>& removed_forms) {
-         target->autofill_manager_->OnFormsSeen(WithNewVersion(updated_forms),
-                                                removed_forms);
-+        if (target->secondary_autofill_manager_)
-+          target->secondary_autofill_manager_->OnFormsSeen(updated_forms, removed_forms);
-       });
+@@ -426,6 +426,10 @@ void ContentAutofillDriver::FormsSeen(
+                         const std::vector<FormGlobalId>& removed_forms) {
+                        target->GetAutofillManager().OnFormsSeen(
+                            WithNewVersion(updated_forms), removed_forms);
++                       if (target->secondary_autofill_manager_) {
++                         target->secondary_autofill_manager_->OnFormsSeen(
++                           WithNewVersion(updated_forms), removed_forms);
++                       }
+                      });
  }
  
-@@ -433,6 +435,10 @@ void ContentAutofillDriver::FormSubmitted(
+@@ -453,6 +457,10 @@ void ContentAutofillDriver::FormSubmitted(
          }
-         target->autofill_manager_->OnFormSubmitted(
+         target->GetAutofillManager().OnFormSubmitted(
              WithNewVersion(form), known_success, submission_source);
 +        if (target->secondary_autofill_manager_) {
 +          target->secondary_autofill_manager_->OnFormSubmitted(
@@ -460,9 +462,9 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
        });
  }
  
-@@ -454,6 +460,10 @@ void ContentAutofillDriver::TextFieldDidChange(const FormData& raw_form,
+@@ -474,6 +482,10 @@ void ContentAutofillDriver::TextFieldDidChange(const FormData& raw_form,
           base::TimeTicks timestamp) {
-         target->autofill_manager_->OnTextFieldDidChange(
+         target->GetAutofillManager().OnTextFieldDidChange(
              WithNewVersion(form), field, bounding_box, timestamp);
 +        if (target->secondary_autofill_manager_) {
 +          target->secondary_autofill_manager_->OnTextFieldDidChange(
@@ -471,10 +473,10 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
        });
  }
  
-@@ -473,6 +483,10 @@ void ContentAutofillDriver::TextFieldDidScroll(const FormData& raw_form,
+@@ -493,6 +505,10 @@ void ContentAutofillDriver::TextFieldDidScroll(const FormData& raw_form,
           const FormFieldData& field, const gfx::RectF& bounding_box) {
-         target->autofill_manager_->OnTextFieldDidScroll(WithNewVersion(form),
-                                                         field, bounding_box);
+         target->GetAutofillManager().OnTextFieldDidScroll(WithNewVersion(form),
+                                                           field, bounding_box);
 +        if (target->secondary_autofill_manager_) {
 +          target->secondary_autofill_manager_->OnTextFieldDidScroll(
 +              WithNewVersion(form), field, bounding_box);
@@ -482,9 +484,9 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
        });
  }
  
-@@ -493,6 +507,10 @@ void ContentAutofillDriver::SelectControlDidChange(
+@@ -513,6 +529,10 @@ void ContentAutofillDriver::SelectControlDidChange(
           const FormFieldData& field, const gfx::RectF& bounding_box) {
-         target->autofill_manager_->OnSelectControlDidChange(
+         target->GetAutofillManager().OnSelectControlDidChange(
              WithNewVersion(form), field, bounding_box);
 +        if (target->secondary_autofill_manager_) {
 +          target->secondary_autofill_manager_->OnSelectControlDidChange(
@@ -493,9 +495,9 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
        });
  }
  
-@@ -515,6 +533,10 @@ void ContentAutofillDriver::AskForValuesToFill(
+@@ -535,6 +555,10 @@ void ContentAutofillDriver::AskForValuesToFill(
           AutofillSuggestionTriggerSource trigger_source) {
-         target->autofill_manager_->OnAskForValuesToFill(
+         target->GetAutofillManager().OnAskForValuesToFill(
              WithNewVersion(form), field, bounding_box, trigger_source);
 +        if (target->secondary_autofill_manager_) {
 +          target->secondary_autofill_manager_->OnAskForValuesToFill(
@@ -504,37 +506,44 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
        });
  }
  
-@@ -526,12 +548,16 @@ void ContentAutofillDriver::HidePopup() {
+@@ -546,6 +570,8 @@ void ContentAutofillDriver::HidePopup() {
      DCHECK(!target->IsPrerendering())
          << "We should never affect UI while prerendering";
-     target->autofill_manager_->OnHidePopup();
+     target->GetAutofillManager().OnHidePopup();
 +    if (target->secondary_autofill_manager_)
 +      target->secondary_autofill_manager_->OnHidePopup();
    });
  }
  
- void ContentAutofillDriver::FocusNoLongerOnFormCallback(
-     bool had_interacted_form) {
-   autofill_manager_->OnFocusNoLongerOnForm(had_interacted_form);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnFocusNoLongerOnForm(had_interacted_form);
+@@ -557,6 +583,8 @@ void ContentAutofillDriver::FocusNoLongerOnForm(bool had_interacted_form) {
+       this, had_interacted_form,
+       [](autofill::AutofillDriver* target, bool had_interacted_form) {
+         target->GetAutofillManager().OnFocusNoLongerOnForm(had_interacted_form);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnFocusNoLongerOnForm(had_interacted_form);
+       });
  }
  
- void ContentAutofillDriver::FocusNoLongerOnForm(bool had_interacted_form) {
-@@ -561,6 +587,10 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form,
+@@ -576,9 +604,16 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form,
           const FormFieldData& field, const gfx::RectF& bounding_box) {
-         target->autofill_manager_->OnFocusOnFormField(WithNewVersion(form),
-                                                       field, bounding_box);
+         target->GetAutofillManager().OnFocusOnFormField(WithNewVersion(form),
+                                                         field, bounding_box);
 +        if (target->secondary_autofill_manager_) {
 +          target->secondary_autofill_manager_->OnFocusOnFormField(
 +            WithNewVersion(form), field, bounding_box);
++        }
+       },
+       [](autofill::AutofillDriver* target) {
+         target->GetAutofillManager().OnFocusNoLongerOnForm(true);
++        if (target->secondary_autofill_manager_) {
++          target->secondary_autofill_manager_->OnFocusNoLongerOnForm(true);
 +        }
        });
  }
  
-@@ -575,6 +605,10 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form,
+@@ -593,6 +628,10 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form,
           base::TimeTicks timestamp) {
-         target->autofill_manager_->OnDidFillAutofillFormData(
+         target->GetAutofillManager().OnDidFillAutofillFormData(
              WithNewVersion(form), timestamp);
 +        if (target->secondary_autofill_manager_) {
 +          target->secondary_autofill_manager_->OnDidFillAutofillFormData(
@@ -543,28 +552,19 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
        });
  }
  
-@@ -585,6 +619,8 @@ void ContentAutofillDriver::DidPreviewAutofillFormData() {
-   autofill_router().DidPreviewAutofillFormData(
-       this, [](ContentAutofillDriver* target) {
-         target->autofill_manager_->OnDidPreviewAutofillFormData();
-+        if (target->secondary_autofill_manager_)
-+          target->secondary_autofill_manager_->OnDidPreviewAutofillFormData();
-       });
+@@ -602,6 +641,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() {
+   }
+   router().DidEndTextFieldEditing(this, [](autofill::AutofillDriver* target) {
+     target->GetAutofillManager().OnDidEndTextFieldEditing();
++    if (target->secondary_autofill_manager_)
++      target->secondary_autofill_manager_->OnDidEndTextFieldEditing();
+   });
  }
  
-@@ -595,6 +631,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() {
-   autofill_router().DidEndTextFieldEditing(
-       this, [](ContentAutofillDriver* target) {
-         target->autofill_manager_->OnDidEndTextFieldEditing();
-+        if (target->secondary_autofill_manager_)
-+          target->secondary_autofill_manager_->OnDidEndTextFieldEditing();
-       });
- }
- 
-@@ -608,6 +646,10 @@ void ContentAutofillDriver::SelectOrSelectMenuFieldOptionsDidChange(
-       [](ContentAutofillDriver* target, const FormData& form) {
-         target->autofill_manager_->OnSelectOrSelectMenuFieldOptionsDidChange(
-             WithNewVersion(form));
+@@ -616,6 +657,10 @@ void ContentAutofillDriver::SelectOrSelectListFieldOptionsDidChange(
+         cast(target)
+             ->GetAutofillManager()
+             .OnSelectOrSelectListFieldOptionsDidChange(WithNewVersion(form));
 +        if (target->secondary_autofill_manager_) {
 +          target->secondary_autofill_manager_->OnSelectOrSelectMenuFieldOptionsDidChange(
 +            WithNewVersion(form));
@@ -572,9 +572,9 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
        });
  }
  
-@@ -627,6 +669,10 @@ void ContentAutofillDriver::JavaScriptChangedAutofilledValue(
+@@ -635,6 +680,10 @@ void ContentAutofillDriver::JavaScriptChangedAutofilledValue(
           const FormFieldData& field, const std::u16string& old_value) {
-         target->autofill_manager_->OnJavaScriptChangedAutofilledValue(
+         target->GetAutofillManager().OnJavaScriptChangedAutofilledValue(
              WithNewVersion(form), field, old_value);
 +        if (target->secondary_autofill_manager_) {
 +          target->secondary_autofill_manager_->OnJavaScriptChangedAutofilledValue(
@@ -583,18 +583,18 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
        });
  }
  
-@@ -634,6 +680,8 @@ void ContentAutofillDriver::OnContextMenuShownInFieldCallback(
-     const FormGlobalId& form_global_id,
-     const FieldGlobalId& field_global_id) {
-   autofill_manager_->OnContextMenuShownInField(form_global_id, field_global_id);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnContextMenuShownInField(form_global_id, field_global_id);
+@@ -647,6 +696,8 @@ void ContentAutofillDriver::OnContextMenuShownInField(
+          const FieldGlobalId& field_global_id) {
+         target->GetAutofillManager().OnContextMenuShownInField(form_global_id,
+                                                                field_global_id);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnContextMenuShownInField(form_global_id, field_global_id);
+       });
  }
  
- void ContentAutofillDriver::OnContextMenuShownInField(
-@@ -655,6 +703,8 @@ void ContentAutofillDriver::Reset() {
-   owner_->autofill_router().UnregisterDriver(this,
-                                              /*driver_is_dying=*/false);
+@@ -657,6 +708,8 @@ void ContentAutofillDriver::Reset() {
+   owner_->router().UnregisterDriver(this,
+                                     /*driver_is_dying=*/false);
    autofill_manager_->Reset();
 +  if (secondary_autofill_manager_)
 +    secondary_autofill_manager_->Reset();
@@ -604,7 +604,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
 diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h
 --- a/components/autofill/content/browser/content_autofill_driver.h
 +++ b/components/autofill/content/browser/content_autofill_driver.h
-@@ -126,10 +126,13 @@ class ContentAutofillDriver : public AutofillDriver,
+@@ -126,9 +126,12 @@ class ContentAutofillDriver : public AutofillDriver,
    ContentAutofillDriver& operator=(const ContentAutofillDriver&) = delete;
    ~ContentAutofillDriver() override;
  
@@ -614,12 +614,11 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com
      autofill_manager_ = std::move(autofill_manager);
 +    secondary_autofill_manager_ = std::move(secondary_autofill_manager);
    }
-   AutofillManager* autofill_manager() { return autofill_manager_.get(); }
 +  AutofillManager* secondary_autofill_manager() { return secondary_autofill_manager_.get(); }
  
    content::RenderFrameHost* render_frame_host() { return &*render_frame_host_; }
    const content::RenderFrameHost* render_frame_host() const {
-@@ -339,6 +342,10 @@ class ContentAutofillDriver : public AutofillDriver,
+@@ -322,6 +325,10 @@ class ContentAutofillDriver : public AutofillDriver,
  
    std::unique_ptr<AutofillManager> autofill_manager_ = nullptr;
  
@@ -627,13 +626,13 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com
 +  // conjunction with browser autofill in Bromite
 +  std::unique_ptr<AutofillManager> secondary_autofill_manager_ = nullptr;
 +
-   content::RenderWidgetHost::KeyPressEventCallback key_press_handler_;
- 
    mojo::AssociatedReceiver<mojom::AutofillDriver> receiver_{this};
+ 
+   mojo::AssociatedRemote<mojom::AutofillAgent> autofill_agent_;
 diff --git a/components/autofill/content/browser/content_autofill_driver_factory.cc b/components/autofill/content/browser/content_autofill_driver_factory.cc
 --- a/components/autofill/content/browser/content_autofill_driver_factory.cc
 +++ b/components/autofill/content/browser/content_autofill_driver_factory.cc
-@@ -14,6 +14,7 @@
+@@ -13,6 +13,7 @@
  #include "components/autofill/content/browser/content_autofill_driver.h"
  #include "components/autofill/core/browser/browser_autofill_manager.h"
  #include "components/autofill/core/common/autofill_features.h"
@@ -641,7 +640,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory
  #include "content/public/browser/global_routing_id.h"
  #include "content/public/browser/navigation_handle.h"
  #include "content/public/browser/render_frame_host.h"
-@@ -43,9 +44,17 @@ bool ShouldEnableHeavyFormDataScraping(const version_info::Channel channel) {
+@@ -44,9 +45,17 @@ bool ShouldEnableHeavyFormDataScraping(const version_info::Channel channel) {
  
  void BrowserDriverInitHook(AutofillClient* client,
                             const std::string& app_locale,
@@ -663,7 +662,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory
 diff --git a/components/autofill/content/browser/content_autofill_driver_factory.h b/components/autofill/content/browser/content_autofill_driver_factory.h
 --- a/components/autofill/content/browser/content_autofill_driver_factory.h
 +++ b/components/autofill/content/browser/content_autofill_driver_factory.h
-@@ -35,6 +35,7 @@ class ContentAutofillDriver;
+@@ -36,6 +36,7 @@ class ScopedAutofillManagersObservation;
  // other implementations.
  void BrowserDriverInitHook(AutofillClient* client,
                             const std::string& app_locale,
@@ -689,7 +688,7 @@ diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/c
 diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
-@@ -133,6 +133,10 @@ const char kAutofillUsingVirtualViewStructure[] =
+@@ -137,6 +137,10 @@ const char kAutofillUsingVirtualViewStructure[] =
      "autofill.using_virtual_view_structure";
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -700,7 +699,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto
  void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    // Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
    registry->RegisterBooleanPref(
-@@ -164,6 +168,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -168,6 +172,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kAutofillCreditCardFidoAuthOfferCheckboxState, true);
  #endif
@@ -718,15 +717,15 @@ diff --git a/components/autofill/core/common/autofill_prefs.h b/components/autof
  extern const char kAutocompleteLastVersionRetentionPolicy[];
 +extern const char kAutofillAndroidEnabled[];
 +extern const char kAutofillAndroidIncognitoEnabled[];
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \
+     BUILDFLAG(IS_IOS)
  extern const char kAutofillPaymentMethodsMandatoryReauth[];
- extern const char kAutofillPaymentMethodsMandatoryReauthPromoShownCounter[];
 diff --git a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/view/ContentView.java b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/view/ContentView.java
 --- a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/view/ContentView.java
 +++ b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/view/ContentView.java
-@@ -38,6 +38,11 @@ import org.chromium.ui.base.EventForwarder;
- import org.chromium.ui.base.EventOffsetHandler;
- import org.chromium.ui.dragdrop.DragEventDispatchHelper.DragEventDispatchDestination;
+@@ -41,6 +41,11 @@ import org.chromium.ui.dragdrop.DragEventDispatchHelper.DragEventDispatchDestina
+ 
+ import java.util.function.Supplier;
  
 +import org.chromium.base.Log;
 +import android.util.SparseArray;
@@ -736,7 +735,7 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component
  /**
   * The containing view for {@link WebContents} that exists in the Android UI hierarchy and exposes
   * the various {@link View} functionality to it.
-@@ -87,6 +92,8 @@ public class ContentView extends FrameLayout
+@@ -92,6 +97,8 @@ public class ContentView extends FrameLayout
       */
      public static ContentView createContentView(Context context,
              @Nullable EventOffsetHandler eventOffsetHandler, @Nullable WebContents webContents) {
@@ -745,7 +744,7 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component
          return new ContentView(context, eventOffsetHandler, webContents);
      }
  
-@@ -617,4 +624,43 @@ public class ContentView extends FrameLayout
+@@ -638,4 +645,43 @@ public class ContentView extends FrameLayout
          mDragDropEventOffsetHandler.onPostDispatchDragEvent(event.getAction());
          return ret;
      }
@@ -792,7 +791,7 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component
 diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
 --- a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
 +++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
-@@ -30,6 +30,10 @@ import org.chromium.ui.dragdrop.DragStateTracker;
+@@ -31,6 +31,10 @@ import org.chromium.ui.dragdrop.DragStateTracker;
  import org.chromium.ui.dragdrop.DropDataAndroid;
  import org.chromium.ui.mojom.CursorType;
  
@@ -803,7 +802,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b
  /**
   * Class to acquire, position, and remove anchor views from the implementing View.
   */
-@@ -621,4 +625,8 @@ public class ViewAndroidDelegate {
+@@ -578,4 +582,8 @@ public class ViewAndroidDelegate {
          sDragAndDropDelegateForTesting = testDelegate;
          ResettersForTesting.register(() -> sDragAndDropDelegateForTesting = null);
      }
diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch
index cfca8569..4c1e734e 100644
--- a/build/patches/Move-navigation-bar-to-bottom.patch
+++ b/build/patches/Move-navigation-bar-to-bottom.patch
@@ -55,8 +55,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../BrowserControlsStateProvider.java         |  6 ++
  chrome/browser/flag_descriptions.cc           |  4 +
  chrome/browser/flag_descriptions.h            |  3 +
- .../flags/android/cached_feature_flags.cc     | 18 +++++
- .../flags/android/chrome_feature_list.cc      |  6 +-
+ .../flags/android/chrome_feature_list.cc      |  2 +
  .../browser/flags/CachedFeatureFlags.java     | 18 +++++
  .../chrome/browser/flags/CachedFlag.java      |  6 ++
  .../browser/flags/ChromeFeatureList.java      |  5 ++
@@ -65,11 +64,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../ui/appmenu/AppMenuHandlerImpl.java        | 11 +++
  .../omnibox/LocationBarCoordinator.java       |  6 +-
  ...mniboxSuggestionsDropdownEmbedderImpl.java | 14 +++-
- .../browser/omnibox/UrlBarCoordinator.java    | 11 ++-
+ .../browser/omnibox/UrlBarCoordinator.java    | 10 +++
  .../suggestions/AutocompleteCoordinator.java  | 16 +++-
  .../suggestions/AutocompleteMediator.java     |  7 +-
  .../DropdownItemViewInfoListManager.java      | 15 +++-
- .../OmniboxSuggestionsDropdown.java           | 30 +++++--
+ .../OmniboxSuggestionsDropdown.java           | 31 ++++++-
  .../OmniboxSuggestionsDropdownEmbedder.java   |  9 +++
  .../strings/android_chrome_strings.grd        |  6 ++
  chrome/browser/ui/android/toolbar/BUILD.gn    |  1 +
@@ -88,7 +87,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../accessibility/AccessibilitySettings.java  | 16 ++++
  .../AccessibilitySettingsDelegate.java        |  6 ++
  .../render_widget_host_view_android.cc        |  3 +
- 76 files changed, 902 insertions(+), 67 deletions(-)
+ 75 files changed, 884 insertions(+), 63 deletions(-)
 
 diff --git a/cc/base/features.cc b/cc/base/features.cc
 --- a/cc/base/features.cc
@@ -141,7 +140,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -4247,6 +4247,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
+@@ -4246,6 +4246,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
    if (scroll_delta.IsZero())
      return false;
  
@@ -154,7 +153,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
 diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
 --- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
 +++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
-@@ -108,6 +108,9 @@ import org.chromium.ui.util.ColorUtils;
+@@ -110,6 +110,9 @@ import org.chromium.ui.util.ColorUtils;
  
  import java.util.List;
  
@@ -164,7 +163,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
  /** The mediator implements the logic to interact with the surfaces and caller. */
  class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.OnClickListener,
                                        StartSurface.OnTabSelectingListener, BackPressHandler,
-@@ -1390,6 +1393,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
+@@ -1399,6 +1402,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
      }
  
      private void setTopMargin(int topMargin) {
@@ -176,7 +175,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java
-@@ -45,6 +45,7 @@ import org.chromium.components.feature_engagement.FeatureConstants;
+@@ -41,6 +41,7 @@ import org.chromium.components.feature_engagement.FeatureConstants;
  import org.chromium.ui.modelutil.PropertyModel;
  import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
  import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
@@ -184,7 +183,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  
  import java.util.List;
  
-@@ -143,7 +144,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T
+@@ -139,7 +140,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T
      @Override
      public void initializeWithNative(Activity activity,
              BottomControlsCoordinator.BottomControlsVisibilityController visibilityController,
@@ -194,7 +193,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
          try (TraceEvent e = TraceEvent.scoped("TabGroupUiCoordinator.initializeWithNative")) {
              mTabStripCoordinator = new TabListCoordinator(TabListCoordinator.TabListMode.STRIP,
                      mContext, mBrowserControlsStateProvider, mTabModelSelector, null, null, false,
-@@ -180,7 +182,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T
+@@ -175,7 +177,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T
              mMediator = new TabGroupUiMediator(mActivity, visibilityController, this, mModel,
                      mTabModelSelector, mTabCreatorManager, mLayoutStateProviderSupplier,
                      mIncognitoStateProvider, mTabGridDialogControllerSupplier,
@@ -270,10 +269,10 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
              @Override
              public void didSelectTab(Tab tab, @TabSelectionType int type, int lastId) {
 +                updateThemeColor(tab);
-                 if (TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mContext)
-                         && getTabsToShowForId(lastId).contains(tab)) {
+                 if (getTabsToShowForId(lastId).contains(tab)) {
                      return;
-@@ -200,6 +232,7 @@ public class TabGroupUiMediator implements BackPressHandler {
+                 }
+@@ -199,6 +231,7 @@ public class TabGroupUiMediator implements BackPressHandler {
                      return;
                  }
                  resetTabStripWithRelatedTabsForId(currentTab.getId());
@@ -281,7 +280,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
              }
  
              @Override
-@@ -315,6 +348,8 @@ public class TabGroupUiMediator implements BackPressHandler {
+@@ -312,6 +345,8 @@ public class TabGroupUiMediator implements BackPressHandler {
              resetTabStripWithRelatedTabsForId(tab.getId());
          }
  
@@ -290,7 +289,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
          mBackPressStateSupplier = new ObservableSupplierImpl<>();
          if (mTabGridDialogControllerSupplier != null) {
              mTabGridDialogControllerSupplier.onAvailable(controller -> {
-@@ -328,6 +363,18 @@ public class TabGroupUiMediator implements BackPressHandler {
+@@ -325,6 +360,18 @@ public class TabGroupUiMediator implements BackPressHandler {
          mModel.set(TabGroupUiProperties.LEFT_BUTTON_DRAWABLE_ID, drawableId);
      }
  
@@ -309,7 +308,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      void setupLeftButtonOnClickListener(View.OnClickListener listener) {
          mModel.set(TabGroupUiProperties.LEFT_BUTTON_ON_CLICK_LISTENER, listener);
      }
-@@ -442,6 +489,7 @@ public class TabGroupUiMediator implements BackPressHandler {
+@@ -437,6 +484,7 @@ public class TabGroupUiMediator implements BackPressHandler {
      }
  
      public void destroy() {
@@ -356,7 +355,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  /**
   * Represents a generic toolbar used in the bottom strip/grid component.
   * {@link TabGridPanelToolbarCoordinator}
-@@ -170,6 +175,19 @@ public class TabGroupUiToolbarView extends FrameLayout {
+@@ -168,6 +173,19 @@ public class TabGroupUiToolbarView extends FrameLayout {
          mFadingEdgeEnd.setColorFilter(color, PorterDuff.Mode.SRC_IN);
      }
  
@@ -407,7 +406,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import android.content.res.Resources;
  import android.graphics.Bitmap;
  import android.graphics.BitmapFactory;
-@@ -51,6 +52,9 @@ import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter;
+@@ -50,6 +51,9 @@ import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter;
  import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
  import org.chromium.ui.widget.ViewLookupCachingFrameLayout;
  
@@ -417,7 +416,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.List;
-@@ -108,6 +112,74 @@ public class TabListCoordinator
+@@ -107,6 +111,74 @@ public class TabListCoordinator
      private int mEmptyStateSubheadingResId;
      private boolean mIsEmptyViewInitialized;
  
@@ -492,7 +491,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      /**
       * Construct a coordinator for UI that shows a list of tabs.
       * @param mode Modes of showing the list of tabs. Can be used in GRID or STRIP.
-@@ -284,6 +356,12 @@ public class TabListCoordinator
+@@ -283,6 +355,12 @@ public class TabListCoordinator
              if (mMode == TabListMode.GRID) {
                  GridLayoutManager gridLayoutManager =
                          new GridLayoutManager(context, GRID_LAYOUT_SPAN_COUNT_COMPACT);
@@ -505,7 +504,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                  mRecyclerView.setLayoutManager(gridLayoutManager);
                  mMediator.registerOrientationListener(gridLayoutManager);
                  mMediator.updateSpanCount(
-@@ -561,6 +639,9 @@ public class TabListCoordinator
+@@ -571,6 +649,9 @@ public class TabListCoordinator
      void prepareTabSwitcherView() {
          registerLayoutChangeListener();
          mRecyclerView.prepareTabSwitcherView();
@@ -578,7 +577,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  
          if (mShadowImageView != null && getParent() instanceof FrameLayout) {
              // Since the shadow has no functionality, other than just existing visually, we can use
-@@ -550,6 +566,7 @@ class TabListRecyclerView
+@@ -544,6 +560,7 @@ class TabListRecyclerView
                  mListener.finishedHiding();
              }
          });
@@ -589,7 +588,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
-@@ -43,6 +43,7 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider
+@@ -42,6 +42,7 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
  import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -597,7 +596,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthController;
  import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthManager;
  import org.chromium.chrome.browser.layouts.LayoutStateProvider;
-@@ -522,11 +523,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
+@@ -512,11 +513,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
              updateTopControlsProperties();
              mContainerViewModel.set(
                      BOTTOM_CONTROLS_HEIGHT, browserControlsStateProvider.getBottomControlsHeight());
@@ -620,7 +619,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
              if (backPressManager != null && BackPressManager.isEnabled()) {
                  assert !mIsStartSurfaceEnabled || mIsStartSurfaceRefactorEnabled;
                  backPressManager.addHandler(this, BackPressHandler.Type.TAB_SWITCHER);
-@@ -647,6 +659,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
+@@ -627,6 +639,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
          final int contentOffset = mBrowserControlsStateProvider.getContentOffset();
  
          mContainerViewModel.set(TOP_MARGIN, contentOffset);
@@ -634,7 +633,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
-@@ -18,6 +18,14 @@ import org.chromium.components.browser_ui.accessibility.PageZoomUtils;
+@@ -15,6 +15,14 @@ import org.chromium.components.browser_ui.accessibility.PageZoomUtils;
  import org.chromium.components.user_prefs.UserPrefs;
  import org.chromium.content_public.browser.BrowserContextHandle;
  
@@ -648,9 +647,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 +
  /** The Chrome implementation of AccessibilitySettingsDelegate. */
  public class ChromeAccessibilitySettingsDelegate implements AccessibilitySettingsDelegate {
-     private static class AccessibilityTabSwitcherDelegate implements BooleanPreferenceDelegate {
-@@ -31,6 +39,12 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
-         public void setEnabled(boolean value) {}
+     private static class ReaderForAccessibilityDelegate implements BooleanPreferenceDelegate {
+@@ -35,6 +43,12 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+         }
      }
  
 +    private SnackbarManager mSnackbarManager;
@@ -659,10 +658,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 +        mSnackbarManager = snackbarManager;
 +    }
 +
-     private static class ReaderForAccessibilityDelegate implements BooleanPreferenceDelegate {
-         private final Profile mProfile;
+     private final Profile mProfile;
  
-@@ -96,6 +110,44 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+     /**
+@@ -74,6 +88,44 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
          return new ForceTabletUIDelegate();
      }
  
@@ -710,7 +709,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -252,6 +252,9 @@ import java.util.ArrayList;
+@@ -254,6 +254,9 @@ import java.util.ArrayList;
  import java.util.List;
  import java.util.function.Consumer;
  
@@ -720,7 +719,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  /**
   * A {@link AsyncInitializationActivity} that builds and manages a {@link CompositorViewHolder}
   * and associated classes.
-@@ -782,6 +785,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -785,6 +788,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                  int toolbarLayoutId = getToolbarLayoutId();
                  if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
                      controlContainer.initWithToolbar(toolbarLayoutId);
@@ -749,7 +748,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp
  
  import java.util.ArrayList;
  import java.util.HashSet;
-@@ -321,6 +323,10 @@ public class CompositorViewHolder extends FrameLayout
+@@ -319,6 +321,10 @@ public class CompositorViewHolder extends FrameLayout
                      @Override
                      public void setCurrentTouchEventOffsets(float top) {
                          EventForwarder forwarder = getEventForwarder();
@@ -760,7 +759,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp
                          if (forwarder != null) forwarder.setCurrentTouchEventOffsets(0, top);
                      }
  
-@@ -905,6 +911,9 @@ public class CompositorViewHolder extends FrameLayout
+@@ -889,6 +895,9 @@ public class CompositorViewHolder extends FrameLayout
          int keyboardInset = mApplicationBottomInsetSupplier != null
                  ? mApplicationBottomInsetSupplier.get().webContentsHeightInset
                  : 0;
@@ -773,7 +772,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java
-@@ -43,6 +43,8 @@ import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.Sw
+@@ -41,6 +41,8 @@ import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.Sw
  import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator;
  import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
@@ -782,7 +781,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
  
  import java.util.List;
  
-@@ -261,7 +263,10 @@ public class LayoutManagerChrome
+@@ -256,7 +258,10 @@ public class LayoutManagerChrome
  
      @Override
      public SwipeHandler createToolbarSwipeHandler(boolean supportSwipeDown) {
@@ -794,7 +793,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
      }
  
      @Override
-@@ -496,9 +501,11 @@ public class LayoutManagerChrome
+@@ -459,9 +464,11 @@ public class LayoutManagerChrome
          private static final float SWIPE_RANGE_DEG = 25;
  
          private final boolean mSupportSwipeDown;
@@ -807,7 +806,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
          }
  
          @Override
-@@ -530,6 +537,9 @@ public class LayoutManagerChrome
+@@ -493,6 +500,9 @@ public class LayoutManagerChrome
                      && mScrollDirection == ScrollDirection.DOWN) {
                  RecordUserAction.record("MobileToolbarSwipeOpenStackView");
                  showLayout(LayoutType.TAB_SWITCHER, true);
@@ -817,7 +816,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
              } else if (mScrollDirection == ScrollDirection.LEFT
                      || mScrollDirection == ScrollDirection.RIGHT) {
                  startShowing(mToolbarSwipeLayout, true);
-@@ -576,6 +586,8 @@ public class LayoutManagerChrome
+@@ -539,6 +549,8 @@ public class LayoutManagerChrome
                  direction = ScrollDirection.RIGHT;
              } else if (swipeAngle < 270 + SWIPE_RANGE_DEG && swipeAngle > 270 - SWIPE_RANGE_DEG) {
                  direction = ScrollDirection.DOWN;
@@ -826,15 +825,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
              }
  
              return direction;
-@@ -589,7 +601,7 @@ public class LayoutManagerChrome
+@@ -552,7 +564,7 @@ public class LayoutManagerChrome
                  return false;
              }
  
 -            if (direction == ScrollDirection.DOWN) {
 +            if (direction == ScrollDirection.DOWN || direction == ScrollDirection.UP) {
-                 boolean isAccessibility =
-                         DeviceClassManager.enableAccessibilityLayout(mHost.getContext());
-                 return isTabSwitcherReady() && !isAccessibility;
+                 return isTabSwitcherReady();
+             }
+ 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java
@@ -898,7 +897,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -521,7 +521,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
+@@ -520,7 +520,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
          // position 0 is on the left. Account for that in the offset calculation.
          boolean isRtl = LocalizationUtils.isLayoutRtl();
          boolean useUnadjustedScrollOffset = isRtl != isLeft;
@@ -927,7 +926,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 +    private final Supplier<BrowserControlsManager> mBrowserControlsManagerSupplier;
 +    private final float mDpToPx;
 +
-     private class TabStripEventHandler implements GestureHandler {
+     private class TabStripEventHandler implements MotionEventHandler {
          @Override
          public void onDown(float x, float y, boolean fromMouse, int buttons) {
 +            y -= mStripFilterArea.top;
@@ -973,7 +972,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
          mUpdateHost = updateHost;
          mLayerTitleCacheSupplier = layerTitleCacheSupplier;
          mTabStripTreeProvider = new TabStripSceneLayer(context);
-@@ -387,6 +399,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
+@@ -382,6 +394,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
                  mModelSelectorButton, multiInstanceManager, toolbarContainerView);
          mIncognitoHelper = new StripLayoutHelper(context, managerHost, updateHost, renderHost, true,
                  mModelSelectorButton, multiInstanceManager, toolbarContainerView);
@@ -982,7 +981,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
  
          if (tabModelStartupInfoSupplier != null) {
              if (tabModelStartupInfoSupplier.hasValue()) {
-@@ -480,9 +494,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
+@@ -475,9 +489,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
          int hoveredTabId = getActiveStripLayoutHelper().getLastHoveredTab() == null
                  ? TabModel.INVALID_TAB_INDEX
                  : getActiveStripLayoutHelper().getLastHoveredTab().getId();
@@ -997,7 +996,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
          return mTabStripTreeProvider;
      }
  
-@@ -527,7 +545,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
+@@ -522,7 +540,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
          mIncognitoHelper.onSizeChanged(
                  mWidth, mHeight, orientationChanged, LayoutManagerImpl.time());
  
@@ -1044,7 +1043,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scen
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
-@@ -23,6 +23,9 @@ import org.chromium.components.browser_ui.styles.SemanticColorUtils;
+@@ -22,6 +22,9 @@ import org.chromium.components.browser_ui.styles.SemanticColorUtils;
  import org.chromium.ui.resources.ResourceManager;
  import org.chromium.ui.util.ColorUtils;
  
@@ -1054,7 +1053,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scen
  /**
   * A SceneLayer to render a tab stack.
   * TODO(changwan): change layouts to share one instance of this.
-@@ -81,6 +84,12 @@ public class TabListSceneLayer extends SceneLayer {
+@@ -80,6 +83,12 @@ public class TabListSceneLayer extends SceneLayer {
  
          TabListSceneLayerJni.get().beginBuildingFrame(mNativePtr, TabListSceneLayer.this);
  
@@ -1067,7 +1066,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scen
          // TODO(crbug.com/1070281): Use Supplier to get viewport and forward it to native, then
          // updateLayer can become obsolete.
          TabListSceneLayerJni.get().updateLayer(mNativePtr, TabListSceneLayer.this, tabListBgColor,
-@@ -110,6 +119,11 @@ public class TabListSceneLayer extends SceneLayer {
+@@ -109,6 +118,11 @@ public class TabListSceneLayer extends SceneLayer {
              boolean useIncognitoColors = t.isIncognito();
              int defaultThemeColor = ChromeColors.getDefaultThemeColor(context, useIncognitoColors);
  
@@ -1240,7 +1239,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
-@@ -106,6 +106,8 @@ import org.chromium.content_public.browser.NavigationController;
+@@ -108,6 +108,8 @@ import org.chromium.content_public.browser.NavigationController;
  import org.chromium.content_public.browser.NavigationEntry;
  import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.base.WindowAndroid;
@@ -1249,7 +1248,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
  
  import java.util.List;
  
-@@ -580,10 +582,15 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
+@@ -587,10 +589,15 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
          // + topControlsDistanceToRest| will give the margin for the current animation frame.
          final int topControlsDistanceToRest = mBrowserControlsStateProvider.getContentOffset()
                  - mBrowserControlsStateProvider.getTopControlsHeight();
@@ -1267,7 +1266,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
  
          if (topMargin != layoutParams.topMargin || bottomMargin != layoutParams.bottomMargin) {
              layoutParams.topMargin = topMargin;
-@@ -603,7 +610,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
+@@ -610,7 +617,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
       *         strip.
       */
      private int getToolbarExtraYOffset() {
@@ -1384,7 +1383,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -323,6 +323,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -324,6 +324,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
          if (fragment instanceof INeedSnackbarManager) {
              ((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager);
          }
@@ -1450,7 +1449,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -184,6 +184,9 @@ import org.chromium.url.GURL;
+@@ -187,6 +187,9 @@ import org.chromium.url.GURL;
  
  import java.util.List;
  
@@ -1460,7 +1459,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
  /**
   * Contains logic for managing the toolbar visual component.  This class manages the interactions
   * with the rest of the application to ensure the toolbar is always visually up to date.
-@@ -661,7 +664,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -702,7 +705,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
                              mIncognitoStateProvider.isIncognitoSelected()));
              // clang-format off
              LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator(
@@ -1469,7 +1468,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
                      PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel,
                      mActionModeController.getActionModeCallback(),
                      new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider,
-@@ -929,11 +932,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -970,11 +973,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
                  // the height won't be measured by the background image.
                  if (mControlContainer.getBackground() == null) {
                      setControlContainerTopMargin(getToolbarExtraYOffset());
@@ -1483,7 +1482,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
                              mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener);
                              mLayoutChangeListener = null;
                          }
-@@ -1354,13 +1359,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1397,13 +1402,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
          return ((LocationBarCoordinator) mLocationBar).getUrlBarTextWithoutAutocomplete();
      }
  
@@ -1511,7 +1510,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
                  mIncognitoStateProvider, mScrimCoordinator, mOmniboxFocusStateSupplier,
                  mBottomSheetController, mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier,
                  mTabModelSelector, mTabContentManager, mCompositorViewHolder,
-@@ -1368,8 +1385,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1411,8 +1428,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
                  mLayoutStateProviderSupplier, mSnackbarManager);
          var bottomControlsCoordinator = new BottomControlsCoordinator(mActivity, mWindowAndroid,
                  mLayoutManager, mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
@@ -1523,7 +1522,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
          mBottomControlsCoordinatorSupplier.set(bottomControlsCoordinator);
          bottomControlsCoordinator.getHandleBackPressChangedSupplier().addObserver(
                  (x) -> { onBackPressStateChanged(); });
-@@ -2188,6 +2206,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -2252,6 +2270,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
      private void setControlContainerTopMargin(int margin) {
          final ViewGroup.MarginLayoutParams layoutParams =
                  ((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
@@ -1596,8 +1595,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
 +
  import org.chromium.base.CallbackController;
  import org.chromium.base.supplier.ObservableSupplier;
- import org.chromium.chrome.R;
-@@ -432,6 +436,12 @@ public class StatusBarColorController
+ import org.chromium.base.supplier.OneshotSupplier;
+@@ -497,6 +501,12 @@ public class StatusBarColorController
          boolean needsDarkStatusBarIcons = !ColorUtils.shouldUseLightForegroundOnBackground(color);
          UiUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons);
          UiUtils.setStatusBarColor(window, color);
@@ -1613,7 +1612,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -8072,6 +8072,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8130,6 +8130,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)},
  
@@ -1712,7 +1711,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1989,6 +1989,10 @@ const char kImprovedKeyboardShortcutsDescription[] =
+@@ -2006,6 +2006,10 @@ const char kImprovedKeyboardShortcutsDescription[] =
      "Ensure keyboard shortcuts work consistently with international keyboard "
      "layouts and deprecate legacy shortcuts.";
  
@@ -1726,7 +1725,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1123,6 +1123,9 @@ extern const char kImprovedIncognitoScreenshotDescription[];
+@@ -1134,6 +1134,9 @@ extern const char kImprovedIncognitoScreenshotDescription[];
  extern const char kImprovedKeyboardShortcutsName[];
  extern const char kImprovedKeyboardShortcutsDescription[];
  
@@ -1736,38 +1735,6 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
  extern const char kIncognitoReauthenticationForAndroidName[];
  extern const char kIncognitoReauthenticationForAndroidDescription[];
  
-diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/browser/flags/android/cached_feature_flags.cc
---- a/chrome/browser/flags/android/cached_feature_flags.cc
-+++ b/chrome/browser/flags/android/cached_feature_flags.cc
-@@ -13,6 +13,7 @@
- #include "components/prefs/pref_service.h"
- #include "content/public/browser/network_service_util.h"
- #include "content/public/common/content_features.h"
-+#include "components/flags_ui/pref_service_flags_storage.h"
- 
- using base::android::ConvertJavaStringToUTF8;
- using base::android::ConvertUTF8ToJavaString;
-@@ -52,3 +53,20 @@ static ScopedJavaLocalRef<jstring> JNI_CachedFeatureFlags_GetAdBlockFiltersURL(J
- static void JNI_CachedFeatureFlags_SetAdBlockFiltersURL(JNIEnv* env, const JavaParamRef<jstring>& url) {
-   g_browser_process->local_state()->SetString(prefs::kAdBlockFiltersURL, base::android::ConvertJavaStringToUTF8(env, url));
- }
-+
-+static void JNI_CachedFeatureFlags_SetEnabled(JNIEnv* env, const JavaParamRef<jstring>& featureName, jboolean isEnabled) {
-+  flags_ui::PrefServiceFlagsStorage flags_storage(
-+      g_browser_process->local_state());
-+  std::set<std::string> entries = flags_storage.GetFlags();
-+
-+  auto internal_name = base::android::ConvertJavaStringToUTF8(env, featureName);
-+  entries.erase(internal_name);
-+  entries.erase(internal_name + "@1"); // enabled
-+  entries.erase(internal_name + "@2"); // disabled
-+
-+  if (isEnabled)
-+    entries.insert(internal_name + "@1");
-+
-+  flags_storage.SetFlags(entries);
-+  flags_storage.CommitPendingWrites();
-+}
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -1779,30 +1746,19 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
  #include "base/no_destructor.h"
  #include "chrome/browser/browser_features.h"
  #include "chrome/browser/feature_guide/notifications/feature_notification_guide_service.h"
-@@ -252,6 +253,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kInstantStart,
+@@ -262,6 +263,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kLensCameraAssistedSearch,
      &kLensOnQuickActionSearchWidget,
+     &kNewTabSearchEngineUrlAndroid,
 +    &features::kMoveTopToolbarToBottom,
      &kNotificationPermissionVariant,
      &kNotificationPermissionBottomSheet,
      &kOfflineIndicatorV2,
-@@ -870,8 +872,8 @@ BASE_FEATURE(kOmniboxCacheSuggestionResources,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kOmniboxConsumesImeInsets,
--             "OmniboxConsumesImeInsets",
--             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "OmniboxConsumesImeInsets",         // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT); // by default
- 
- BASE_FEATURE(kOmniboxNoopEditUrlSuggestionClicks,
-              "OmniboxNoopEditUrlSuggestionClicks",
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -142,6 +142,23 @@ public class CachedFeatureFlags {
-                 CachedFeatureFlagsJni.get().isNetworkServiceWarmUpEnabled());
+@@ -188,6 +188,23 @@ public class CachedFeatureFlags {
+         return value;
      }
  
 +    /**
@@ -1822,21 +1778,21 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 +        cachedFlag.setValueReturnedOverride(newValue);
 +    }
 +
-     /**
-      * @return whether warming up network service is enabled.
-      */
-@@ -326,6 +343,7 @@ public class CachedFeatureFlags {
+     @AnyThread
+     static double getConsistentDoubleValue(String preferenceName, double defaultValue) {
+         CachedFlagsSafeMode.getInstance().onFlagChecked();
+@@ -235,6 +252,7 @@ public class CachedFeatureFlags {
  
      @NativeMethods
      interface Natives {
 +        void setEnabled(String featureName, boolean newValue);
-         boolean isNetworkServiceWarmUpEnabled();
          void setAdBlockFiltersURL(String url);
          String getAdBlockFiltersURL();
+     }
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFlag.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFlag.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFlag.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFlag.java
-@@ -114,6 +114,12 @@ public class CachedFlag extends Flag {
+@@ -117,6 +117,12 @@ public class CachedFlag extends Flag {
          }
      }
  
@@ -1852,16 +1808,16 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -315,6 +315,8 @@ public abstract class ChromeFeatureList {
-             "MessagesForAndroidPermissionUpdate";
+@@ -327,6 +327,8 @@ public abstract class ChromeFeatureList {
      public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
      public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid";
+     public static final String NEW_TAB_SEARCH_ENGINE_URL_ANDROID = "NewTabSearchEngineUrlAndroid";
 +    public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
 +            "MoveTopToolbarToBottom";
      public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
      public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
              "NotificationPermissionBottomSheet";
-@@ -574,6 +576,8 @@ public abstract class ChromeFeatureList {
+@@ -590,6 +592,8 @@ public abstract class ChromeFeatureList {
              new CachedFlag(PRIVACY_GUIDE_POST_MVP, false);
      public static final CachedFlag sOmniboxMatchToolbarAndStatusBarColor =
              new CachedFlag(OMNIBOX_MATCH_TOOLBAR_AND_STATUS_BAR_COLOR, false);
@@ -1869,19 +1825,19 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 +            new CachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
      public static final CachedFlag sOmniboxModernizeVisualUpdate =
              new CachedFlag(OMNIBOX_MODERNIZE_VISUAL_UPDATE, false);
-     public static final CachedFlag sOmniboxMostVisitedTilesAddRecycledViewPool =
-@@ -670,6 +674,7 @@ public abstract class ChromeFeatureList {
-         sInstantStart,
-         sInterestFeedV2,
+     public static final CachedFlag sOptimizationGuidePushNotifications =
+@@ -678,6 +682,7 @@ public abstract class ChromeFeatureList {
+         sPrivacyGuideAndroid3,
+         sPrivacyGuidePreloadAndroid,
          sPrivacyGuidePostMVP,
 +        sMoveTopToolbarToBottom,
          sOmniboxMatchToolbarAndStatusBarColor,
          sOmniboxModernizeVisualUpdate,
-         sOmniboxMostVisitedTilesAddRecycledViewPool,
+         sOptimizationGuidePushNotifications,
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -2037,7 +2037,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1936,7 +1936,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
  
  #if BUILDFLAG(IS_ANDROID)
    registry->RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault,
@@ -2004,16 +1960,16 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      private LocationBarMediator mLocationBarMediator;
      private View mUrlBar;
      private View mDeleteButton;
-@@ -145,7 +146,7 @@ public class LocationBarCoordinator
-      * @param reportExceptionCallback A {@link Callback} to report exceptions.
+@@ -146,7 +147,7 @@ public class LocationBarCoordinator
       * @param backPressManager The {@link BackPressManager} for intercepting back press.
+      * @param tabModelSelectorSupplier Supplier of the {@link TabModelSelector}.
       */
 -    public LocationBarCoordinator(View locationBarLayout, View autocompleteAnchorView,
 +    public LocationBarCoordinator(View locationBarLayout, View autocompleteAnchorView, View containerView,
              ObservableSupplier<Profile> profileObservableSupplier,
              PrivacyPreferencesManager privacyPreferencesManager,
              LocationBarDataProvider locationBarDataProvider, ActionMode.Callback actionModeCallback,
-@@ -177,11 +178,12 @@ public class LocationBarCoordinator
+@@ -179,11 +180,12 @@ public class LocationBarCoordinator
          mActivityLifecycleDispatcher = activityLifecycleDispatcher;
          mActivityLifecycleDispatcher.register(this);
          mAutocompleteAnchorView = autocompleteAnchorView;
@@ -2071,7 +2027,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
-@@ -26,6 +26,9 @@ import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
+@@ -25,6 +25,9 @@ import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  
@@ -2081,11 +2037,10 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  /**
   * Coordinates the interactions with the UrlBar text component.
   */
-@@ -235,7 +238,13 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc
+@@ -234,6 +237,13 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc
          // to show or hide keyboard anyway. This may happen when we schedule keyboard hide, and
          // receive a second request to hide the keyboard instantly.
          if (showKeyboard) {
--            setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN, /* delay */ false);
 +            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
 +                // probably due to an android bug, fix the size rather than pan the view.
 +                // with the pan the bar may not always follow the focus if not at the first input by the user
@@ -2153,7 +2108,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
-@@ -60,6 +60,9 @@ import org.chromium.ui.modelutil.PropertyModel;
+@@ -63,6 +63,9 @@ import org.chromium.ui.modelutil.PropertyModel;
  import org.chromium.ui.mojom.WindowOpenDisposition;
  import org.chromium.url.GURL;
  
@@ -2163,7 +2118,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.List;
-@@ -987,7 +990,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
+@@ -1022,7 +1025,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
      @Override
      public void onSuggestionDropdownScroll() {
          mSuggestionsListScrolled = true;
@@ -2186,7 +2141,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import org.chromium.chrome.browser.omnibox.OmniboxFeatures;
  import org.chromium.chrome.browser.omnibox.R;
  import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider;
-@@ -126,6 +128,7 @@ class DropdownItemViewInfoListManager {
+@@ -121,6 +123,7 @@ class DropdownItemViewInfoListManager {
                  OmniboxFeatures.shouldShowModernizeVisualUpdate(mContext);
          boolean previousItemWasHeader = false;
  
@@ -2194,7 +2149,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
          for (int i = 0; i < mSourceViewInfoList.size(); i++) {
              final DropdownItemViewInfo item = mSourceViewInfoList.get(i);
              final PropertyModel model = item.model;
-@@ -147,18 +150,22 @@ class DropdownItemViewInfoListManager {
+@@ -140,18 +143,22 @@ class DropdownItemViewInfoListManager {
                  }
                  var bottomMargin = applyRounding ? groupBottomMargin : suggestionVerticalMargin;
  
@@ -2224,17 +2179,17 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
-@@ -41,6 +41,9 @@ import org.chromium.ui.base.ViewUtils;
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
+@@ -35,6 +35,9 @@ import org.chromium.chrome.browser.util.KeyNavigationUtil;
+ import org.chromium.components.browser_ui.styles.ChromeColors;
+ import org.chromium.ui.base.ViewUtils;
  
 +import org.chromium.chrome.browser.flags.ChromeFeatureList;
 +import org.chromium.chrome.browser.flags.CachedFeatureFlags;
 +
  /** A widget for showing a list of omnibox suggestions. */
  public class OmniboxSuggestionsDropdown extends RecyclerView {
-     private static final long DEFERRED_INITIAL_SHRINKING_LAYOUT_FROM_IME_DURATION_MS = 300;
-@@ -210,7 +213,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+     /**
+@@ -188,7 +191,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
       * Constructs a new list designed for containing omnibox suggestions.
       * @param context Context used for contained views.
       */
@@ -2244,7 +2199,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
          super(context, null, android.R.attr.dropDownListViewStyle);
          setFocusable(true);
          setFocusableInTouchMode(true);
-@@ -221,13 +225,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+@@ -199,13 +203,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
          setItemAnimator(null);
  
          mLayoutScrollListener = new SuggestionLayoutScrollListener(context);
@@ -2271,25 +2226,24 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
          ViewCompat.setPaddingRelative(this, 0, 0, 0, paddingBottom);
  
          mStandardBgColor = shouldShowModernizeVisualUpdate
-@@ -365,11 +381,15 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+@@ -340,8 +356,15 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
          try (TraceEvent tracing = TraceEvent.scoped("OmniboxSuggestionsList.Measure");
                  TimingMetric metric = OmniboxMetrics.recordSuggestionListMeasureTime()) {
              OmniboxAlignment omniboxAlignment = mEmbedder.getCurrentAlignment();
 -            maybeUpdateLayoutParams(omniboxAlignment.top);
--            boolean useAlignmentSpecifiedHeight = OmniboxFeatures.omniboxConsumesImeInsets();
+-            int availableViewportHeight = omniboxAlignment.height;
 +            int top = omniboxAlignment.top;
 +            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
 +                top = 0;
 +            }
 +            maybeUpdateLayoutParams(top);
 +            boolean useAlignmentSpecifiedHeight = false;
-             int availableViewportHeight = useAlignmentSpecifiedHeight
-                     ? omniboxAlignment.height
--                    : calculateAvailableViewportHeight() - omniboxAlignment.top;
++            int availableViewportHeight = useAlignmentSpecifiedHeight
++                    ? omniboxAlignment.height
 +                    : calculateAvailableViewportHeight() - top;
              int desiredWidth = omniboxAlignment.width;
              adjustHorizontalPosition();
-             // Suppress the initial requests to shrink the viewport of the omnibox suggestion
+             notifyObserversIfViewportHeightChanged(availableViewportHeight);
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdownEmbedder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdownEmbedder.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdownEmbedder.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdownEmbedder.java
@@ -2319,7 +2273,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1743,6 +1743,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1771,6 +1771,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">
          Force Tablet Mode
        </message>
@@ -2671,7 +2625,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -50,4 +50,8 @@ found in the LICENSE file.
+@@ -45,4 +45,8 @@ found in the LICENSE file.
          android:key="captions"
          android:title="@string/accessibility_captions_title"/>
  
@@ -2683,7 +2637,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -35,6 +35,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+@@ -38,6 +38,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
  
      private BooleanPreferenceDelegate mForceTabletUIDelegate;
      static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
@@ -2691,15 +2645,15 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
      private TextScalePreference mTextScalePref;
      private PageZoomPreference mPageZoomDefaultZoomPref;
      private ChromeSwitchPreference mPageZoomAlwaysShowPref;
-@@ -44,6 +45,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+@@ -46,6 +47,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+     private AccessibilitySettingsDelegate mDelegate;
      private BooleanPreferenceDelegate mReaderForAccessibilityDelegate;
-     private BooleanPreferenceDelegate mAccessibilityTabSwitcherDelegate;
      private double mPageZoomLatestDefaultZoomPrefValue;
 +    private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
  
      private FontSizePrefs mFontSizePrefs;
      private FontSizePrefsObserver mFontSizePrefsObserver = new FontSizePrefsObserver() {
-@@ -63,6 +65,10 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+@@ -65,6 +67,10 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
          mFontSizePrefs = FontSizePrefs.getInstance(delegate.getBrowserContextHandle());
      }
  
@@ -2710,9 +2664,9 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
      @Override
      public void onActivityCreated(Bundle savedInstanceState) {
          super.onActivityCreated(savedInstanceState);
-@@ -130,6 +136,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-             getPreferenceScreen().removePreference(accessibilityTabSwitcherPref);
-         }
+@@ -132,6 +138,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+         forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled());
+         forceTabletUiPref.setOnPreferenceChangeListener(this);
  
 +        ChromeSwitchPreference mMoveToolbarToBottomPref =
 +                (ChromeSwitchPreference) findPreference(PREF_MOVE_TOOLBAR_TO_BOTTOM);
@@ -2723,7 +2677,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
          Preference captions = findPreference(PREF_CAPTIONS);
          captions.setOnPreferenceClickListener(preference -> {
              Intent intent = new Intent(Settings.ACTION_CAPTIONING_SETTINGS);
-@@ -189,7 +201,11 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+@@ -191,7 +203,11 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
                      mDelegate.getBrowserContextHandle(), (Integer) newValue);
          } else if (PREF_PAGE_ZOOM_ALWAYS_SHOW.equals(preference.getKey())) {
              PageZoomUtils.setShouldAlwaysShowZoomMenuItem((Boolean) newValue);
diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch
index 23e92b38..bde8751e 100644
--- a/build/patches/Multiple-fingerprinting-mitigations.patch
+++ b/build/patches/Multiple-fingerprinting-mitigations.patch
@@ -42,9 +42,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../renderer/core/html/canvas/text_metrics.h  |   2 +
  .../renderer/core/svg/svg_graphics_element.cc |   2 +
  .../core/svg/svg_text_content_element.cc      |  28 +++-
- .../canvas2d/base_rendering_context_2d.cc     |   5 +
- .../canvas2d/canvas_rendering_context_2d.cc   |   8 +-
- .../offscreen_canvas_rendering_context_2d.cc  |   9 +-
+ .../canvas2d/base_rendering_context_2d.cc     |  12 +-
  third_party/blink/renderer/platform/BUILD.gn  |   5 +-
  .../platform/exported/web_runtime_features.cc |  12 ++
  .../platform/graphics/image_data_buffer.cc    |   7 +
@@ -54,7 +52,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  third_party/ungoogled/BUILD.gn                |  10 ++
  third_party/ungoogled/ungoogled_switches.cc   |  18 ++
  third_party/ungoogled/ungoogled_switches.h    |  18 ++
- 28 files changed, 386 insertions(+), 9 deletions(-)
+ 26 files changed, 377 insertions(+), 8 deletions(-)
  create mode 100644 third_party/ungoogled/BUILD.gn
  create mode 100644 third_party/ungoogled/ungoogled_switches.cc
  create mode 100644 third_party/ungoogled/ungoogled_switches.h
@@ -62,7 +60,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2446,6 +2446,7 @@ static_library("browser") {
+@@ -2471,6 +2471,7 @@ static_library("browser") {
      "//services/device/public/cpp:device_features",
      "//services/device/public/cpp/geolocation",
      "//services/device/public/cpp/usb",
@@ -73,7 +71,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -222,6 +222,8 @@
+@@ -225,6 +225,8 @@
  #include "ui/ui_features.h"
  #include "url/url_features.h"
  
@@ -82,7 +80,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  #include "base/allocator/buildflags.h"
  #endif
-@@ -3908,6 +3910,20 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3896,6 +3898,20 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWebrtcUseMinMaxVEADimensionsName,
       flag_descriptions::kWebrtcUseMinMaxVEADimensionsDescription, kOsAll,
       FEATURE_VALUE_TYPE(blink::features::kWebRtcUseMinMaxVEADimensions)},
@@ -106,7 +104,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -249,6 +249,7 @@ source_set("browser") {
+@@ -250,6 +250,7 @@ source_set("browser") {
      "//third_party/libyuv",
      "//third_party/re2",
      "//third_party/sqlite",
@@ -125,7 +123,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
  #if BUILDFLAG(IS_ANDROID)
  #include "base/android/child_process_binding_types.h"
  #include "content/browser/android/java_interfaces_impl.h"
-@@ -3558,6 +3559,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3304,6 +3305,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
      switches::kDisableBreakpad,
      switches::kDisableDatabases,
      switches::kDisableFileSystem,
@@ -158,10 +156,10 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
  #if BUILDFLAG(IS_ANDROID)
  #include "base/android/build_info.h"
  #endif
-@@ -556,6 +558,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
-   if (!command_line.HasSwitch(switches::kDisableYUVImageDecoding) &&
-       base::FeatureList::IsEnabled(
-           blink::features::kDecodeLossyWebPImagesToYUV)) {
+@@ -559,6 +561,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+   if (command_line.HasSwitch(switches::kDisableV8IdleTasks)) {
+     WebRuntimeFeatures::EnableV8IdleTasks(false);
+   } else {
 +  WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(
 +      !command_line.HasSwitch(switches::kFingerprintingClientRectsNoise));
 +  WebRuntimeFeatures::EnableFingerprintingCanvasMeasureTextNoise(
@@ -169,7 +167,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 +  WebRuntimeFeatures::EnableFingerprintingCanvasImageDataNoise(
 +      !command_line.HasSwitch(switches::kFingerprintingCanvasImageDataNoise));
 +
-     WebRuntimeFeatures::EnableDecodeLossyWebPImagesToYUV(true);
+     WebRuntimeFeatures::EnableV8IdleTasks(true);
    }
  
 diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
@@ -196,7 +194,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  #include "base/notreached.h"
  #include "base/ranges/algorithm.h"
  #include "base/task/single_thread_task_runner.h"
-@@ -843,6 +844,17 @@ Document::Document(const DocumentInit& initializer,
+@@ -845,6 +846,17 @@ Document::Document(const DocumentInit& initializer,
                : nullptr),
        data_(MakeGarbageCollected<DocumentData>(GetExecutionContext())) {
    DCHECK(agent_);
@@ -214,7 +212,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
    if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution))
      script_runner_delayer_->Activate();
  
-@@ -2296,6 +2308,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {
+@@ -2299,6 +2311,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {
  #endif
  }
  
@@ -232,7 +230,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -531,6 +531,10 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -532,6 +532,10 @@ class CORE_EXPORT Document : public ContainerNode,
      has_xml_declaration_ = has_xml_declaration ? 1 : 0;
    }
  
@@ -243,7 +241,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
    AtomicString visibilityState() const;
    bool IsPageVisible() const;
    bool hidden() const;
-@@ -2419,6 +2423,9 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -2416,6 +2420,9 @@ class CORE_EXPORT Document : public ContainerNode,
  
    base::ElapsedTimer start_time_;
  
@@ -256,7 +254,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
 diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -2119,6 +2119,7 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
+@@ -2120,6 +2120,7 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
        quads.push_back(element_layout_object->LocalToAbsoluteQuad(
            gfx::QuadF(element_layout_object->ObjectBoundingBox())));
      }
@@ -264,7 +262,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
      return;
    }
  
-@@ -2127,6 +2128,10 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
+@@ -2128,6 +2129,10 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
        element_layout_object->IsBR()) {
      element_layout_object->AbsoluteQuads(quads);
    }
@@ -275,7 +273,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
  }
  
  DOMRectList* Element::getClientRects() {
-@@ -2169,6 +2174,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const {
+@@ -2170,6 +2175,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const {
    DCHECK(element_layout_object);
    GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
                                                     *element_layout_object);
@@ -325,7 +323,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creat
  #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
  #include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h"
  #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
-@@ -206,6 +207,10 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(
+@@ -208,6 +209,10 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(
                             std::min(info.height(), max_dimension));
          src_data_.reset(info, src_data_.addr(), src_data_.rowBytes());
        }
@@ -339,7 +337,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creat
 diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
 +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
-@@ -55,6 +55,24 @@ TextMetrics::TextMetrics(const Font& font,
+@@ -68,6 +68,24 @@ TextMetrics::TextMetrics(const Font& font,
    Update(font, direction, baseline, align, text);
  }
  
@@ -367,7 +365,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third
 diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h
 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
 +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
-@@ -64,6 +64,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
+@@ -66,6 +66,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
  
    void Trace(Visitor*) const override;
  
@@ -470,7 +468,7 @@ diff --git a/third_party/blink/renderer/core/svg/svg_text_content_element.cc b/t
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-@@ -41,6 +41,7 @@
+@@ -44,6 +44,7 @@
  #include "third_party/blink/renderer/platform/graphics/bitmap_image.h"
  #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h"
  #include "third_party/blink/renderer/platform/graphics/graphics_context.h"
@@ -478,7 +476,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
  #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
  #include "third_party/blink/renderer/platform/graphics/stroke_data.h"
  #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h"
-@@ -2185,6 +2186,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
+@@ -2188,6 +2189,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
            snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
        DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
      }
@@ -489,18 +487,14 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
    }
  
    return image_data;
-diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
---- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -924,9 +924,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
-   TextDirection direction =
-       ToTextDirection(GetState().GetDirection(), canvas());
+@@ -2865,9 +2870,14 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
+ 
+   TextDirection direction = ToTextDirection(GetState().GetDirection(), canvas);
  
 -  return MakeGarbageCollected<TextMetrics>(font, direction,
-+  TextMetrics* text_metrics = MakeGarbageCollected<TextMetrics>(font, direction,
++  auto* text_metrics = MakeGarbageCollected<TextMetrics>(font, direction,
                                             GetState().GetTextBaseline(),
                                             GetState().GetTextAlign(), text);
-+
 +  // Scale text metrics if enabled
 +  if (RuntimeEnabledFeatures::FingerprintingCanvasMeasureTextNoiseEnabled()) {
 +    text_metrics->Shuffle(canvas()->GetDocument().GetNoiseFactorX());
@@ -508,39 +502,11 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
 +  return text_metrics;
  }
  
- void CanvasRenderingContext2D::drawFormattedText(
-diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc
---- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc
-+++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc
-@@ -5,6 +5,7 @@
- #include "third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.h"
- 
- #include "base/metrics/histogram_functions.h"
-+#include "base/rand_util.h"
- #include "base/trace_event/trace_event.h"
- #include "third_party/blink/public/common/features.h"
- #include "third_party/blink/renderer/bindings/modules/v8/v8_canvas_font_stretch.h"
-@@ -725,9 +726,15 @@ TextMetrics* OffscreenCanvasRenderingContext2D::measureText(
- 
-   TextDirection direction = ToTextDirection(GetState().GetDirection());
- 
--  return MakeGarbageCollected<TextMetrics>(font, direction,
-+  TextMetrics* text_metrics = MakeGarbageCollected<TextMetrics>(font, direction,
-                                            GetState().GetTextBaseline(),
-                                            GetState().GetTextAlign(), text);
-+  // Scale text metrics if enabled
-+  if (RuntimeEnabledFeatures::FingerprintingCanvasMeasureTextNoiseEnabled()) {
-+    float v = 1.0 + (base::RandDouble() - 0.5) * 0.0003;
-+    text_metrics->Shuffle(v);
-+  }
-+  return text_metrics;
- }
- 
- const Font& OffscreenCanvasRenderingContext2D::AccessFont() {
+ void BaseRenderingContext2D::SnapshotStateForFilter() {
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1643,7 +1643,9 @@ component("platform") {
+@@ -1650,7 +1650,9 @@ component("platform") {
      "//third_party/blink/renderer:non_test_config",
    ]
  
@@ -551,7 +517,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
  
    allow_circular_includes_from = [
      "//third_party/blink/renderer/platform/blob",
-@@ -1714,6 +1716,7 @@ component("platform") {
+@@ -1722,6 +1724,7 @@ component("platform") {
      "//third_party/blink/public/strings",
      "//third_party/blink/renderer/platform/wtf",
      "//third_party/ced",
@@ -795,7 +761,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2935,6 +2935,15 @@
+@@ -3062,6 +3062,15 @@
        status: {"Android": "", "default": "stable"},
        base_feature: "none",
      },
diff --git a/build/patches/Override-Navigator-Language.patch b/build/patches/Override-Navigator-Language.patch
index 0225400f..0b2b9c00 100644
--- a/build/patches/Override-Navigator-Language.patch
+++ b/build/patches/Override-Navigator-Language.patch
@@ -52,7 +52,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -69,6 +69,7 @@
+@@ -68,6 +68,7 @@
  #include "cc/base/switches.h"
  #include "components/discardable_memory/public/mojom/discardable_shared_memory_manager.mojom.h"
  #include "components/discardable_memory/service/discardable_shared_memory_manager.h"
@@ -60,7 +60,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
  #include "components/metrics/single_sample_metrics.h"
  #include "components/services/storage/privileged/mojom/indexed_db_control.mojom.h"
  #include "components/services/storage/public/cpp/buckets/bucket_id.h"
-@@ -3473,8 +3474,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+@@ -3220,8 +3221,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
    PropagateBrowserCommandLineToRenderer(browser_command_line, command_line);
  
    // Pass on the browser locale.
diff --git a/build/patches/Restore-classic-new-tab-page.patch b/build/patches/Restore-classic-new-tab-page.patch
index f410a453..0f0143a5 100644
--- a/build/patches/Restore-classic-new-tab-page.patch
+++ b/build/patches/Restore-classic-new-tab-page.patch
@@ -4,8 +4,8 @@ Subject: Restore classic new tab page
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/search/search.cc | 58 +--------------------------------
- 1 file changed, 1 insertion(+), 57 deletions(-)
+ chrome/browser/search/search.cc | 51 +--------------------------------
+ 1 file changed, 1 insertion(+), 50 deletions(-)
 
 diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
 --- a/chrome/browser/search/search.cc
@@ -27,7 +27,7 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
  bool IsMatchingServiceWorker(const GURL& my_url, const GURL& document_url) {
    // The origin should match.
    if (!MatchesOrigin(my_url, document_url))
-@@ -138,33 +128,6 @@ bool IsNTPOrRelatedURLHelper(const GURL& url, Profile* profile) {
+@@ -138,25 +128,6 @@ bool IsNTPOrRelatedURLHelper(const GURL& url, Profile* profile) {
                                      IsMatchingServiceWorker(url, new_tab_url));
  }
  
@@ -49,24 +49,18 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
 -#endif
 -  return true;
 -}
--
--bool ShouldShowLocalNewTab(Profile* profile) {
--#if !BUILDFLAG(IS_ANDROID)
--  return DefaultSearchProviderIsGoogle(profile);
--#else
--  return false;
--#endif
--}
 -
  // Used to look up the URL to use for the New Tab page. Also tracks how we
  // arrived at that URL so it can be logged with UMA.
  struct NewTabURLDetails {
-@@ -187,26 +150,7 @@ struct NewTabURLDetails {
+@@ -178,28 +149,8 @@ struct NewTabURLDetails {
+     const GURL local_url(default_is_google
+                              ? chrome::kChromeUINewTabPageURL
                               : chrome::kChromeUINewTabPageThirdPartyURL);
- #endif
- 
--    if (ShouldShowLocalNewTab(profile))
+-    if (default_is_google) {
 -      return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
+-    }
+ #endif
 -
 -    const TemplateURL* template_url =
 -        GetDefaultSearchProviderTemplateURL(profile);