Patches for v108

build/LASTCHANGE

@@ -1 +1 @@
-34c0c91996e05f4711a8b9c030853b7237535f7e-
+87354513bf5c5822069e914fff225062ab2732a0-

build/RELEASE

@@ -1 +1 @@
-107.0.5304.114
+108.0.5359.56

build/RELEASE_COMMIT

@@ -1 +1 @@
-a58397de73b02d076fa5f4685540e7274c1eb8e5
+606bbd3dda16a2c38c4b0af033fda42a3fe6e8d6

build/bromite_patches_list.txt

@@ -23,7 +23,6 @@ Site-setting-for-images.patch
 Content-settings-infrastructure.patch
 Add-webGL-site-setting.patch
 Add-webRTC-site-settings.patch
-AV1-codec-support.patch
 Switch-to-fstack-protector-strong.patch
 Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
 Bromite-package-name.patch

build/chromium.gn_args

@@ -43,5 +43,6 @@ use_errorprone_java_compiler=false
 use_gnome_keyring=false
 use_official_google_api_keys=false
 use_rtti=false
+use_stable_package_name_for_trichrome=false
 use_sysroot=false
 webview_includes_weblayer=false

build/chromium_patches_list.txt

@@ -1,4 +1,3 @@
-AV1-codec-support.patch
 exit-on-failure-of-inclusion.patch
 Reintroduce-override_build_timestamp.patch
 do-not-hide-.orig-files.patch

build/patches/AV1-codec-support.patch

@@ -32,19 +32,19 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
      }
      configs += [ ":libaom_config" ]
  
-@@ -259,6 +259,8 @@ static_library("libaom") {
+@@ -257,6 +257,8 @@ static_library("libaom") {
    if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
        cpu_arch_full == "arm-neon-cpu-detect") {
      deps += [ ":libaom_intrinsics_neon" ]
 +    # will detect CPU
 +    sources += aom_ports_arm_sources
    }
-   if (is_android) {
+   if (current_cpu == "arm64" || current_cpu == "arm") {
-     deps += [ "//third_party/android_ndk:cpu_features" ]
+     # This is needed by all arm boards due to aom_arm_cpu_caps()
 diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni
 --- a/third_party/libaom/libaom_srcs.gni
 +++ b/third_party/libaom/libaom_srcs.gni
-@@ -673,6 +673,11 @@ aom_rc_interface_sources = [
+@@ -635,6 +635,11 @@ aom_rc_interface_sources = [
    "//third_party/libaom/source/libaom/test/yuv_video_source.h",
  ]
  

build/patches/Chromium-package-name.patch

@@ -8,15 +8,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+index 0f031a2868e67..b6ea9b4fe4e1e 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -46,7 +46,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
+@@ -51,7 +51,7 @@ chrome_jni_registration_header =
-   assert(current_toolchain != android_secondary_abi_toolchain)
+ chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h"
- }
  
+ if (current_toolchain == default_toolchain) {
 -  _default_package = "org.chromium.chrome"
 +  _default_package = "org.bromite.chromium"
- if (android_channel != "default" && android_channel != "stable") {
+   if (use_stable_package_name_for_trichrome) {
-   # android-binary-size trybot may checks if an internal Chrome variant's
+     _default_package += ".stable"
-   # AndroidManifest is as expected by ensuring the differences between its
+   } else if (android_channel != "default" && android_channel != "stable") {
+-- 
+2.30.2
 

build/patches/Disable-feeds-support-by-default.patch

@@ -6,13 +6,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../org/chromium/chrome/browser/feed/FeedFeatures.java    | 8 +-------
  .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +-
- components/feed/feed_feature_list.cc                      | 4 ++--
+ components/feed/feed_feature_list.cc                      | 8 ++++----
- 3 files changed, 4 insertions(+), 10 deletions(-)
+ 3 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
+index 7b10e5b24a8ba..ab4dd1ccfbff1 100644
 --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
 +++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
-@@ -42,13 +42,7 @@ public final class FeedFeatures {
+@@ -50,13 +50,7 @@ public final class FeedFeatures {
       *         the user is signed in and confirms it's not a child profile.
       */
      public static boolean isWebFeedUIEnabled() {
@@ -26,8 +27,9 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe
 +        return false;
      }
  
-     /**
+     public static boolean shouldUseWebFeedAwarenessIPH() {
 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
+index a4efd60024847..35b3ca107081d 100644
 --- 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
 @@ -78,7 +78,7 @@ public class CachedFeatureFlags {
@@ -40,22 +42,28 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
                      .put(ChromeFeatureList.NEW_WINDOW_APP_MENU, true)
                      .put(ChromeFeatureList.OMAHA_MIN_SDK_VERSION_ANDROID, false)
 diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
+index 198b24c5c9b5d..8e8e69154fd4f 100644
 --- a/components/feed/feed_feature_list.cc
 +++ b/components/feed/feed_feature_list.cc
-@@ -16,12 +16,12 @@
+@@ -17,14 +17,14 @@
  namespace feed {
  
- const base::Feature kInterestFeedContentSuggestions{
+ BASE_FEATURE(kInterestFeedContentSuggestions,
--    "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
+-             "InterestFeedContentSuggestions",
-+    "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "InterestFeedContentSuggestions",          // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);        // by default in Bromite
  // InterestFeedV2 takes precedence over InterestFeedContentSuggestions.
  // InterestFeedV2 is cached in ChromeCachedFlags. If the default value here is
  // changed, please update the cached one's default value in CachedFeatureFlags.
- const base::Feature kInterestFeedV2{"InterestFeedV2",
+ BASE_FEATURE(kInterestFeedV2,
--                                    base::FEATURE_ENABLED_BY_DEFAULT};
+-             "InterestFeedV2",
-+                                    base::FEATURE_DISABLED_BY_DEFAULT};
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "InterestFeedV2",                          // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);        // by default in Bromite
  
- const base::Feature kInterestFeedV2Autoplay{"InterestFeedV2Autoplay",
+ BASE_FEATURE(kInterestFeedV2Autoplay,
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
+              "InterestFeedV2Autoplay",
 -- 
-2.25.1
+2.30.2
+

build/patches/Do-not-link-with-libatomic.patch

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1559,7 +1559,7 @@ mixed_component("base") {
+@@ -1561,7 +1561,7 @@ mixed_component("base") {
    # more robust check for this.
    if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
        host_toolchain != "//build/toolchain/cros:host") {

build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

@@ -45,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -333,6 +333,10 @@ config("compiler") {
+@@ -330,6 +330,10 @@ config("compiler") {
        }
      }
  

build/patches/Reintroduce-override_build_timestamp.patch

@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -4000,8 +4000,13 @@ action("build_date") {
+@@ -4020,8 +4020,13 @@ action("build_date") {
  
    args = [
      rebase_path("$target_gen_dir/generated_build_date.h", root_build_dir),

build/patches/Remove-EV-certificates.patch

@@ -9,19 +9,19 @@ Instead, let them appear just like regular ones.
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- net/cert/ev_root_ca_metadata.cc | 20 +++++++++++++++++++-
+ net/cert/ev_root_ca_metadata.cc | 19 ++++++++++++++++++-
  net/cert/ev_root_ca_metadata.h  |  4 +---
- 2 files changed, 20 insertions(+), 4 deletions(-)
+ 2 files changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
+index 343c648374cf1..bbfbdbf30a1dc 100644
 --- a/net/cert/ev_root_ca_metadata.cc
 +++ b/net/cert/ev_root_ca_metadata.cc
-@@ -41,7 +41,20 @@ struct EVMetadata {
+@@ -40,7 +40,19 @@ struct EVMetadata {
    const base::StringPiece policy_oids[kMaxOIDsPerCA];
  };
  
--#include "net/data/ssl/ev_roots/chrome-ev-root-store-inc.cc"
+-#include "net/data/ssl/chrome_root_store/chrome-ev-roots-inc.cc"
-+
 +static const EVMetadata kEvRootCaMetadata[] = {
 +    // need some dummy data to make compiler happy, because
 +    // arraysize() is implemented as a convoluted template rather than
@@ -38,7 +38,7 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
  
  #endif  // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
  }  // namespace
-@@ -230,6 +243,11 @@ bool EVRootCAMetadata::RemoveEVCA(const SHA256HashValue& fingerprint) {
+@@ -225,6 +237,11 @@ bool EVRootCAMetadata::RemoveEVCA(const SHA256HashValue& fingerprint) {
  // metadata.
  //
  
@@ -51,6 +51,7 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
    LOG(WARNING) << "Not implemented";
    return false;
 diff --git a/net/cert/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h
+index c568c640f4a42..e8e0c6c9335bb 100644
 --- a/net/cert/ev_root_ca_metadata.h
 +++ b/net/cert/ev_root_ca_metadata.h
 @@ -20,7 +20,7 @@
@@ -76,4 +77,5 @@ diff --git a/net/cert/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h
    // AddEVCA adds an EV CA to the list of known EV CAs with the given policy.
    // |policy| is expressed as a string of dotted numbers. It returns true on
 -- 
-2.25.1
+2.30.2
+

build/patches/Remove-SMS-integration.patch

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
 --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
 +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
-@@ -118,48 +118,6 @@ public class AppLocaleUtils {
+@@ -117,48 +117,6 @@ public class AppLocaleUtils {
          return Locale.forLanguageTag("en-US");
      }
  

build/patches/Remove-contextual-search-manager.patch

@@ -31,17 +31,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../privacy/settings/PrivacySettings.java     |  9 --
  .../chrome/browser/tab/TabHelpers.java        |  2 -
  .../tabbed_mode/TabbedRootUiCoordinator.java  |  5 +-
- .../chrome/browser/ui/RootUiCoordinator.java  | 37 +-------
+ .../chrome/browser/ui/RootUiCoordinator.java  | 39 +-------
  chrome/browser/BUILD.gn                       | 17 ----
  chrome/browser/about_flags.cc                 | 49 -----------
- .../flags/android/chrome_feature_list.cc      | 36 --------
+ .../flags/android/chrome_feature_list.cc      | 42 ---------
  .../flags/android/chrome_feature_list.h       |  8 --
  ...nfiguration_policy_handler_list_factory.cc |  6 +-
  .../strings/android_chrome_strings.grd        | 59 -------------
  content/browser/browser_interface_binders.cc  |  1 -
  third_party/blink/public/mojom/BUILD.gn       |  2 +-
  third_party/blink/public/public_features.gni  |  2 +-
- 37 files changed, 17 insertions(+), 641 deletions(-)
+ 37 files changed, 17 insertions(+), 649 deletions(-)
  delete mode 100644 chrome/android/java/res/layout/contextual_search_caption_view.xml
  delete mode 100644 chrome/android/java/res/layout/contextual_search_card_icon_view.xml
  delete mode 100644 chrome/android/java/res/layout/contextual_search_context_view.xml
@@ -53,9 +53,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  delete mode 100644 chrome/android/java/res/xml/contextual_search_preferences.xml
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+index caf13898e1a57..069f92e5a06f0 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -695,7 +695,6 @@ android_library("chrome_java") {
+@@ -722,7 +722,6 @@ if (current_toolchain == default_toolchain) {
        "//chrome/browser/ui:duplicate_download_enums_java",
        "//components/browsing_data/core:browsing_data_utils_java",
        "//components/browsing_data/core:clear_browsing_data_tab_java",
@@ -63,7 +64,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
        "//components/dom_distiller/core:distiller_type_java",
        "//components/ntp_tiles:ntp_tiles_enums_java",
        "//components/offline_pages/core:offline_page_model_enums_java",
-@@ -4097,16 +4096,12 @@ generate_jni("chrome_jni_headers") {
+@@ -3979,16 +3978,12 @@ generate_jni("chrome_jni_headers") {
      "java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java",
      "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java",
      "java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java",
@@ -81,6 +82,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java",
      "java/src/org/chromium/chrome/browser/customtabs/CustomTabsOpenTimeRecorder.java",
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
+index 3d20247cf7fb4..9342c1ece02ff 100644
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
 @@ -487,14 +487,6 @@ chrome_java_resources = [
@@ -98,7 +100,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
    "java/res/layout/custom_tabs_bottombar.xml",
    "java/res/layout/custom_tabs_bottombar_item.xml",
    "java/res/layout/custom_tabs_control_container.xml",
-@@ -654,7 +646,6 @@ chrome_java_resources = [
+@@ -652,7 +644,6 @@ chrome_java_resources = [
    "java/res/xml/autofill_assistant_preferences.xml",
    "java/res/xml/bookmark_widget_info.xml",
    "java/res/xml/clear_browsing_data_preferences_tab.xml",
@@ -107,9 +109,10 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
    "java/res/xml/do_not_track_preferences.xml",
    "java/res/xml/google_services_preferences.xml",
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
+index 1073445881dc4..64dcc64e65d27 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -301,21 +301,6 @@ chrome_java_sources = [
+@@ -305,21 +305,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManager.java",
    "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelRepaddingTextView.java",
    "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelTextViewInflater.java",
@@ -131,15 +134,15 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java",
    "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java",
    "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java",
-@@ -355,7 +340,6 @@ chrome_java_sources = [
+@@ -360,7 +345,6 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripStacker.java",
    "java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabLoadTracker.java",
    "java/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java",
+   "java/src/org/chromium/chrome/browser/compositor/resources/SystemResourcePreloads.java",
 -  "java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java",
    "java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java",
    "java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java",
    "java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java",
-@@ -381,34 +365,6 @@ chrome_java_sources = [
+@@ -386,34 +370,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUi.java",
    "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUtils.java",
    "java/src/org/chromium/chrome/browser/contextmenu/LensChipDelegate.java",
@@ -175,6 +178,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/org/chromium/chrome/browser/crash/ChromeMinidumpUploaderDelegate.java",
    "java/src/org/chromium/chrome/browser/crash/ChromePureJavaExceptionReporter.java",
 diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java
+index bb936bdbc91c5..bb5ada13aff99 100644
 --- a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java
 +++ b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java
 @@ -34,7 +34,6 @@ import org.chromium.base.supplier.Supplier;
@@ -202,6 +206,7 @@ diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/ch
  
 diff --git a/chrome/android/java/res/layout/contextual_search_caption_view.xml b/chrome/android/java/res/layout/contextual_search_caption_view.xml
 deleted file mode 100644
+index b33c2696b396a..0000000000000
 --- a/chrome/android/java/res/layout/contextual_search_caption_view.xml
 +++ /dev/null
 @@ -1,16 +0,0 @@
@@ -224,6 +229,7 @@ deleted file mode 100644
 \ No newline at end of file
 diff --git a/chrome/android/java/res/layout/contextual_search_card_icon_view.xml b/chrome/android/java/res/layout/contextual_search_card_icon_view.xml
 deleted file mode 100644
+index 82ba6ef6b8f3f..0000000000000
 --- a/chrome/android/java/res/layout/contextual_search_card_icon_view.xml
 +++ /dev/null
 @@ -1,14 +0,0 @@
@@ -243,6 +249,7 @@ deleted file mode 100644
 -    android:scaleType="center"/>
 diff --git a/chrome/android/java/res/layout/contextual_search_context_view.xml b/chrome/android/java/res/layout/contextual_search_context_view.xml
 deleted file mode 100644
+index d7bb3ca56f794..0000000000000
 --- a/chrome/android/java/res/layout/contextual_search_context_view.xml
 +++ /dev/null
 @@ -1,27 +0,0 @@
@@ -275,6 +282,7 @@ deleted file mode 100644
 -</LinearLayout>
 diff --git a/chrome/android/java/res/layout/contextual_search_promo_view.xml b/chrome/android/java/res/layout/contextual_search_promo_view.xml
 deleted file mode 100644
+index fd078a8431b8a..0000000000000
 --- a/chrome/android/java/res/layout/contextual_search_promo_view.xml
 +++ /dev/null
 @@ -1,88 +0,0 @@
@@ -369,6 +377,7 @@ deleted file mode 100644
 \ No newline at end of file
 diff --git a/chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml b/chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml
 deleted file mode 100644
+index 8784710ca1b09..0000000000000
 --- a/chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml
 +++ /dev/null
 @@ -1,14 +0,0 @@
@@ -389,6 +398,7 @@ deleted file mode 100644
 \ No newline at end of file
 diff --git a/chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml b/chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml
 deleted file mode 100644
+index e52e3cceda30a..0000000000000
 --- a/chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml
 +++ /dev/null
 @@ -1,18 +0,0 @@
@@ -412,6 +422,7 @@ deleted file mode 100644
 -</org.chromium.chrome.browser.compositor.bottombar.contextualsearch.NoSystemGestureFrameLayout>
 diff --git a/chrome/android/java/res/layout/contextual_search_related_searches_view.xml b/chrome/android/java/res/layout/contextual_search_related_searches_view.xml
 deleted file mode 100644
+index ff38d4f550c6c..0000000000000
 --- a/chrome/android/java/res/layout/contextual_search_related_searches_view.xml
 +++ /dev/null
 @@ -1,23 +0,0 @@
@@ -440,6 +451,7 @@ deleted file mode 100644
 -</FrameLayout>
 diff --git a/chrome/android/java/res/layout/contextual_search_term_view.xml b/chrome/android/java/res/layout/contextual_search_term_view.xml
 deleted file mode 100644
+index 262cfc5780079..0000000000000
 --- a/chrome/android/java/res/layout/contextual_search_term_view.xml
 +++ /dev/null
 @@ -1,21 +0,0 @@
@@ -466,6 +478,7 @@ deleted file mode 100644
 -</FrameLayout>
 diff --git a/chrome/android/java/res/xml/contextual_search_preferences.xml b/chrome/android/java/res/xml/contextual_search_preferences.xml
 deleted file mode 100644
+index 0e3c569a285d9..0000000000000
 --- a/chrome/android/java/res/xml/contextual_search_preferences.xml
 +++ /dev/null
 @@ -1,27 +0,0 @@
@@ -497,6 +510,7 @@ deleted file mode 100644
 -
 -</PreferenceScreen>
 diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
+index 4f5970e4764ae..f0782bc7e0ea3 100644
 --- a/chrome/android/java/res/xml/google_services_preferences.xml
 +++ b/chrome/android/java/res/xml/google_services_preferences.xml
 @@ -48,8 +48,4 @@ found in the LICENSE file.
@@ -509,6 +523,7 @@ diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrom
 -        android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"/>
  </PreferenceScreen>
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+index 0b92306fd0bf3..1c682a61eec88 100644
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
 @@ -56,10 +56,6 @@ found in the LICENSE file.
@@ -523,18 +538,19 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
      <Preference
          android:key="phone_as_a_security_key"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+index 7065cabc95040..41d208a1c2853 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1723,7 +1723,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1728,7 +1728,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          return new TabbedRootUiCoordinator(this, this::onOmniboxFocusChanged,
                  getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier,
-                 mBookmarkBridgeSupplier, mTabBookmarkerSupplier,
+                 mBookmarkModelSupplier, mTabBookmarkerSupplier,
 -                getContextualSearchManagerSupplier(), getTabModelSelectorSupplier(),
 +                null, getTabModelSelectorSupplier(),
                  mStartSurfaceSupplier, mTabSwitcherSupplier, mIntentMetadataOneshotSupplier,
                  mLayoutStateProviderSupplier, mStartSurfaceParentTabSupplier,
                  getBrowserControlsManager(), getWindowAndroid(), mJankTracker,
-@@ -2788,7 +2788,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2799,7 +2799,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          // TODO(crbug.com/1157310): Transition this::method refs to dedicated suppliers.
          mTabModalHandler = new TabModalLifetimeHandler(this, getLifecycleDispatcher(), manager,
                  this::getAppBrowserControlsVisibilityDelegate, this::getTabObscuringHandler,
@@ -544,6 +560,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
                  this::getFullscreenManager, mBackPressManager);
          return manager;
 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
+index badcf03e1e8f6..ebaf5e67c2b0b 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 @@ -93,9 +93,6 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
@@ -556,7 +573,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
  import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
-@@ -258,7 +255,7 @@ import java.util.function.Consumer;
+@@ -259,7 +256,7 @@ import java.util.function.Consumer;
   */
  public abstract class ChromeActivity<C extends ChromeActivityComponent>
          extends AsyncInitializationActivity
@@ -565,7 +582,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
                     SnackbarManageable, SceneChangeObserver,
                     StatusBarColorController.StatusBarColorProvider, AppMenuDelegate, AppMenuBlocker,
                     MenuOrKeyboardActionController, CompositorViewHolder.Initializer,
-@@ -322,8 +319,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -323,8 +320,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              new ObservableSupplierImpl<>();
      protected final UnownedUserDataSupplier<InsetObserverView> mInsetObserverViewSupplier =
              new InsetObserverViewSupplier();
@@ -574,18 +591,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  
      private SnackbarManager mSnackbarManager;
  
-@@ -513,7 +508,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -514,7 +509,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          // clang-format off
          return new RootUiCoordinator(this, null, getShareDelegateSupplier(),
-                 getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkBridgeSupplier,
+                 getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkModelSupplier,
 -                mTabBookmarkerSupplier, getContextualSearchManagerSupplier(),
 +                mTabBookmarkerSupplier, null,
                  getTabModelSelectorSupplier(), new OneshotSupplierImpl<>(),
                  new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(),
                  new OneshotSupplierImpl<>(), () -> null, mBrowserControlsManagerSupplier.get(),
-@@ -953,14 +948,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -949,14 +944,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          mCompositorViewHolderSupplier.get().onNativeLibraryReady(
-                 getWindowAndroid(), getTabContentManager());
+                 getWindowAndroid(), getTabContentManager(), getPrefService());
  
 -        // TODO(1107916): Move contextual search initialization to the RootUiCoordinator.
 -        if (ContextualSearchFieldTrial.isEnabled()) {
@@ -598,7 +615,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
          TraceEvent.end("ChromeActivity:CompositorInitialization");
      }
  
-@@ -1447,11 +1434,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1443,11 +1430,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      @SuppressLint("NewApi")
      @Override
      protected final void onDestroy() {
@@ -610,7 +627,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
          if (mSnackbarManager != null) {
              SnackbarManagerProvider.detach(mSnackbarManager);
          }
-@@ -1948,13 +1930,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1944,13 +1926,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          return mCompositorViewHolderSupplier.get();
      }
  
@@ -624,7 +641,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
      /**
       * Exits the fullscreen mode, if any. Does nothing if no fullscreen is present.
       * @return Whether the fullscreen mode is currently showing.
-@@ -2003,15 +1978,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1996,15 +1971,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          }
  
          mActivityTabProvider.setLayoutStateProvider(layoutManager);
@@ -640,7 +657,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
      }
  
      /**
-@@ -2271,18 +2237,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2273,18 +2239,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          return webContents != null ? SelectionPopupController.fromWebContents(webContents) : null;
      }
  
@@ -660,6 +677,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
      private void openChromeManagementPage() {
          Tab currentTab = getActivityTab();
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
+index 8bf6789fdb3a6..448b9de602b81 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
 @@ -19,7 +19,6 @@ import org.chromium.base.annotations.NativeMethods;
@@ -671,6 +689,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bott
  import org.chromium.chrome.browser.incognito.IncognitoUtils;
  import org.chromium.chrome.browser.profiles.Profile;
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
+index 8d2314e507f37..b19a9630816bb 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
 @@ -26,7 +26,6 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider
@@ -692,21 +711,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
  
          for (int i = 0; i < overlayOrder.length; i++) mOverlayOrderMap.put(overlayOrder[i], i);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
+index 5b13cee42d7bc..b0a4b23e1887d 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
 @@ -154,7 +154,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab
          mBaseCustomTabRootUiCoordinator = new BaseCustomTabRootUiCoordinator(this,
                  getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier,
-                 mBookmarkBridgeSupplier, mTabBookmarkerSupplier,
+                 mBookmarkModelSupplier, mTabBookmarkerSupplier,
 -                getContextualSearchManagerSupplier(), getTabModelSelectorSupplier(),
 +                null, getTabModelSelectorSupplier(),
                  getBrowserControlsManager(), getWindowAndroid(), getLifecycleDispatcher(),
                  getLayoutManagerSupplier(),
                  /* menuOrKeyboardActionController= */ this, this::getActivityThemeColor,
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
+index 698e9d5ccf24d..e013fe9df6e6c 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
-@@ -29,7 +29,6 @@ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
+@@ -33,7 +33,6 @@ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
  import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
  import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
@@ -714,33 +735,33 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base
  import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigationController;
  import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabController;
  import org.chromium.chrome.browser.customtabs.features.branding.BrandingController;
-@@ -87,7 +86,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
+@@ -93,7 +92,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
       * @param profileSupplier Supplier of the currently applicable profile.
-      * @param bookmarkBridgeSupplier Supplier of the bookmark bridge for the current profile.
+      * @param bookmarkModelSupplier Supplier of the bookmark bridge for the current profile.
       * @param tabBookmarkerSupplier Supplier of {@link TabBookmarker} for bookmarking a given tab.
 -     * @param contextualSearchManagerSupplier Supplier of the {@link ContextualSearchManager}.
       * @param tabModelSelectorSupplier Supplies the {@link TabModelSelector}.
       * @param browserControlsManager Manages the browser controls.
       * @param windowAndroid The current {@link WindowAndroid}.
-@@ -121,7 +119,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
+@@ -127,7 +125,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
              @NonNull ObservableSupplier<Profile> profileSupplier,
-             @NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
+             @NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier,
              @NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
 -            @NonNull Supplier<ContextualSearchManager> contextualSearchManagerSupplier,
 +            Object ignored,
              @NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
              @NonNull BrowserControlsManager browserControlsManager,
              @NonNull ActivityWindowAndroid windowAndroid,
-@@ -152,7 +150,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
+@@ -158,7 +156,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
          // clang-format off
          super(activity, null, shareDelegateSupplier, tabProvider,
-                 profileSupplier, bookmarkBridgeSupplier, tabBookmarkerSupplier,
+                 profileSupplier, bookmarkModelSupplier, tabBookmarkerSupplier,
 -                contextualSearchManagerSupplier, tabModelSelectorSupplier,
 +                null, tabModelSelectorSupplier,
                  new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(),
                  new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), () -> null,
                  browserControlsManager, windowAndroid, new DummyJankTracker(),
-@@ -202,16 +200,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
+@@ -208,16 +206,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
                      ((PartialCustomTabHeightStrategy) mCustomTabHeightStrategy)::onShowSoftInput;
              mTabController.get().registerTabObserver(
                      new PartialCustomTabTabObserver(softInputCallback));
@@ -758,9 +779,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base
      }
  
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+index fb7c722eccddb..c19d0790d659c 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-@@ -188,12 +188,6 @@ public class CustomTabActivity extends BaseCustomTabActivity {
+@@ -189,12 +189,6 @@ public class CustomTabActivity extends BaseCustomTabActivity {
                  mIntentDataProvider.getSession(), webContents);
      }
  
@@ -774,6 +796,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
      public String getPackageName() {
          if (mShouldOverridePackage && mIntentDataProvider instanceof CustomTabIntentDataProvider) {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
+index 05d2a4880121b..6089cb8c18292 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
 @@ -20,7 +20,6 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider
@@ -824,6 +847,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr
              WebContents webContents = mActiveTab.getWebContents();
              if (webContents != null) {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java
+index 79e423f6b8b0a..c6cc189bcb28a 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java
 @@ -11,7 +11,6 @@ import org.chromium.base.supplier.ObservableSupplierImpl;
@@ -869,6 +893,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Tab
                  tabModelSelector);
          assert mAppVisibilityDelegateSupplier.hasValue();
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+index 7514c2ddf0546..0126e9aeab342 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 @@ -41,7 +41,6 @@ import org.chromium.ui.text.SpanApplier;
@@ -903,17 +928,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
                  (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
          canMakePaymentPref.setOnPreferenceChangeListener(this);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java
+index af220c335d595..f72eccf4dbd6b 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java
-@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.tab;
+@@ -8,7 +8,6 @@ import org.chromium.chrome.browser.SwipeRefreshHandler;
- import org.chromium.chrome.browser.SwipeRefreshHandler;
+ import org.chromium.chrome.browser.accessibility.AccessibilityTabHelper;
  import org.chromium.chrome.browser.autofill_assistant.AutofillAssistantTabHelper;
  import org.chromium.chrome.browser.complex_tasks.TaskTabHelper;
 -import org.chromium.chrome.browser.contextualsearch.ContextualSearchTabHelper;
  import org.chromium.chrome.browser.crypto.CipherFactory;
  import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;
  import org.chromium.chrome.browser.dom_distiller.TabDistillabilityProvider;
-@@ -32,7 +31,6 @@ public final class TabHelpers {
+@@ -33,7 +32,6 @@ public final class TabHelpers {
          TabUma.createForTab(tab);
          TabDistillabilityProvider.createForTab(tab);
          InterceptNavigationDelegateTabHelper.createForTab(tab);
@@ -922,6 +948,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.
          TaskTabHelper.createForTab(tab, parentTab);
          TabBrowserControlsConstraintsHelper.createForTab(tab);
 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
+index e1007ef45ae29..7e6ed2639332d 100644
 --- 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
 @@ -38,7 +38,6 @@ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -934,7 +961,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
  import org.chromium.chrome.browser.feed.webfeed.WebFeedFollowIntroController;
 @@ -255,7 +254,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
              @NonNull ObservableSupplier<Profile> profileSupplier,
-             @NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
+             @NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier,
              @NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
 -            @NonNull Supplier<ContextualSearchManager> contextualSearchManagerSupplier,
 +            Object ignored,
@@ -944,24 +971,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 @@ -290,7 +289,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
              boolean initializeUiWithIncognitoColors, @NonNull BackPressManager backPressManager) {
          super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider,
-                 profileSupplier, bookmarkBridgeSupplier, tabBookmarkerSupplier,
+                 profileSupplier, bookmarkModelSupplier, tabBookmarkerSupplier,
 -                contextualSearchManagerSupplier, tabModelSelectorSupplier, startSurfaceSupplier,
 +                null, tabModelSelectorSupplier, startSurfaceSupplier,
                  tabSwitcherSupplier, intentMetadataOneshotSupplier,
                  layoutStateProviderOneshotSupplier, startSurfaceParentTabSupplier,
                  browserControlsManager, windowAndroid, jankTracker, activityLifecycleDispatcher,
 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
+index 25f274e339bea..f8336b232a870 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -54,7 +54,6 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
+@@ -55,7 +55,6 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
  import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
  import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
 -import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
  import org.chromium.chrome.browser.crash.ChromePureJavaExceptionReporter;
  import org.chromium.chrome.browser.directactions.DirectActionInitializer;
- import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
+ import org.chromium.chrome.browser.dom_distiller.ReaderModeToolbarButtonController;
-@@ -97,7 +96,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+@@ -99,7 +98,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -969,7 +997,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  import org.chromium.chrome.browser.share.ShareButtonController;
  import org.chromium.chrome.browser.share.ShareDelegate;
-@@ -244,7 +242,6 @@ public class RootUiCoordinator
+@@ -246,7 +244,6 @@ public class RootUiCoordinator
      private List<ButtonDataProvider> mButtonDataProviders;
      @Nullable
      private AdaptiveToolbarButtonController mAdaptiveToolbarButtonController;
@@ -977,7 +1005,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
      private IdentityDiscController mIdentityDiscController;
      private ChromeActionModeHandler mChromeActionModeHandler;
      private final ToolbarActionModeCallback mActionModeControllerCallback;
-@@ -257,7 +254,6 @@ public class RootUiCoordinator
+@@ -259,7 +256,6 @@ public class RootUiCoordinator
      private final ObservableSupplier<TabBookmarker> mTabBookmarkerSupplier;
      private final OneshotSupplierImpl<AppMenuCoordinator> mAppMenuSupplier;
      private BottomSheetObserver mBottomSheetObserver;
@@ -985,24 +1013,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
      protected final CallbackController mCallbackController;
      protected final BrowserControlsManager mBrowserControlsManager;
      private BrowserControlsStateProvider.Observer mBrowserControlsObserver;
-@@ -362,7 +358,7 @@ public class RootUiCoordinator
+@@ -364,7 +360,7 @@ public class RootUiCoordinator
              @NonNull ObservableSupplier<Profile> profileSupplier,
-             @NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
+             @NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier,
              @NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
 -            @NonNull Supplier<ContextualSearchManager> contextualSearchManagerSupplier,
 +            Object ignored,
              @NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
              @NonNull OneshotSupplier<StartSurface> startSurfaceSupplier,
              @NonNull OneshotSupplier<TabSwitcher> tabSwitcherSupplier,
-@@ -455,7 +451,6 @@ public class RootUiCoordinator
+@@ -457,7 +453,6 @@ public class RootUiCoordinator
-         mBookmarkBridgeSupplier = bookmarkBridgeSupplier;
+         mBookmarkModelSupplier = bookmarkModelSupplier;
          mTabBookmarkerSupplier = tabBookmarkerSupplier;
          mAppMenuSupplier = new OneshotSupplierImpl<>();
 -        mContextualSearchManagerSupplier = contextualSearchManagerSupplier;
          mActionModeControllerCallback = new ToolbarActionModeCallback();
  
          mTabModelSelectorSupplier = tabModelSelectorSupplier;
-@@ -559,11 +554,6 @@ public class RootUiCoordinator
+@@ -561,11 +556,6 @@ public class RootUiCoordinator
              mToolbarManager = null;
          }
  
@@ -1014,7 +1042,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
          if (mAdaptiveToolbarButtonController != null) {
              mAdaptiveToolbarButtonController.destroy();
              mAdaptiveToolbarButtonController = null;
-@@ -1004,15 +994,6 @@ public class RootUiCoordinator
+@@ -1006,15 +996,6 @@ public class RootUiCoordinator
  
      @Override
      public boolean canShowAppMenu() {
@@ -1030,17 +1058,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
          // Do not show the menu if we are in find in page view.
          if (mFindToolbarManager != null && mFindToolbarManager.isShowing()
                  && !DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {
-@@ -1157,9 +1138,6 @@ public class RootUiCoordinator
+@@ -1169,11 +1150,6 @@ public class RootUiCoordinator
-                     AdaptiveToolbarButtonVariant.VOICE, voiceToolbarButtonController);
-             adaptiveToolbarButtonController.addButtonVariant(
                      AdaptiveToolbarButtonVariant.PRICE_TRACKING, priceTrackingButtonController);
+             adaptiveToolbarButtonController.addButtonVariant(
+                     AdaptiveToolbarButtonVariant.READER_MODE, readerModeToolbarButtonController);
 -            mContextualPageActionController = new ContextualPageActionController(mProfileSupplier,
--                    mActivityTabProvider, mActivityLifecycleDispatcher, mActivity.getResources(),
+-                    mActivityTabProvider, adaptiveToolbarButtonController,
--                    adaptiveToolbarButtonController);
+-                    ()
+-                            -> ShoppingServiceFactory.getForProfile(mProfileSupplier.get()),
+-                    mBookmarkModelSupplier);
              mButtonDataProviders =
                      Arrays.asList(mIdentityDiscController, adaptiveToolbarButtonController);
  
-@@ -1229,10 +1207,6 @@ public class RootUiCoordinator
+@@ -1243,10 +1219,6 @@ public class RootUiCoordinator
              public void onStartedShowing(int layoutType, boolean showToolbar) {
                  if (layoutType != LayoutType.BROWSING
                          && layoutType != LayoutType.SIMPLE_ANIMATION) {
@@ -1051,7 +1081,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
                  }
  
                  if (layoutType == LayoutType.TAB_SWITCHER) {
-@@ -1370,10 +1344,6 @@ public class RootUiCoordinator
+@@ -1386,10 +1358,6 @@ public class RootUiCoordinator
       * cross-feature interaction, e.g. hide other features when this feature is shown.
       */
      protected void onFindToolbarShown() {
@@ -1062,7 +1092,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
      }
  
      /**
-@@ -1517,9 +1487,6 @@ public class RootUiCoordinator
+@@ -1547,9 +1515,6 @@ public class RootUiCoordinator
                      case SheetState.FULL:
                          if (!mOpened) {
                              mOpened = true;
@@ -1072,7 +1102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
                          }
  
                          // On visible bottom sheet, hide page zoom dialog
-@@ -1527,8 +1494,6 @@ public class RootUiCoordinator
+@@ -1557,8 +1522,6 @@ public class RootUiCoordinator
                          break;
                      case SheetState.HIDDEN:
                          mOpened = false;
@@ -1082,9 +1112,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
                  }
              }
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+index bd5c999c857e0..1b5e3ef259f9f 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2078,7 +2078,6 @@ static_library("browser") {
+@@ -2090,7 +2090,6 @@ static_library("browser") {
      "//components/content_settings/common:mojom",
      "//components/content_settings/core/browser",
      "//components/content_settings/core/common",
@@ -1092,7 +1123,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "//components/cookie_config",
      "//components/country_codes",
      "//components/crash/core/browser",
-@@ -2549,8 +2548,6 @@ static_library("browser") {
+@@ -2565,8 +2564,6 @@ static_library("browser") {
        "android/compositor/decoration_title.h",
        "android/compositor/layer/content_layer.cc",
        "android/compositor/layer/content_layer.h",
@@ -1101,7 +1132,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "android/compositor/layer/layer.h",
        "android/compositor/layer/overlay_panel_layer.cc",
        "android/compositor/layer/overlay_panel_layer.h",
-@@ -2571,8 +2568,6 @@ static_library("browser") {
+@@ -2587,8 +2584,6 @@ static_library("browser") {
        "android/compositor/resources/resource_factory.cc",
        "android/compositor/resources/toolbar_resource.cc",
        "android/compositor/resources/toolbar_resource.h",
@@ -1110,7 +1141,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "android/compositor/scene_layer/overscroll_scene_layer.cc",
        "android/compositor/scene_layer/overscroll_scene_layer.h",
        "android/compositor/scene_layer/scrolling_bottom_view_scene_layer.cc",
-@@ -2595,16 +2590,6 @@ static_library("browser") {
+@@ -2611,16 +2606,6 @@ static_library("browser") {
        "android/content/content_utils.cc",
        "android/context_menu/context_menu_native_delegate_impl.cc",
        "android/context_menu/context_menu_native_delegate_impl.h",
@@ -1127,7 +1158,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "android/cookies/cookies_fetcher_util.cc",
        "android/customtabs/chrome_origin_verifier.cc",
        "android/customtabs/chrome_origin_verifier.h",
-@@ -3217,8 +3202,6 @@ static_library("browser") {
+@@ -3230,8 +3215,6 @@ static_library("browser") {
        "safe_browsing/android/safe_browsing_referring_app_bridge_android.h",
        "safe_browsing/android/safe_browsing_settings_launcher_android.cc",
        "safe_browsing/android/safe_browsing_settings_launcher_android.h",
@@ -1137,9 +1168,10 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "search_engines/ui_thread_search_terms_data_android.cc",
        "search_engines/ui_thread_search_terms_data_android.h",
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+index eec961dafc738..54fd9f0905ae8 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1893,27 +1893,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesAlternateUxVariations[] = {
+@@ -1961,27 +1961,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesAlternateUxVariations[] = {
       std::size(kRelatedSearchesAlternateUxShowDefaultChipWith120SpEllipsis),
       nullptr},
  };
@@ -1167,10 +1199,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #endif  // BUILDFLAG(IS_ANDROID)
  
  const FeatureEntry::FeatureParam kResamplingInputEventsLSQEnabled[] = {
-@@ -3585,34 +3564,6 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3686,34 +3665,6 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kEnableOskResizesVisualViewportName,
+      flag_descriptions::kEnableOskResizesVisualViewportByDefaultDescription,
-      flag_descriptions::kEnableOskResizesVisualViewportDescription, kOsAndroid,
+      kOsAndroid,
-      FEATURE_VALUE_TYPE(chrome::android::kOSKResizesVisualViewport)},
+      FEATURE_VALUE_TYPE(blink::features::kOSKResizesVisualViewportByDefault)},
 -    {"contextual-search-debug", flag_descriptions::kContextualSearchDebugName,
 -     flag_descriptions::kContextualSearchDebugDescription, kOsAndroid,
 -     FEATURE_VALUE_TYPE(kContextualSearchDebug)},
@@ -1203,6 +1235,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
       flag_descriptions::kExploreSitesDescription, kOsAndroid,
       FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kExploreSites,
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
+index 1f50f1a7d0224..91ae132125e7c 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
 @@ -35,7 +35,6 @@
@@ -1216,7 +1249,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 @@ -223,15 +222,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kContextMenuSearchAndShopWithGoogleLens,
      &kContextMenuTranslateWithGoogleLens,
-     &kContextMenuPopupStyle,
+     &kContextMenuPopupForAllScreenSizes,
 -    &kContextualSearchDebug,
 -    &kContextualSearchDelayedIntelligence,
 -    &kContextualSearchDisableOnlineDetection,
@@ -1229,61 +1262,69 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kDirectActions,
      &kDisableCompositedProgressBar,
      &kDownloadFileProvider,
-@@ -645,32 +635,6 @@ const base::Feature kLensCameraAssistedSearch{"LensCameraAssistedSearch",
+@@ -709,38 +699,6 @@ BASE_FEATURE(kLensOnQuickActionSearchWidget,
- const base::Feature kLensOnQuickActionSearchWidget{
+              "LensOnQuickActionSearchWidget",
-     "LensOnQuickActionSearchWidget", base::FEATURE_ENABLED_BY_DEFAULT};
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
--const base::Feature kContextualSearchDelayedIntelligence{
+-BASE_FEATURE(kContextualSearchDelayedIntelligence,
--    "ContextualSearchDelayedIntelligence", base::FEATURE_DISABLED_BY_DEFAULT};
+-             "ContextualSearchDelayedIntelligence",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
 -
--const base::Feature kContextualSearchDisableOnlineDetection{
+-BASE_FEATURE(kContextualSearchDisableOnlineDetection,
 -             "ContextualSearchDisableOnlineDetection",
--    base::FEATURE_DISABLED_BY_DEFAULT};
+-             base::FEATURE_DISABLED_BY_DEFAULT);
 -
--const base::Feature kContextualSearchForceCaption{
+-BASE_FEATURE(kContextualSearchForceCaption,
--    "ContextualSearchForceCaption", base::FEATURE_DISABLED_BY_DEFAULT};
+-             "ContextualSearchForceCaption",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
 -
--const base::Feature kContextualSearchSuppressShortView{
+-BASE_FEATURE(kContextualSearchSuppressShortView,
--    "ContextualSearchSuppressShortView", base::FEATURE_DISABLED_BY_DEFAULT};
+-             "ContextualSearchSuppressShortView",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
 -
--const base::Feature kContextualSearchThinWebViewImplementation{
+-BASE_FEATURE(kContextualSearchThinWebViewImplementation,
 -             "ContextualSearchThinWebViewImplementation",
--    base::FEATURE_DISABLED_BY_DEFAULT};
+-             base::FEATURE_DISABLED_BY_DEFAULT);
 -
--const base::Feature kContextualTriggersSelectionHandles{
+-BASE_FEATURE(kContextualTriggersSelectionHandles,
--    "ContextualTriggersSelectionHandles", base::FEATURE_DISABLED_BY_DEFAULT};
+-             "ContextualTriggersSelectionHandles",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
 -
--const base::Feature kContextualTriggersSelectionMenu{
+-BASE_FEATURE(kContextualTriggersSelectionMenu,
--    "ContextualTriggersSelectionMenu", base::FEATURE_DISABLED_BY_DEFAULT};
+-             "ContextualTriggersSelectionMenu",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
 -
--const base::Feature kContextualTriggersSelectionSize{
+-BASE_FEATURE(kContextualTriggersSelectionSize,
--    "ContextualTriggersSelectionSize", base::FEATURE_DISABLED_BY_DEFAULT};
+-             "ContextualTriggersSelectionSize",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
 -
- const base::Feature kDirectActions{"DirectActions",
+ BASE_FEATURE(kDirectActions, "DirectActions", base::FEATURE_ENABLED_BY_DEFAULT);
-                                    base::FEATURE_ENABLED_BY_DEFAULT};
  
+ BASE_FEATURE(kDisableCompositedProgressBar,
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
+index 402124ba053a9..6a36d5acdab79 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -75,14 +75,6 @@ extern const base::Feature kContextMenuSearchWithGoogleLens;
+@@ -75,14 +75,6 @@ BASE_DECLARE_FEATURE(kContextMenuSearchWithGoogleLens);
- extern const base::Feature kContextMenuShopWithGoogleLens;
+ BASE_DECLARE_FEATURE(kContextMenuShopWithGoogleLens);
- extern const base::Feature kContextMenuSearchAndShopWithGoogleLens;
+ BASE_DECLARE_FEATURE(kContextMenuSearchAndShopWithGoogleLens);
- extern const base::Feature kContextMenuTranslateWithGoogleLens;
+ BASE_DECLARE_FEATURE(kContextMenuTranslateWithGoogleLens);
--extern const base::Feature kContextualSearchDelayedIntelligence;
+-BASE_DECLARE_FEATURE(kContextualSearchDelayedIntelligence);
--extern const base::Feature kContextualSearchDisableOnlineDetection;
+-BASE_DECLARE_FEATURE(kContextualSearchDisableOnlineDetection);
--extern const base::Feature kContextualSearchForceCaption;
+-BASE_DECLARE_FEATURE(kContextualSearchForceCaption);
--extern const base::Feature kContextualSearchSuppressShortView;
+-BASE_DECLARE_FEATURE(kContextualSearchSuppressShortView);
--extern const base::Feature kContextualSearchThinWebViewImplementation;
+-BASE_DECLARE_FEATURE(kContextualSearchThinWebViewImplementation);
--extern const base::Feature kContextualTriggersSelectionHandles;
+-BASE_DECLARE_FEATURE(kContextualTriggersSelectionHandles);
--extern const base::Feature kContextualTriggersSelectionMenu;
+-BASE_DECLARE_FEATURE(kContextualTriggersSelectionMenu);
--extern const base::Feature kContextualTriggersSelectionSize;
+-BASE_DECLARE_FEATURE(kContextualTriggersSelectionSize);
- extern const base::Feature kDirectActions;
+ BASE_DECLARE_FEATURE(kDirectActions);
- extern const base::Feature kDisableCompositedProgressBar;
+ BASE_DECLARE_FEATURE(kDisableCompositedProgressBar);
- extern const base::Feature kDontPrefetchLibraries;
+ BASE_DECLARE_FEATURE(kDontPrefetchLibraries);
 diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+index b1a2fff3d996d..0368962f8b6a7 100644
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -120,7 +120,6 @@
+@@ -121,7 +121,6 @@
  #if BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/first_run/android/first_run_prefs.h"
  #include "chrome/browser/lens/android/lens_prefs.h"
@@ -1291,7 +1332,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
  #else  // BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/download/default_download_dir_policy_handler.h"
  #include "chrome/browser/download/download_auto_open_policy_handler.h"
-@@ -1828,10 +1827,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
+@@ -1854,10 +1853,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
        std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
    // Policies for all platforms - End
  
@@ -1304,6 +1345,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
    handlers->AddHandler(std::make_unique<BrowsingDataLifetimePolicyHandler>(
        key::kClearBrowsingDataOnExitList,
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+index e81a2b635ec11..2096674e7e40d 100644
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 @@ -791,33 +791,6 @@ CHAR_LIMIT guidelines:
@@ -1340,7 +1382,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_DO_NOT_TRACK_TITLE" desc="Title for 'Do Not Track' preference">
          “Do Not Track”
        </message>
-@@ -3995,38 +3968,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3974,38 +3947,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          Tabs
        </message>
  
@@ -1380,6 +1422,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_WEBAPP_ACTIVITY_TITLE" desc="Title in recent tasks list for web apps, i.e. web pages that are shown in a separate window">
          Web App
 diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc
+index ba1ffe30a7ca9..0ecf1294f0237 100644
 --- a/content/browser/browser_interface_binders.cc
 +++ b/content/browser/browser_interface_binders.cc
 @@ -171,7 +171,6 @@
@@ -1391,9 +1434,10 @@ diff --git a/content/browser/browser_interface_binders.cc b/content/browser/brow
  #include "content/browser/direct_sockets/direct_sockets_service_impl.h"
  #include "media/mojo/mojom/renderer_extensions.mojom.h"
 diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn
+index 16cded2e00de5..0f3a80ddf8cb0 100644
 --- a/third_party/blink/public/mojom/BUILD.gn
 +++ b/third_party/blink/public/mojom/BUILD.gn
-@@ -891,8 +891,8 @@ mojom("android_mojo_bindings") {
+@@ -898,8 +898,8 @@ mojom("android_mojo_bindings") {
    # This Android unhandled-tap feature uses another mojo source, add it in.
    if (enable_unhandled_tap) {
      sources += [ "unhandled_tap_notifier/unhandled_tap_notifier.mojom" ]
@@ -1404,6 +1448,7 @@ diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/
    cpp_typemaps = [
      {
 diff --git a/third_party/blink/public/public_features.gni b/third_party/blink/public/public_features.gni
+index ef7537d70e9bf..e1d36eae54909 100644
 --- a/third_party/blink/public/public_features.gni
 +++ b/third_party/blink/public/public_features.gni
 @@ -12,7 +12,7 @@ declare_args() {
@@ -1416,4 +1461,5 @@ diff --git a/third_party/blink/public/public_features.gni b/third_party/blink/pu
  # Use Minikin hyphenation engine.
  use_minikin_hyphenation = !is_mac
 -- 
-2.25.1
+2.30.2
+

build/patches/Switch-to-fstack-protector-strong.patch

@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -317,18 +317,12 @@ config("compiler") {
+@@ -314,18 +314,12 @@ config("compiler") {
          cflags += [ "-fstack-protector" ]
        }
      } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {

build/patches/do-not-add-suffix-to-package-name.patch

@@ -10,12 +10,12 @@ 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
-@@ -47,7 +47,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
+@@ -54,7 +54,7 @@ if (current_toolchain == default_toolchain) {
- }
- 
    _default_package = "org.chromium.chrome"
--if (android_channel != "default") {
+   if (use_stable_package_name_for_trichrome) {
-+if (android_channel != "default" && android_channel != "stable") {
+     _default_package += ".stable"
+-  } else if (android_channel != "default") {
++  } else if (android_channel != "default" && android_channel != "stable") {
      # android-binary-size trybot may checks if an internal Chrome variant's
      # AndroidManifest is as expected by ensuring the differences between its
      # AndroidManifest and its upstream target's .AndroidManifest.expected file

build/patches/enable-ftrivial-auto-var-init-zero.patch

@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -337,6 +337,10 @@ config("compiler") {
+@@ -334,6 +334,10 @@ config("compiler") {
        cflags += [ "-fwrapv" ]
      }
  

build/patches/kill-Vision.patch

@@ -16,7 +16,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
-@@ -346,8 +346,6 @@ android_library("chrome_java") {
+@@ -373,8 +373,6 @@ if (current_toolchain == default_toolchain) {
        "$google_play_services_package:google_play_services_gcm_java",
        "$google_play_services_package:google_play_services_iid_java",
        "$google_play_services_package:google_play_services_tasks_java",

build/ruleset_converter.gn_args

@@ -41,5 +41,6 @@ use_gnome_keyring=false
 use_official_google_api_keys=false
 use_qt=false
 use_rtti=false
+use_stable_package_name_for_trichrome=false
 use_sysroot=false
 webview_includes_weblayer=false