diff --git a/android/browsertests_apk/AndroidManifest.xml.jinja2 b/android/browsertests_apk/AndroidManifest.xml.jinja2
index 34849a60c4a0..ad7511b7b6e7 100644
--- a/android/browsertests_apk/AndroidManifest.xml.jinja2
+++ b/android/browsertests_apk/AndroidManifest.xml.jinja2
@@ -86,23 +86,6 @@
           </intent-filter>
         </activity>
 
-        <activity
-          android:name="org.chromium.chrome.browser.sharing.shared_clipboard.SharedClipboardShareActivity"
-          android:icon="@drawable/ic_devices_48dp"
-          android:label="@string/shared_clipboard_share_activity_title"
-          android:enabled="false"
-          android:excludeFromRecents="true"
-          android:exported="true"
-          android:noHistory="true"
-          android:theme="@style/Theme.Chromium.Activity.TranslucentNoAnimations"
-          android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
-          <intent-filter>
-              <action android:name="android.intent.action.SEND" />
-              <category android:name="android.intent.category.DEFAULT" />
-              <data android:mimeType="text/plain" />
-          </intent-filter>
-        </activity>
-
         <receiver android:name="org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider"
             android:exported="true">
             <intent-filter>
diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
index cf1076fdcd77..a8ccc5460371 100644
--- a/android/java/apk_for_test.flags
+++ b/android/java/apk_for_test.flags
@@ -448,10 +448,6 @@
     public <init>(...);
 }
 
--keep class org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator {
-    *** createViewProvider(...);
-}
-
 -keep class org.chromium.chrome.browser.omnibox.suggestions.BraveAutocompleteCoordinator {
     *** createViewProvider(...);
 }
@@ -470,8 +466,6 @@
     *** mDropdownHeight;
     *** mPriorityOrderedSuggestionProcessors;
     public <init>(...);
-    *** getVisibleSuggestionsCount(...);
-    *** getProcessorForSuggestion(...);
 }
 
 -keep class org.chromium.chrome.browser.omnibox.suggestions.BraveDropdownItemViewInfoListBuilder {
diff --git a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
index 9cbfc4f1f652..ca8c4be86865 100644
--- a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
+++ b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
@@ -65,6 +65,7 @@ public OverrideUrlLoadingResult clobberCurrentTabWithFallbackUrl(
             params.getRedirectHandler().setShouldNotOverrideUrlLoadingOnCurrentRedirectChain();
         }
         GURL browserFallbackGURL = new GURL(browserFallbackUrl);
-        return clobberCurrentTab(browserFallbackGURL, params.getReferrerUrl());
+        return clobberCurrentTab(browserFallbackGURL, params.getReferrerUrl(),
+                params.getInitiatorOrigin(), params.isRendererInitiated());
     }
 }
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSettingsActivity.java b/android/java/org/chromium/chrome/browser/settings/BraveSettingsActivity.java
index 88c71ac9e377..68035a6ddd01 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveSettingsActivity.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveSettingsActivity.java
@@ -38,4 +38,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    protected boolean supportsDynamicColors() {
+        // Dynamic colors cause styling issues with Brave theme.
+        return false;
+    }
 }
diff --git a/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate.java b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate.java
index 49dbdf155343..4579658db302 100644
--- a/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate.java
+++ b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate.java
@@ -7,7 +7,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 
 import org.chromium.base.Callback;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
@@ -22,19 +22,12 @@ public BraveSiteSettingsDelegate(Context context, Profile profile) {
     }
 
     @Override
-    public void closeButton() {
-        Intent intent =
-                new Intent(BraveActivity.getChromeTabbedActivity(), ChromeTabbedActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        BraveActivity.getChromeTabbedActivity().startActivity(intent);
-    }
-
-    @Override
-    public void getFaviconImageForURL(GURL faviconUrl, Callback<Bitmap> callback) {
+    public void getFaviconImageForURL(GURL faviconUrl, Callback<Drawable> callback) {
         if (!faviconUrl.isValid()) {
             callback.onResult(null);
             return;
         }
+
         super.getFaviconImageForURL(faviconUrl, callback);
     }
 }
diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java
index b57840fe1d52..4c8636545812 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java
@@ -55,8 +55,6 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
             ObservableSupplier<AppMenuButtonHelper> appMenuButtonHelperSupplier,
             ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
             ObservableSupplier<Boolean> homepageEnabledSupplier,
-            ObservableSupplier<Boolean> startSurfaceAsHomepageSupplier,
-            ObservableSupplier<Boolean> homepageManagedByPolicySupplier,
             ObservableSupplier<Boolean> identityDiscStateSupplier,
             Callback<Runnable> invalidatorCallback, Supplier<ButtonData> identityDiscButtonSupplier,
             Supplier<ResourceManager> resourceManagerSupplier,
@@ -73,7 +71,6 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
                 layoutStateProviderSupplier, normalThemeColorProvider, overviewThemeColorProvider,
                 browsingModeMenuButtonCoordinator, overviewModeMenuButtonCoordinator,
                 appMenuButtonHelperSupplier, tabModelSelectorSupplier, homepageEnabledSupplier,
-                startSurfaceAsHomepageSupplier, homepageManagedByPolicySupplier,
                 identityDiscStateSupplier, invalidatorCallback, identityDiscButtonSupplier,
                 resourceManagerSupplier, isProgressBarVisibleSupplier,
                 isIncognitoModeEnabledSupplier, isGridTabSwitcherEnabled, isTabletGtsPolishEnabled,
diff --git a/android/java/res/layout/new_tab_page_layout.xml b/android/java/res/layout/new_tab_page_layout.xml
index 6f5378629f19..1181b0b1cc73 100644
--- a/android/java/res/layout/new_tab_page_layout.xml
+++ b/android/java/res/layout/new_tab_page_layout.xml
@@ -115,6 +115,13 @@
                 android:layout_marginTop="16dp"
                 android:visibility="gone"/>
 
+            <ViewStub
+                android:id="@+id/search_resumption_module_container_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/search_resumption_module_margin_top"
+                android:layout="@layout/search_resumption_module_layout" />
+
             <!-- Video tutorial IPH card -->
             <ViewStub
                 android:id="@+id/video_iph_stub"
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index be517991b4bf..4a211fd7a183 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -54,12 +54,12 @@
 import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider;
 import org.chromium.chrome.browser.omnibox.status.PageInfoIPHController;
 import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate;
+import org.chromium.chrome.browser.omnibox.suggestions.FaviconFetcher;
 import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
 import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost;
 import org.chromium.chrome.browser.omnibox.suggestions.SuggestionProcessor;
 import org.chromium.chrome.browser.omnibox.suggestions.UrlBarDelegate;
 import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
-import org.chromium.chrome.browser.omnibox.suggestions.mostvisited.ExploreIconProvider;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.share.ShareDelegateImpl;
 import org.chromium.chrome.browser.share.crow.CrowButtonDelegate;
@@ -543,7 +543,7 @@ public void testConstructorsExistAndMatch() throws Exception {
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor",
                 "org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor",
-                Context.class, SuggestionHost.class, UrlBarDelegate.class, Supplier.class,
+                Context.class, SuggestionHost.class, UrlBarDelegate.class, FaviconFetcher.class,
                 Supplier.class, Supplier.class));
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator",
@@ -553,11 +553,11 @@ public void testConstructorsExistAndMatch() throws Exception {
                 List.class, OneshotSupplier.class, ThemeColorProvider.class,
                 ThemeColorProvider.class, MenuButtonCoordinator.class, MenuButtonCoordinator.class,
                 ObservableSupplier.class, ObservableSupplier.class, ObservableSupplier.class,
-                ObservableSupplier.class, ObservableSupplier.class, ObservableSupplier.class,
-                Callback.class, Supplier.class, Supplier.class, ObservableSupplier.class,
-                BooleanSupplier.class, boolean.class, boolean.class, boolean.class, boolean.class,
-                boolean.class, HistoryDelegate.class, BooleanSupplier.class,
-                OfflineDownloader.class, boolean.class, ObservableSupplier.class, Callback.class));
+                ObservableSupplier.class, Callback.class, Supplier.class, Supplier.class,
+                ObservableSupplier.class, BooleanSupplier.class, boolean.class, boolean.class,
+                boolean.class, boolean.class, boolean.class, HistoryDelegate.class,
+                BooleanSupplier.class, OfflineDownloader.class, boolean.class,
+                ObservableSupplier.class, Callback.class));
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator",
                 "org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator",
@@ -580,7 +580,7 @@ public void testConstructorsExistAndMatch() throws Exception {
                 Context.class, AutocompleteDelegate.class, UrlBarEditingTextStateProvider.class,
                 PropertyModel.class, Handler.class, Supplier.class, Supplier.class, Supplier.class,
                 LocationBarDataProvider.class, Callback.class, Supplier.class, BookmarkState.class,
-                JankTracker.class, ExploreIconProvider.class, OmniboxPedalDelegate.class));
+                JankTracker.class, OmniboxPedalDelegate.class));
         Assert.assertTrue(constructorsMatch("org/chromium/chrome/browser/feed/FeedSurfaceMediator",
                 "org/chromium/chrome/browser/feed/BraveFeedSurfaceMediator",
                 FeedSurfaceCoordinator.class, Context.class, SnapScrollHelper.class,
@@ -612,8 +612,7 @@ public void testConstructorsExistAndMatch() throws Exception {
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder",
                 "org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder",
-                Supplier.class, BookmarkState.class, ExploreIconProvider.class,
-                OmniboxPedalDelegate.class));
+                Supplier.class, BookmarkState.class, OmniboxPedalDelegate.class));
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManager",
                 "org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListManager",
diff --git a/app/bookmarks_strings.grdp b/app/bookmarks_strings.grdp
index 97c2d183711f..b7b61733791e 100644
--- a/app/bookmarks_strings.grdp
+++ b/app/bookmarks_strings.grdp
@@ -281,6 +281,9 @@
     <message name="IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW" desc="Window title of editor for new bookmark folders">
       New folder
     </message>
+    <message name="IDS_UNNAMED_BOOKMARK_FOLDER" desc="Tooltip for unnamed bookmark folders">
+      Unnamed folder
+    </message>
     <message name="IDS_BOOKMARK_ALL_TABS_DIALOG_TITLE" desc="The title of the Bookmark All Tabs dialog.">
       Bookmark all tabs
     </message>
@@ -298,6 +301,9 @@
     <message name="IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW" desc="In Title Case: Window title of editor for new bookmark folders">
       New Folder
     </message>
+    <message name="IDS_UNNAMED_BOOKMARK_FOLDER" desc="In Title Case: Tooltip for unnamed bookmark folders">
+      Unnamed Folder
+    </message>
     <message name="IDS_BOOKMARK_ALL_TABS_DIALOG_TITLE" desc="In Title Case: The title of the Bookmark All Tabs dialog.">
       Bookmark All Tabs
     </message>
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
index 7e436d13c957..c7b335788da1 100644
--- a/app/brave_main_delegate_browsertest.cc
+++ b/app/brave_main_delegate_browsertest.cc
@@ -7,6 +7,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/domain_reliability/service_factory.h"
 #include "chrome/browser/enterprise/connectors/analysis/content_analysis_features.h"
+#include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_features.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_test_utils.h"
@@ -82,12 +83,14 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
   const base::Feature* disabled_features[] = {
     &autofill::features::kAutofillEnableAccountWalletStorage,
     &autofill::features::kAutofillEnableOfferNotificationForPromoCodes,
+    &autofill::features::kAutofillEnableRemadeDownstreamMetrics,
     &autofill::features::kAutofillSaveCardUiExperiment,
     &autofill::features::kAutofillServerCommunication,
     &autofill::features::kAutofillUpstreamAllowAdditionalEmailDomains,
     &blink::features::kAdInterestGroupAPI,
-    &blink::features::kBrowsingTopics,
     &blink::features::kAllowURNsInIframes,
+    &blink::features::kBrowsingTopics,
+    &blink::features::kClientHintsMetaEquivDelegateCH,
     &blink::features::kComputePressure,
     &blink::features::kConversionMeasurement,
     &blink::features::kCssSelectorFragmentAnchor,
@@ -107,6 +110,9 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &commerce::kShoppingPDPMetrics,
     &commerce::kRetailCoupons,
     &enterprise_connectors::kLocalContentAnalysisEnabled,
+#if BUILDFLAG(IS_WIN)
+    &features::kAppBoundEncryptionMetrics,
+#endif
 #if !BUILDFLAG(IS_ANDROID)
     &features::kCopyLinkToText,
 #endif
@@ -115,10 +121,10 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &features::kFedCm,
     &features::kFirstPartySets,
     &features::kIdleDetection,
+    &features::kIsolatePrerenders,
     &features::kNavigationRequestPreconnect,
     &features::kNotificationTriggers,
     &features::kOmniboxTriggerForNoStatePrefetch,
-    &features::kPrivacyGuide,
     &features::kPrivacyGuide2,
     &features::kPrivacySandboxAdsAPIsOverride,
     &features::kSCTAuditing,
diff --git a/app/brave_strings.grd b/app/brave_strings.grd
index 833b3b5b62fd..47059a884565 100644
--- a/app/brave_strings.grd
+++ b/app/brave_strings.grd
@@ -636,15 +636,9 @@ Permissions you've already given to websites and apps may apply to this account.
       <message name="IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_UNKNOWN_SOURCE" desc="Summary of dangerous warning for a file (like an extension) from an unknown source.">
         Extensions, apps, and themes from unknown sources can harm your device. Brave recommends only installing them from the <ph name="IDS_EXTENSION_WEB_STORE_TITLE">$1<ex>Web Store</ex></ph>
       </message>
-      <message name="IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_ENCRYPTED" desc="Summary of dangerous warning for an encrypted file.">
-        Brave blocked this file because it's encrypted. Ask its owner to decrypt it
-      </message>
       <message name="IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_MALWARE" desc="Subpage summary for malware warning for the user.">
         Brave blocked this file because it has malware
       </message>
-      <message name="IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_TOO_BIG" desc="Subpage summary of warning for a file blocked for being too large.">
-        Brave blocked this file because it's too big for a security check. Try again with files up to 50 MB
-      </message>
       <message name="IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_DEEP_SCANNING_PROMPT" desc="Subpage summary of warning for Deep Scanning.">
         Brave recommends scanning this file because it may be dangerous
       </message>
@@ -1425,8 +1419,8 @@ Permissions you've already given to websites and apps may apply to this account.
       <message name="IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_SUBTITLE" desc="A subtitle on the consent page. Consider this a tagline for the Privacy Sandbox project.* “exploring” conveys that this is a work in progress. * “new features” include settings that the user can turn on/off and also backend features that change the way Brave works for everyone * “allow sites to deliver”: Privacy Sandbox is proposed by Brave as a collaborative effort with the browser industry. We’re building and testing functionality that will live in the Brave browser. In order to land the full promise of Privacy Sandbox, websites and advertisers need to adopt the new APIs / functionality that we’re developing. So “allow sites…” makes it clear to the user that we’re building something for the ecosystem. Typically a Brave product builds something for the user, and that’s true in this case, but it’s bigger than that. * “same browsing experience using less of your info”: Another definition of the promise of Privacy Sandbox. Third-party cookies are going away. In this new world, the user will have essentially the same browsing experience but it’s more private because it doesn’t expose so much of the user’s info.">
         Brave is exploring new features that allow sites to deliver the same browsing experience using less of your info
       </message>
-      <message name="IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BODY_DESCRIPTION_2" desc="A paragraph beneath the “More control over the ads you see” subtitle.* “During the trials”: The trials happens in addition to today’s current system based on third-party cookies. In other words, even by agreeing to or remaining in a trial,, the user’s core experience doesn’t change much. This is an experiment, and we need the user to understand as much. * “see and remove topics of interests”: we want to stress the element of control * “estimate topics”: Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “recent browsing history”: Later in the UI, we define this as “a record of sites you’ve visited using Brave on this device.” By “recent”, we mean the last 3 weeks (also defined later in the UI).">
-        During the trials, you can see and remove topics of interest sites use to show you ads. Brave estimates your interests based on your recent browsing history.
+      <message name="IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BODY_DESCRIPTION_2" desc="A paragraph beneath the “More control over the ads you see” subtitle. * “see and remove topics of interests”: we want to stress the element of control * “estimate topics”: Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “recent browsing history”: Later in the UI, we define this as “a record of sites you’ve visited using Brave on this device.” By “recent”, we mean the last 3 weeks (also defined later in the UI).">
+        You can see and remove topics of interest sites use to show you ads. Brave estimates your interests based on your recent browsing history.
       </message>
       <message name="IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_LEARN_MORE_LABEL" desc="Learn more link * Unfolds content within the page * The text that appears describes 2 ways in which a site can target ads: the “Topics API” and the “FLEDGE API”. You can see what those are at www.privacysanbox.com or they’re described for the user’s benefit in other text. * “ad personalization” can mean different things in different contexts. Here, we’re using it as a simple noun. In other words, it’s not the name of a control but a descriptive term used to describe the personalization of ads in the Brave browser. This “ad personalization” shouldn’t be confused with the setting in the Brave sync chain called “Ad personalization”.">
         Learn more about ad personalization in Brave
diff --git a/app/chromeos_shared_strings.grdp b/app/chromeos_shared_strings.grdp
index 01ad56ce294a..0631be6591f3 100644
--- a/app/chromeos_shared_strings.grdp
+++ b/app/chromeos_shared_strings.grdp
@@ -24,4 +24,27 @@
     PUK
   </message>
 
+  <!-- File system request UI display strings -->
+  <message name="IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_TITLE" desc="Title of a prompt dialog for granting permissions to a volume (eg. USB drive, SD card, MTP device) with the specified name. Only used for screen readers (a11y); not visible." is_accessibility_with_no_ui="true">
+    Permission requested
+  </message>
+  <message name="IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_MESSAGE" desc="Message in a prompt dialog for granting read-only permissions to a volume (eg. USB drive, SD card, MTP device) with the specified name to the extension.">
+    <ph name="APP_NAME">$1<ex>Super Kiosk app</ex></ph> wants to copy files from <ph name="VOLUME_NAME">$2<ex>FooBar 4GB</ex></ph>.
+  </message>
+  <message name="IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_WRITABLE_MESSAGE" desc="Message in a prompt dialog for granting full permissions (read, write, delete, create files and directories) to a volume (eg. USB drive, SD card, MTP device) with the specified name to the extension.">
+    <ph name="APP_NAME">$1<ex>Super Kiosk app</ex></ph> wants to access <ph name="VOLUME_NAME">$2<ex>FooBar 4GB</ex></ph>. It may modify or delete your files.
+  </message>
+  <message name="IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_ALLOW_BUTTON" desc="Label on the button to grant permissions.">
+    Allow
+  </message>
+  <message name="IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_DENY_BUTTON" desc="Label on the button to reject permissions.">
+    Deny
+  </message>
+  <message name="IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_NOTIFICATION_MESSAGE" desc="Message in a notification about granted read-only pemissions (read, write, delete, create files and directories) to a volume (eg. USB drive, SD card, MTP device) with the specified name to the extension.">
+    Read-only access to <ph name="VOLUME_NAME">$1<ex>FooBar 4GB</ex></ph> has been granted.
+  </message>
+  <message name="IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_NOTIFICATION_WRITABLE_MESSAGE" desc="Message in a notification about granted full permissions (read, write, delete, create files and directories) to a volume (eg. USB drive, SD card, MTP device) with the specified name to the extension.">
+    Read and write access to <ph name="VOLUME_NAME">$1<ex>FooBar 4GB</ex></ph> has been granted.
+  </message>
+
 </grit-part>
diff --git a/app/generated_resources.grd b/app/generated_resources.grd
index 2c3fa891e4df..aa39c97c669b 100644
--- a/app/generated_resources.grd
+++ b/app/generated_resources.grd
@@ -463,14 +463,14 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_HISTORY_OPEN_TABS_MENU_ITEM" desc="Label displayed in history sidebar button to display synced tabs from other devices.">
         Tabs from other devices
       </message>
-      <message name="IDS_HISTORY_SIGN_IN_BUTTON" desc="Label displayed on a button to let user sign in to Brave to get synced tab history.">
-        Sign in to Brave
+      <message name="IDS_HISTORY_TURN_ON_SYNC_BUTTON" desc="Label displayed on a button to let user turn on sync or sign in to Brave to get synced tab history.">
+        Turn on sync
       </message>
-      <message name="IDS_HISTORY_SIGN_IN_PROMO" desc="Text of the sign-in promo. This will show up if a user is not logged in and has no synced tabs.">
+      <message name="IDS_HISTORY_TURN_ON_SYNC_PROMO" desc="Text of the turn on sync/sign-in promo. This will show up if a user is not logged in and has no synced tabs.">
         Continue from another device
       </message>
-      <message name="IDS_HISTORY_SIGN_IN_PROMO_DESC" desc="Description of the sign-in promo. Further tells users to sign in to Brave to see synced tabs from other devices.">
-        To get your tabs from your other devices, sign in to Brave.
+      <message name="IDS_HISTORY_TURN_ON_SYNC_PROMO_DESC" desc="Description of the turn on sync/sign-in promo. Further tells users to turn o sync/sign in to Brave to see synced tabs from other devices.">
+        To get your tabs from your other devices, turn on sync
       </message>
 
       <!-- Generic terms -->
@@ -573,6 +573,9 @@ are declared in tools/grit/grit_rule.gni.
           <message name="IDS_CONTENT_CONTEXT_READ_ANYTHING" desc="Context menu menuitem to open page in Read Anything view">
            Open in Reader
           </message>
+          <message name="IDS_CONTENT_CONTEXT_RUN_PDF_OCR" desc="Context menu menuitem that runs a local machine intelligence model to extract the content of the current PDF and pass it to assisstive technologies.">
+           Recognize P&amp;DF text
+          </message>
           <message name="IDS_CONTENT_CONTEXT_RELOAD" desc="The name of the Reload command in the content area context menu">
             &amp;Reload
           </message>
@@ -639,6 +642,10 @@ are declared in tools/grit/grit_rule.gni.
             Copy link to highlight
           </message>
 
+          <message name="IDS_CONTENT_CONTEXT_ADD_A_NOTE" desc="The name of the Add Note command in the content area context menu">
+            Add a note
+          </message>
+
           <message name="IDS_CONTENT_CONTEXT_REMOVELINKTOTEXT" desc="The name of the Remove Highlights command in the content area context menu">
             Remove highlight
           </message>
@@ -759,6 +766,9 @@ are declared in tools/grit/grit_rule.gni.
           <message name="IDS_CONTENT_CONTEXT_SELECTALL" desc="The name of the Select All command in the content area context menu">
             Select &amp;all
           </message>
+          <message name="IDS_CONTENT_CONTEXT_PARTIAL_TRANSLATE" desc="The name of the Partial Translate command in the content area context menu">
+            &amp;Translate to <ph name="LANGUAGE">$1<ex>English</ex></ph>
+          </message>
           <message name="IDS_CONTENT_CONTEXT_SEARCHWEBFOR" desc="The name of the Search the Web for “string” command in the content area context menu">
             &amp;Search <ph name="SEARCH_ENGINE">$1<ex>Brave</ex></ph> for “<ph name="SEARCH_TERMS">$2<ex>flowers</ex></ph>”
           </message>
@@ -774,6 +784,9 @@ are declared in tools/grit/grit_rule.gni.
           <message name="IDS_CONTENT_CONTEXT_LENS_REGION_SEARCH_ALT2" desc="The name of the Lens Region Search command in the content area context menu">
             Search any part of the page with <ph name="VISUAL_SEARCH_PROVIDER">$1<ex>Google Lens</ex></ph>
           </message>
+          <message name="IDS_CONTENT_CONTEXT_LENS_REGION_SEARCH_ALT3" desc="The name of the Lens Region Search command in the content area context menu">
+            Search inside image with <ph name="VISUAL_SEARCH_PROVIDER">$1<ex>Google Lens</ex></ph>
+          </message>
           <message name="IDS_CONTENT_CONTEXT_LENS_REGION_SEARCH_ALT4" desc="The name of the Lens Region Search command in the content area context menu">
             Search images with <ph name="VISUAL_SEARCH_PROVIDER">$1<ex>Google Lens</ex></ph>
           </message>
@@ -818,6 +831,9 @@ are declared in tools/grit/grit_rule.gni.
           <message name="IDS_CONTENT_CONTEXT_READ_ANYTHING" desc="Context menu menuitem to open page in Read Anything view">
            Open in Reader
           </message>
+          <message name="IDS_CONTENT_CONTEXT_RUN_PDF_OCR" desc="Context menu menuitem that runs a local machine intelligence model to extract the content of the current PDF and pass it to assisstive technologies.">
+           Recognize P&amp;DF text
+          </message>
           <message name="IDS_CONTENT_CONTEXT_RELOAD" desc="In Title Case: The name of the Reload command in the content area context menu">
             &amp;Reload
           </message>
@@ -884,6 +900,10 @@ are declared in tools/grit/grit_rule.gni.
             Copy Link to Highlight
           </message>
 
+          <message name="IDS_CONTENT_CONTEXT_ADD_A_NOTE" desc="In Title Case: The name of the Add Note command in the content area context menu">
+            Add a Note
+          </message>
+
           <message name="IDS_CONTENT_CONTEXT_REMOVELINKTOTEXT" desc="In TitleCase: The name of the Remove Highlights command in the content area context menu">
             Remove Highlight
           </message>
@@ -1016,6 +1036,9 @@ are declared in tools/grit/grit_rule.gni.
           <message name="IDS_CONTENT_CONTEXT_SELECTALL" desc="In Title Case: The name of the Select All command in the content area context menu">
             Select &amp;All
           </message>
+          <message name="IDS_CONTENT_CONTEXT_PARTIAL_TRANSLATE" desc="In Title Case: The name of the Partial Translate command in the content area context menu">
+            &amp;Translate to <ph name="LANGUAGE">$1<ex>English</ex></ph>
+          </message>
           <message name="IDS_CONTENT_CONTEXT_SEARCHWEBFOR" desc="In Title Case: The name of the Search the Web for “string” command in the content area context menu">
             &amp;Search <ph name="SEARCH_ENGINE">$1<ex>Brave</ex></ph> for “<ph name="SEARCH_TERMS">$2<ex>flowers</ex></ph>”
           </message>
@@ -1031,6 +1054,9 @@ are declared in tools/grit/grit_rule.gni.
           <message name="IDS_CONTENT_CONTEXT_LENS_REGION_SEARCH_ALT2" desc="In Title Case: The name of the Lens Region Search command in the content area context menu">
             Search Any Part of the Page with <ph name="VISUAL_SEARCH_PROVIDER">$1<ex>Google Lens</ex></ph>
           </message>
+          <message name="IDS_CONTENT_CONTEXT_LENS_REGION_SEARCH_ALT3" desc="In Title Case: The name of the Lens Region Search command in the content area context menu">
+              Search inside Image with <ph name="VISUAL_SEARCH_PROVIDER">$1<ex>Google Lens</ex></ph>
+          </message>
           <message name="IDS_CONTENT_CONTEXT_LENS_REGION_SEARCH_ALT4" desc="In Title Case: The name of the Lens Region Search command in the content area context menu">
             Search Images with <ph name="VISUAL_SEARCH_PROVIDER">$1<ex>Google Lens</ex></ph>
           </message>
@@ -2313,11 +2339,11 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_DOWNLOAD_BUBBLE_FOOTER_LINK" desc="Footer link in the Download Bubble">
         Show all downloads
       </message>
-      <message name="IDS_DOWNLOAD_BUBBLE_DOWNLOAD_SEPERATOR" desc="A separator to place between download size and download time. A symbol, in this case a bullet •, with a white space before it and a white space after it, is used to separate them. If the bullet • resembles another symbol in the language, please translate the bullet • as a symbol (A) that is not easily mistaken for a number or letter in the language and (B) that is typically used to separate elements.">
-        ''' • '''
+      <message name="IDS_DOWNLOAD_BUBBLE_DOWNLOAD_STATUS_MESSAGE_WITH_SEPARATOR" desc="The download status and message are separated by a symbol, in this case bullet •, with a white space before it and a white space after it. If the bullet • resembles another symbol in the language, please translate the bullet • as a symbol (A) that is not easily mistaken for a number or letter in the language and (B) that is typically used to separate elements.">
+        <ph name="STATUS">$1<ex>100/120 MB</ex></ph> • <ph name="MESSAGE">$2<ex>Opening in 10 seconds...</ex></ph>
       </message>
-      <message name="IDS_DOWNLOAD_BUBBLE_DOWNLOAD_SYMBOL" desc="A symbol for active downloads, in this case downward arrow ↓. If the downward arrow ↓ resembles another symbol in the language, please translate the downward arrow ↓ as a symbol that indicates a downward arrow">
-        '''↓ '''
+      <message name="IDS_DOWNLOAD_BUBBLE_DOWNLOAD_STATUS_WITH_SYMBOL" desc="Active downloads have a symbol associated with them, in this case a downward arrow ↓. If the downward arrow ↓ resembles another symbol in the language, please translate the downward arrow ↓ as a symbol that indicates a downward arrow">
+        ↓ <ph name="STATUS">$1<ex>100/120 MB</ex></ph>
       </message>
       <message name="IDS_DOWNLOAD_BUBBLE_STATUS_RESUMING" desc="When resuming a download, let the user know we're resuming the download.">
         Resuming...
@@ -2355,6 +2381,12 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_DOWNLOAD_BUBBLE_OPEN_NOW" desc="Label for the button prompting to open a download while deep scanning is in progress">
         Open Now
       </message>
+      <message name="IDS_DOWNLOAD_BUBBLE_REVIEW" desc="Label for the button prompting the dialog containing the enterprise administrator's message explaining the violation.">
+        Review
+      </message>
+      <message name="IDS_DOWNLOAD_BUBBLE_RETRY" desc="Label for the button prompting to retry a failed download.">
+        Try again
+      </message>
       <message name="IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_DISK_FULL" desc="Status text for a download item that was interrupted because there is not enough room on the disk to download this file.">
         Out of storage space
       </message>
@@ -2385,9 +2417,6 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_DOWNLOAD_BUBBLE_INTERRUPTED_SUBPAGE_SUMMARY_BLOCKED_ORGANIZATION" desc="Subpage summary text for a download item that was blocked by the organization.">
         Your organization blocked this file because it didn't meet a security policy
       </message>
-      <message name="IDS_DOWNLOAD_BUBBLE_WARNING_SUBPAGE_SUMMARY_BLOCKED_ORGANIZATION" desc="Subpage summary text of warning for download item that was blocked by the organization.">
-        Your organization blocked this file because it has sensitive content
-      </message>
       <message name="IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_WRONG" desc="Status text for a download item that had something go wrong.">
         Something went wrong
       </message>
@@ -2439,9 +2468,18 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_DOWNLOAD_BUBBLE_STATUS_SENSITIVE_CONTENT" desc="Dangerous warning for a file with sensitive content">
         Sensitive content
       </message>
-      <message name="IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SENSITIVE_CONTENT" desc="Subpage summary of dangerous warning for a file with sensitive content">
+      <message name="IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SENSITIVE_CONTENT_WARNING" desc="Subpage summary text of warning for download item that contains sensitive content">
         Your organization recommends deleting this file because it has sensitive content
       </message>
+      <message name="IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SENSITIVE_CONTENT_BLOCK" desc="Subpage summary text of warning for download item that was blocked by the organization.">
+        Your organization blocked this file because it has sensitive or dangerous content. Ask its owner to fix.
+      </message>
+      <message name="IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_ENCRYPTED" desc="Subpage summary of dangerous warning for an encrypted file.">
+        Your organization blocked this file because it is encrypted. Ask its owner to decrypt.
+      </message>
+      <message name="IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_TOO_BIG" desc="Subpage summary of warning for a file blocked for being too large.">
+        Your organization blocked this file because it is too big for a security check. You can open files up to 50 MB.
+      </message>
       <message name="IDS_DOWNLOAD_BUBBLE_TRY_AGAIN" desc="Retry button when a download is failed">
         Try again
       </message>
@@ -2454,6 +2492,38 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_DOWNLOAD_BUBBLE_STATUS_ASYNC_SCANNING_ENTERPRISE" desc="Status text for a download item that is being scanned by enterprise policy.">
         Checking with your organization's security policies...
       </message>
+      <message name="IDS_DOWNLOAD_BUBBLE_INCOGNITO_INFORMATION_ROW" desc="For Private/Guest mode, text notifying that downloads are visible to others on the device.">
+        Anyone using this device can see downloaded files
+      </message>
+      <message name="IDS_DOWNLOAD_BUBBLE_RESUME_QUICK_ACTION" desc="Accessibility/tooltip label for action to resume a download.">
+        Resume
+      </message>
+      <message name="IDS_DOWNLOAD_BUBBLE_PAUSE_QUICK_ACTION" desc="Accessibility/tooltip label for action to pause a download.">
+        Pause
+      </message>
+      <message name="IDS_DOWNLOAD_BUBBLE_CANCEL_QUICK_ACTION" desc="Accessibility/tooltip label for action to cancel a download.">
+        Cancel
+      </message>
+      <message name="IDS_DOWNLOAD_BUBBLE_OPEN_QUICK_ACTION" desc="Accessibility/tooltip label for action to open a download.">
+        Open
+      </message>
+      <if expr="is_macosx">
+            <message name="IDS_DOWNLOAD_BUBBLE_SHOW_IN_FOLDER_QUICK_ACTION" desc="Mac: Accessibility/tooltip label for showing the file in the Finder">
+              Show in Finder
+            </message>
+      </if>
+      <if expr="not is_macosx">
+        <if expr="not use_titlecase">
+            <message name="IDS_DOWNLOAD_BUBBLE_SHOW_IN_FOLDER_QUICK_ACTION" desc="Accessibility/tooltip label for showing the file in file explorer">
+              Show in folder
+            </message>
+          </if>
+          <if expr="use_titlecase">
+            <message name="IDS_DOWNLOAD_BUBBLE_SHOW_IN_FOLDER_QUICK_ACTION" desc="In Title Case: Accessibility/tooltip label for showing the file in file explorer">
+              Show in Folder
+            </message>
+          </if>
+      </if>
 
       <!-- Desktop omnibox PWA install icon -->
       <if expr="not is_android">
@@ -2743,7 +2813,7 @@ are declared in tools/grit/grit_rule.gni.
           Device Credentials
         </message>
         <!--
-          NOTE: As per Bluetooth v4.2 spec. (section 3.2.3.2):
+          NOTE: As per Bluetooth spec. v4.2 [Vol 3, Part C] (section 3.2.3.2):
           > When the Bluetooth PIN is referred to on the UI level, the term
           > 'Bluetooth Passkey' should be used."
         -->
@@ -2756,6 +2826,12 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_BLUETOOTH_DEVICE_PAIR_CONFIRM_LABEL" desc="Label of the text prompt for Bluetooth device pair confirmation.">
           Bluetooth device <ph name="DEVICE">$1</ph> would like permission to pair.
         </message>
+        <message name="IDS_BLUETOOTH_DEVICE_PASSKEY_CONFIRM_TITLE" desc="Title of the Bluetooth device pair passkey confirmation prompt dialog.">
+          Confirm passkey
+        </message>
+        <message name="IDS_BLUETOOTH_DEVICE_PASSKEY_CONFIRM_LABEL" desc="Label of the text prompt for Bluetooth device pair passkey confirmation.">
+          Please confirm that <ph name="PASSKEY">$1<ex>123456</ex></ph> is the passkey displayed on Bluetooth device <ph name="DEVICE">$2</ph>.
+        </message>
       </if>
 
       <!-- Content blocking strings -->
@@ -2943,6 +3019,9 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_ABUSIVE_DESCRIPTION" desc="Description for the notifications status bubble, which is triggered when a user clicks on the blocked notifications icon in the omnibox, shown when a site's notifications permission request is automatically blocked by Brave because the site is known to employ dark patterns to trick users into accepting the permission.">
         This site may be trying to trick you into allowing intrusive notifications
       </message>
+      <message name="IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_DISRUPTIVE_DESCRIPTION" desc="Description for the notifications status bubble, which is triggered when a user clicks on the blocked notifications icon in the omnibox, shown when a site's loud notifications permission requests was automatically blocked by Brave because the site may engage in disruptive notification permission usage practices.">
+        Notifications from this site may be disruptive
+      </message>
       <message name="IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_PREDICTION_SERVICE_DESCRIPTION" desc="Text used as notification message when requesting permission for Web Notifications via a notification. Used when the prediction service has decided that the user will be very unlikely to grant this permission.">
         Notifications were automatically blocked because you usually don't allow them
       </message>
@@ -3117,7 +3196,7 @@ are declared in tools/grit/grit_rule.gni.
           Certificate Signature Value
         </message>
         <message name="IDS_CERT_DETAILS_EXPORT_CERTIFICATE" desc="The label of the button to export the selected certificate">
-          E&amp;xport...
+          E&amp;xport selected certificate...
         </message>
 
         <message translateable="false" name="IDS_CERT_OID_AVA_COMMON_NAME" desc="">
@@ -3497,6 +3576,9 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_CERT_EXTENSION_NON_CRITICAL" desc="The text displayed in the certificate details dialog for a given extension which is not critical">
           Not Critical
         </message>
+        <message name="IDS_CERT_DUMP_ERROR" desc="The text displayed in the certificate viewer dialog for a given field which could not be decoded">
+          Error: Unable to decode certificate
+        </message>
         <message name="IDS_CERT_EXTENSION_DUMP_ERROR" desc="The text displayed in the certificate details dialog for a given extension which could not be decoded">
           Error: Unable to decode extension
         </message>
@@ -3951,17 +4033,14 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_EXTENSION_BLOCKED_ACTION_BUBBLE_OK_BUTTON" desc="The text of the button to proceed with the page refresh for running an extension.">
           Reload
         </message>
-        <message name="IDS_EXTENSION_BLOCKED_ACTION_BUBBLE_SINGLE_EXTENSION_TITLE" desc="Title of the bubble to tell users that in order to run an extension, they'll need to refresh the page.">
-          Refresh the page to use "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>"
-        </message>
-        <message name="IDS_EXTENSION_BLOCKED_ACTION_BUBBLE_OK_BUTTON_LABEL" desc="The label of the button to proceed with the page refresh for running an extension.">
-          Refresh
+        <message name="IDS_EXTENSION_BLOCKED_ACTION_BUBBLE_SINGLE_EXTENSION_TITLE" desc="Title of the bubble to tell users that in order to run or block an extension, they'll need to refresh the page.">
+          Reload the page to use "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>"
         </message>
-        <message name="IDS_EXTENSION_BLOCKED_ACTION_BUBBLE_BODY_TEXT" desc="The body text of the bubble to tell users to check the checkbox to always allow the extensions to run on the current site.">
-          Always allow the extension to run on this site if you don't want to see this message again.
+        <message name="IDS_EXTENSION_BLOCKED_ACTION_BUBBLE_MULTIPLE_EXTENSIONS_TITLE" desc="Title of the bubble to tell users that in order to run or block an extension, they'll need to refresh the page.">
+          Reload the page to use these extensions
         </message>
-        <message name="IDS_EXTENSION_BLOCKED_ACTION_BUBBLE_CHECKBOX_LABEL" desc="The label of the checkbox to always allow the extensions to run on the current site.">
-          Always allow on this site
+        <message name="IDS_EXTENSION_BLOCKED_ACTION_BUBBLE_UPDATE_PERMISSIONS_TITLE" desc="Title of the bubble to tell users that in order to change site permissions, they'll need to refresh the page.">
+          Reload the page to apply your changes
         </message>
       </if>
 
@@ -4454,9 +4533,22 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_PLATFORMKEYS" desc="Permission string for enterprise platform keys permission.">
           Perform security-related tasks for your organization, such as managing certificates and keys stored on the device
         </message>
+        <if expr="is_win">
+          <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_WIN" desc="Permission string for enterprise private reporting permission on Windows.">
+            Read information about your browser, OS, device, installed software, registry values and files
+          </message>
+        </if>
+        <if expr="is_macosx or is_linux">
+          <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
+            Read information about your browser, OS, device, installed software and files
+          </message>
+        </if>
         <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE" desc="Permission string for enterprise private reporting permission.">
           Read information about your browser, OS, and device
         </message>
+        <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REMOTE_APPS" desc="Permission string for access to the Remote Apps Enterprise API.">
+          Add remote apps to the ChromeOS launcher
+        </message>
         <if expr="reven">
           <message name="IDS_EXTENSION_PROMPT_WARNING_CHROMEOS_DIAGNOSTICS" desc="Permission string for chrome.os.diagnostcs API.">
             Run ChromeOS Flex diagnostic tests.
@@ -5392,8 +5484,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_COMPONENTS_EVT_STATUS_UPDATED" desc="Service Status">
         Component updated
       </message>
-      <message name="IDS_COMPONENTS_EVT_STATUS_NOTUPDATED" desc="Service Status">
-        Component not updated
+      <message name="IDS_COMPONENTS_EVT_STATUS_ALREADY_UP_TO_DATE" desc="Service Status">
+        Component already up to date
       </message>
       <message name="IDS_COMPONENTS_EVT_STATUS_UPDATE_ERROR" desc="Service Status">
         Update error
@@ -6304,6 +6396,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <ph name="BREAK">&lt;br&gt;</ph>
         You can manage settings from the card menu or see more options in Customize Brave.
       </message>
+      <message name="IDS_NTP_MODULES_RECIPE_EXTENDED_INFO" desc="Text shown in the body of the info dialog of the recipe module for Recipes V1.1.">
+        You’re seeing recipes based on your recent Search activity for recipes.
+        <ph name="BREAK">&lt;br&gt;</ph>
+        <ph name="BREAK">&lt;br&gt;</ph>
+        You can manage settings from the card menu or see more options in Customize Brave.
+      </message>
       <message name="IDS_NTP_MODULES_RECIPE_TASKS_SENTENCE" desc="Name of the recipe tasks module in sentence case shown in various UIs.">
         Recipe ideas
       </message>
@@ -6550,6 +6648,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_NTP_MODULES_FIRST_RUN_EXPERIENCE_OPT_OUT_TOAST" desc="Opt out toast for Modular NTP Desktop v1 First Run Experience.">
        You won't see cards on this page again
       </message>
+      <message name="IDS_NTP_MODULES_FEED_TITLE" desc="Title shown in the header of the Following feed NTP module on the new tab page showing updates from sites followed by the user.">
+        Following
+      </message>
 
       <!-- Extensions NTP Middle Slot Promo -->
       <message name="IDS_EXTENSIONS_PROMO_PERFORMANCE">
@@ -6665,12 +6766,27 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_SIDE_PANEL_TITLE" desc="Title of the Side Panel">
         Side Panel
       </message>
+      <message name="IDS_SIDE_PANEL_COMBO_BOX_GOOGLE_LENS_LABEL" desc="The name of the Google Lens in the side panel combo box">
+        Google Lens
+      </message>
 
       <!-- Read Anything strings -->
       <!-- TODO(crbug.com/1266555): Add final strings and make them translateable. -->
       <message name="IDS_READ_ANYTHING_TITLE" desc="Title of the Read Anything feature, which gives users an accessible reading experience." translateable="false">
         Read anything
       </message>
+      <message name="IDS_READ_ANYTHING_TOOLBAR_LABEL" desc="Accessibility label for the text formatting toolbar of the Read Anything feature." translateable="false">
+        Text formatting
+      </message>
+      <message name="IDS_READ_ANYTHING_FONT_NAME_COMBOBOX_LABEL" desc="Accessibility label for the font name combobox of the Read Anything feature." translateable="false">
+        Font
+      </message>
+      <message name="IDS_READ_ANYTHING_DECREASE_FONT_SIZE_BUTTON_LABEL" desc="Accessibility label for the decrease font size button of the Read Anything feature." translateable="false">
+        Decrease font-size
+      </message>
+      <message name="IDS_READ_ANYTHING_INCREASE_FONT_SIZE_BUTTON_LABEL" desc="Accessibility label for the increase font size button of the Read Anything feature." translateable="false">
+        Increase font-size
+      </message>
 
       <!-- User note strings -->
       <message name="IDS_USER_NOTE_TITLE" desc="Title of the User note feature, which gives users access to private user notes.">
@@ -6794,7 +6910,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Open with
         </message>
         <message name="IDS_INTENT_PICKER_BUBBLE_VIEW_REMEMBER_SELECTION" desc="Message contained in a checkbox that must be marked in order for the intent picker to not be shown again for a similar URL.">
-          Remember my choice
+          Remember this choice
         </message>
         <message name="IDS_INTENT_PICKER_BUBBLE_VIEW_OPEN" desc="Message contained in a button to continue the navigation in an app selected by the user.">
           Open
@@ -6808,9 +6924,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_INTENT_CHIP_OPEN_IN_APP" desc="The label of a button or dialog to open the current webpage in an installed app.">
           Open in app
         </message>
-        <message name="IDS_INTENT_CHIP_IPH" desc="The text for the In-Product Help bubble for the Intent Chip.">
-          Open websites in apps installed on your device
-        </message>
 
         <if expr="chromeos_ash or chromeos_lacros">
           <then>
@@ -6823,11 +6936,17 @@ Keep your key file in a safe place. You will need it to create new versions of y
             <message name="IDS_INTENT_PICKER_SELECT_AN_APP_SUBTITLE" desc="The subtitle of a dialog containing a list of installed applications. The dialog allows the user to select an app to open a web link.">
               Select an app on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> to open this link
             </message>
+            <message name="IDS_INTENT_CHIP_IPH_CHROME_OS" desc="The text for the In-Product Help bubble for the Intent Chip on ChromeOS devices.">
+              Open websites in apps installed on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
+            </message>
           </then>
           <else>
             <message name="IDS_INTENT_PICKER_SELECT_AN_APP_GENERIC_SUBTITLE" desc="The subtitle of a dialog containing a list of installed applications. The dialog allows the user to select an app to open a web link.">
               Select an app on your device to open this link
             </message>
+            <message name="IDS_INTENT_CHIP_IPH_GENERIC" desc="The text for the In-Product Help bubble for the Intent Chip.">
+              Open websites in apps installed on your device
+            </message>
           </else>
         </if>
       </if>
@@ -6848,6 +6967,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_ACCNAME_FULLSCREEN" desc="The accessible name of the fullscreen button in the new merged menu">
         Full screen
       </message>
+      <message name="IDS_ACCNAME_EXIT_FULLSCREEN" desc="The accessible name of the exit fullscreen button in the new merged menu">
+        Exit full screen
+      </message>
       <message name="IDS_ACCNAME_HOME" desc="The accessible name for the home button">
         Home
       </message>
@@ -6932,6 +7054,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_ACCNAME_EXTENSIONS_MENU_SITE_ACCESS_COMBOBOX" desc="The accessible name for the extension's site access combobox in the extensions menu.">
         Site Access Option
       </message>
+      <message name="IDS_ACCNAME_WEB_APP_DETAILED_INSTALL_DIALOG_LEADING_SCROLL_BUTTON" desc="The accessible name for the web app detailed install dialog scroll left button.">
+        Scroll backward
+      </message>
+      <message name="IDS_ACCNAME_WEB_APP_DETAILED_INSTALL_DIALOG_TRAILING_SCROLL_BUTTON" desc="The accessible name for the web app detailed install dialog scroll right button.">
+        Scroll forward
+      </message>
 
       <!-- Clipboard permission -->
       <message name="IDS_ALLOWED_CLIPBOARD_TITLE" desc="Title of the info bubble shown when a site has been allowed access to read the contents of the system clipboard.">
@@ -7290,9 +7418,6 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
         <message name="IDS_PASSWORD_MANAGER_TOOLTIP_MOVE" desc="Text for the 'Manage Passwords' icon's 'move password to account' state">
           Move your password
         </message>
-        <message name="IDS_PASSWORD_MANAGER_IMPORT_BUTTON" desc="The label of the button for importing passwords. The button appears next to the list of saved passwords in Brave's settings.">
-          Import
-        </message>
         <message name="IDS_PASSWORD_MANAGER_IMPORT_DIALOG_TITLE" desc="The title of the file selection dialog for importing passwords">
           Import Passwords To Brave
         </message>
@@ -8078,6 +8203,12 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
       <message name="IDS_TAB_SEARCH_EXPAND_RECENTLY_CLOSED_ITEMS" desc="The label for the button that toggles showing the recently closed items list section.">
         Toggle Recently Closed Items
       </message>
+      <message name="IDS_TAB_SEARCH_EXPAND_RECENTLY_CLOSED" desc="The tooltip for the RECENTLY CLOSED button when it's collapsed">
+        Expand recently closed
+      </message>
+      <message name="IDS_TAB_SEARCH_COLLAPSE_RECENTLY_CLOSED" desc="The tooltip for the RECENTLY CLOSED button when it's expanded">
+        Collapse recently closed
+      </message>
 
       <!-- Strings for Window Titles in Menus -->
       <if expr="not use_titlecase">
@@ -8542,8 +8673,11 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
        <message name="IDS_SEND_TAB_TO_SELF_MANAGE_DEVICES_LINK" desc="Text with a link to a page where the user can manage the devices they can share a tab to.">
         <ph name="BEGIN_LINK">$1</ph>Your devices<ph name="END_LINK">$2</ph> · <ph name="EMAIL">$3<ex>foo@gmail.com</ex></ph>
       </message>
-      <message name="IDS_SEND_TAB_TO_SELF_PROMO_LABEL" desc="Text in UI promoting send tab to self. Signed out users see this text and a sign-in button. Signed in users with no valid target device see just the text.">
-        You can send tabs between devices that are signed in with the same Brave sync chain
+      <message name="IDS_SEND_TAB_TO_SELF_SIGN_IN_PROMO_LABEL" desc="Text when a signed out user attempts to use send-tab-to-self, then sees a sign-in promo.">
+        To send this tab to another device, sign in to Brave on both devices
+      </message>
+      <message name="IDS_SEND_TAB_TO_SELF_NO_TARGET_DEVICE_LABEL" desc="Text shown when a user with no available target devices attempts to use send-tab-to-self.">
+        To send this tab to another device, sign in to Brave there
       </message>
 
       <!-- Share via QR Code strings -->
@@ -9267,9 +9401,6 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
         <message name="IDS_SYNC_CONFIRMATION_TITLE_LACROS_NON_FORCED" desc="Title of the sync confirmation dialog/screen on lacros when sync is not forced.">
           Turn on Brave browser sync?
         </message>
-        <message name="IDS_SYNC_CONFIRMATION_TITLE_LACROS" desc="Title of the sync confirmation dialog/screen on lacros.">
-          Brave browser sync is on
-        </message>
         <message name="IDS_SYNC_CONFIRMATION_SYNC_INFO_TITLE_LACROS" desc="Text in the information about sync on the sync confirmation dialog/screen on lacros.">
           Your bookmarks, passwords, history, and more are synced on all your devices
         </message>
@@ -9326,6 +9457,12 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
         <message name="IDS_SIGNIN_DICE_WEB_INTERCEPT_CREATE_BUBBLE_TITLE_V2" desc="Title of the web signin interception bubble. 'Separate' is an action verb. The prompt is shown to let the user choose to keep the browsing activity for a new account in the same profile as an existing one or to move it to a new profile.">
           Separate your browsing?
         </message>
+        <message name="IDS_SIGNIN_DICE_WEB_INTERCEPT_MANAGED_DISCLAIMER" desc="Enterprise disclaimer for a managed account in the signin interception bubble.">
+          This new profile will be managed by your organization. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank"&gt;<ex>https://help.google.com/articleLink</ex></ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
+        </message>
+        <message name="IDS_SIGNIN_DICE_WEB_INTERCEPT_MANAGED_BY_DISCLAIMER" desc="Enterprise disclaimer for a managed account in the signin interception bubble, with the manager domain name.">
+          This new profile will be managed by <ph name="DOMAIN">$1<ex>example.com</ex></ph>. <ph name="BEGIN_LINK">&lt;a href="$2" target="_blank"&gt;<ex>https://help.google.com/articleLink</ex></ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
+        </message>
       </if>
 
       <if expr="not chromeos_ash and not is_android">
@@ -9848,6 +9985,9 @@ Please help our engineers fix this problem. Tell us what happened right before y
           <message name="IDS_TRANSLATE_BUBBLE_ADVANCED_SOURCE" desc="Text to show as the title in the advanced source language view for TAB UI">
             Page language to translate
           </message>
+          <message name="IDS_PARTIAL_TRANSLATE_BUBBLE_TRANSLATE_FULL_PAGE" desc="Text to show for the partial translate bubble button to start a full page translation">
+            Translate full page
+          </message>
         </if>
         <if expr="use_titlecase">
           <message name="IDS_TRANSLATE_BUBBLE_ADVANCED_BUTTON" desc="In Title Case: Text to show for the translate bubble button to jump to the advanced panel.">
@@ -9904,6 +10044,9 @@ Please help our engineers fix this problem. Tell us what happened right before y
           <message name="IDS_TRANSLATE_BUBBLE_ADVANCED_SOURCE" desc="In Title Case: Text to show as the title in the advanced source language view for TAB UI">
             Page Language to Translate
           </message>
+          <message name="IDS_PARTIAL_TRANSLATE_BUBBLE_TRANSLATE_FULL_PAGE" desc="Text to show for the partial translate bubble button to start a full page translation">
+            Translate Full Page
+          </message>
         </if>
         <message name="IDS_TRANSLATE_BUBBLE_RESET" desc="Text to show for the language combobox to revert to its original state in the advanced view under TAB UI">
             Reset
@@ -9979,6 +10122,9 @@ Please help our engineers fix this problem. Tell us what happened right before y
         <message name="IDS_NOTIFICATION_QUIET_PERMISSION_INFOBAR_ABUSIVE_MESSAGE" desc="Description for the expanded infobar that informs the user that notifications are automatically blocked because the site is known to employ dark patterns to trick users into accepting the permission.">
           This site may be trying to trick you into allowing intrusive notifications.
         </message>
+        <message name="IDS_NOTIFICATION_QUIET_PERMISSION_INFOBAR_DISRUPTIVE_MESSAGE" desc="Description for the expanded infobar that informs the user that loud notification prompts are  blocked because the site may engage in disruptive notification practices.">
+          Notifications from this site may be disruptive
+        </message>
       </if>
 
       <!-- Mac AppleScript -->
@@ -11596,18 +11742,22 @@ Please help our engineers fix this problem. Tell us what happened right before y
     </if>
 
     <!-- Framebust / Blocked Redirection intervention message -->
-    <if expr="not is_android">
-      <!-- Android strings are declared in android_chrome_strings.grd. -->
-      <message name="IDS_REDIRECT_BLOCKED_MESSAGE" desc="The message stating that a redirect (noun) was blocked on this page. This will be followed on a separate line with the address the user was being redirected to.">
-        Redirect blocked:
-      </message>
-      <message name="IDS_REDIRECT_BLOCKED_TITLE" desc="The short message stating that a redirect (noun) was blocked on this page. Same as IDS_REDIRECT_BLOCKED_SHORT_MESSAGE but without the period.">
-         Redirect blocked
-      </message>
-      <message name="IDS_REDIRECT_BLOCKED_TOOLTIP" desc="Tooltip text that appears when the user hovers over the &quot;Redirect blocked&quot; icon in the address bar. It means that a redirect (noun) was blocked by Brave on this page.">
-         Redirect blocked on this page.
-      </message>
-    </if>
+    <!-- Android strings are declared in android_chrome_strings.grd. -->
+    <message name="IDS_REDIRECT_BLOCKED_MESSAGE" desc="The message stating that a redirect (noun) was blocked on this page. This will be followed on a separate line with the address the user was being redirected to.">
+      Redirect blocked:
+    </message>
+    <message name="IDS_REDIRECT_BLOCKED_TITLE" desc="The short message stating that a redirect (noun) was blocked on this page. Same as IDS_REDIRECT_BLOCKED_SHORT_MESSAGE but without the period.">
+        Redirect blocked
+    </message>
+    <message name="IDS_REDIRECT_BLOCKED_TOOLTIP" desc="Tooltip text that appears when the user hovers over the &quot;Redirect blocked&quot; icon in the address bar. It means that a redirect (noun) was blocked by Brave on this page.">
+        Redirect blocked on this page.
+    </message>
+    <message name="IDS_ALWAYS_ALLOW_REDIRECTS" desc="The message button text allowing a user to always allow redirects (noun) after they were blocked on this page.">
+      Always allow
+    </message>
+    <message name="IDS_OPEN_REDIRECT" desc="Dropdown menu button that allows a user to go to the redirected page once, but continue blocking subsequent attempts on the site.">
+      Open Anyway
+    </message>
 
     <!-- Windows 10 toast strings -->
     <if expr="is_win">
@@ -11931,6 +12081,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
       <message name="IDS_WEBAUTHN_BLUETOOTH_POWER_ON_MANUAL_NEXT" desc="Button text. The user clicks this once they manually turned on Bluetooth, so that Brave would retry connecting to security keys over Bluetooth.">
         Try again
       </message>
+
+      <if expr="is_macosx">
+        <message name="IDS_WEBAUTHN_BLUETOOTH_PERMISSION" desc="Body text in a dialog that appears when the user has requested some function that depends on Bluetooth, but Brave doesn't have permission to use Bluetooth. The action on this dialog is a button that will open the macOS System Preferences so that the user can grant permission.">
+          Brave needs permission to use Bluetooth to connect to your device
+        </message>
+      </if>
+
       <message name="IDS_WEBAUTHN_TRANSPORT_POPUP_LABEL" desc="Menu item text. The user selects this to verify their identity on a web site (i.e. sign in) using a different hardware-based authentication mechanism from what they have selected previously.">
         Choose another option
       </message>
@@ -12382,6 +12539,27 @@ Please help our engineers fix this problem. Tell us what happened right before y
       Open now
     </message>
 
+    <!-- Tailored security dialog for consented primary accounts -->
+    <message name="IDS_TAILORED_SECURITY_ENABLED_DIALOG_TITLE" desc="Title shown in the tab dialog when the account tailored security setting changes for a consented primary account">
+      Enhanced Safe Browsing is on
+    </message>
+    <message name="IDS_TAILORED_SECURITY_DISABLED_DIALOG_TITLE" desc="Title shown in the tab dialog when the account tailored security setting changes for a consented primary account">
+      Enhanced Safe Browsing is off
+    </message>
+
+    <message name="IDS_TAILORED_SECURITY_ENABLED_DIALOG_MAIN_TEXT" desc="Title shown in the tab dialog when the account tailored security setting changes for a consented primary account">
+      You have Brave's strongest security against dangerous websites, downloads and extensions
+    </message>
+    <message name="IDS_TAILORED_SECURITY_DISABLED_DIALOG_MAIN_TEXT" desc="Title shown in the tab dialog when the account tailored security setting changes for a consented primary account">
+      You're getting standard security protection. To get more protection against dangerous websites, downloads, and extensions, turn on Enhanced Safe Browsing in Brave settings.
+    </message>
+    <message name="IDS_TAILORED_SECURITY_DISABLED_DIALOG_ACCEPT_BUTTON" desc="The text on the accept button in the tab modal dialog when the account tailored security setting is disabled for a consented primary account">
+      Got it
+    </message>
+    <message name="IDS_TAILORED_SECURITY_DIALOG_SETTINGS_BUTTON" desc="The text on the cancel button in the tab dialog when the account tailored security setting changes for a consented primary account">
+      Brave settings
+    </message>
+
     <!-- Tailored security dialog for unconsented primary accounts -->
     <message name="IDS_TAILORED_SECURITY_UNCONSENTED_MODAL_TITLE" desc="Title shown in the tab modal dialog when the account tailored security setting changes for an unconsented primary account">
       Also turn on Enhanced Safe Browsing for this Brave profile?
@@ -12780,6 +12958,18 @@ Please help our engineers fix this problem. Tell us what happened right before y
       <message name="IDS_INPUT_OVERLAY_CLOSE_MENU" desc="Accessibility name tied to the close button.">
         Close menu
       </message>
+      <message name="IDS_INPUT_OVERLAY_EDIT_INSTRUCTIONS" desc="Text presented via a toltip so the user knows how to interact and edit key-bindigs.">
+        Click on any key with your mouse, then press a keyboard key to customize
+      </message>
+      <message name="IDS_INPUT_OVERLAY_EDIT_MISSING_BINDING" desc="Text presented via a toltip so the user is aware of an incomplete key-binding.">
+        Key is missing. Press a keyboard key to customize
+      </message>
+      <message name="IDS_INPUT_OVERLAY_EDIT_RESERVED_KEYS" desc="Text informing the user about keys not available for binding.">
+        The following keys aren’t supported: Tab, Shift, Control, Escape, Caps lock, Volume
+      </message>
+      <message name="IDS_INPUT_OVERLAY_EDIT_FOCUSED_KEY" desc="Text informing the user on how to proceed while having a focused key.">
+        Press a keyboard key to customize
+      </message>
     </if>
 
     <!-- Privacy Sandbox Dialog strings -->
@@ -12792,8 +12982,8 @@ Please help our engineers fix this problem. Tell us what happened right before y
     <message name="IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BODY_HEADER_1" desc="1 of 2 subtitles on the page. We want to write for users who skim the page. That means that the page title, the sub titles, and the button label all work well together as a mini story: 1) Help us build a more private web How? 2) Limit sharing between sites 3) More control over the ads you see 4) Yes, I’ll try it">
       Limited sharing between sites
     </message>
-    <message name="IDS_PRIVACY_SANDBOX_BUBBLE_NOTICE_DESCRIPTION" desc="The body text of the bubble. * “ad spam”: spam related to web advertising">
-      Brave is exploring ways to limit ad spam, fraud, and sharing between sites. Brave also <ph name="ESTIMATE_INTERESTS_LINK">$1<ex>estimates your interests</ex></ph> that sites can use to show you ads. You can manage your interests in settings.
+    <message name="IDS_PRIVACY_SANDBOX_BUBBLE_NOTICE_DESCRIPTION" desc="The body text of the bubble.* “Brave is finding new ways”: “finding” is meant to convey a work in progress, like “build” in the title. The features are live and functional, but still in beta. So we want a verb that’s stronger than “exploring” but weaker than “launching”. * “reduce tracking”: This used to read “reduce cross-site tracking”, but we’ve dropped “cross-site” because it makes the idea unnecessarily complicated. * “estimate your interests”: Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “Then” is an important keyword. It suggests some amount of time later. The first step is that interests are generated. Later (minutes or weeks), a different site might request interests.">
+      Brave is finding new ways to reduce tracking and keep you even safer as you browse. Brave also <ph name="ESTIMATE_INTERESTS_LINK">$1<ex>estimates your interests</ex></ph> and enables you to manage them. Then, sites you visit can ask Brave for your interests to show you ads.
     </message>
     <message name="IDS_PRIVACY_SANDBOX_BUBBLE_NOTICE_SETTINGS_LINK" desc="The user can choose “Go to settings” to visit chrome://settings/privacySandbox. If they do, they’ll find the toggle on for Sandbox trials, which include everything they’ve read above. They can leave trials on or turn them off on this page. Choosing “Go to settings”, the user will navigate away from this page and won’t be able to return here.">
       Go to settings
@@ -12804,8 +12994,8 @@ Please help our engineers fix this problem. Tell us what happened right before y
     <message name="IDS_PRIVACY_SANDBOX_BUBBLE_NOTICE_DESCRIPTION_ESTIMATES_INTERESTS_LINK_A11Y_NAME" desc="The accessible text read for IDS_PRIVACY_SANDBOX_BUBBLE_NOTICE_DESCRIPTION_ESTIMATES_INTERESTS_LINK. * “estimate your interests”: Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). ">
       estimates your interests - Brave can estimate your interests
     </message>
-    <message name="IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BODY_DESCRIPTION_1" desc="* “restrict” means to lessen. We don’t want to suggest that we’re “eliminating” cross-site tracking. * “cross-site tracking”: An example: a user visits site A and then site B. Based on how third-party cookies work today, when that user later visits site C, site C can be aware that the user visited sites A and B, and can even have some sense for what they did on those sites. * “stop ad spam and fraud”:  This feature isn’t really related to restricting cross-site tracking but we combined these features in the same sentence / section for structural reasons.">
-      We’re exploring ways to restrict cross-site tracking while enabling sites to stop ad spam and fraud.
+    <message name="IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BODY_DESCRIPTION_1" desc="The description beneath the “Limited sharing between sites” subtitle. * “exploring” conveys that this is a work in progress. * “restrict” means to lessen. We don’t want to suggest that we’re “eliminating” cross-site tracking. * “tracking”: An example: a user visits site A and then site B. Based on how third-party cookies work today, when that user later visits site C, site C can be aware that the user visited sites A and B, and can even have some sense for what they did on those sites. * “stop ad spam and fraud”:  This feature isn’t really related to restricting cross-site tracking but we combined these features in the same sentence / section for structural reasons.">
+      We’re exploring ways to restrict tracking while enabling sites to stop ad spam and fraud.
     </message>
     <message name="IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BODY_HEADER_2" desc="2 of 2 subtitles on the page.That means that the page title, the sub titles, and the button label all work well together as a mini story: 1) Help us build a more private web How? 2) Limit sharing between sites 3) More control over the ads you see 4) Yes, I’ll try it">
       More control over the ads you see
@@ -12840,24 +13030,27 @@ Please help our engineers fix this problem. Tell us what happened right before y
 
     <!-- Automated Password Change on Desktop strings -->
     <if expr="not is_android">
-      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_TITLE" translateable="false" desc="The title for the Automated Password Change on Desktop onboarding dialog. The onboarding dialog is a modal dialog that is shown if a user has not previously consented to using Assistant features.">
+      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_TITLE" desc="The title for the Automated Password Change on Desktop onboarding dialog. The onboarding dialog is a modal dialog that is shown if a user has not previously consented to using Assistant features.">
         Let Brave Assistant help you change your password
       </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_DESCRIPTION" translateable="false" desc="The description / sub-title of the Automated Password Change on Desktop onboarding dialog.">
+      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_DESCRIPTION" desc="The description / sub-title of the Automated Password Change on Desktop onboarding dialog.">
         Brave Assistant in Brave can complete actions across websites for you
       </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_CONSENT_TEXT" translateable="false" desc="The description of what kind of data Brave will send and process in order to enable Automated Password Change. This is shown at the bottom of the onboarding dialog.">
-        To help you complete tasks, Brave will receive the URLs and contents of sites on which you use Assistant, as well as information you submit through Assistant. This information may be stored in your Brave sync chain. You can turn it off in Brave settings. <ph name="LEARN_MORE">$1<ex>Learn more</ex></ph>
+      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_CONSENT_TEXT" desc="The description of what kind of data Brave will send and process in order to enable Automated Password Change. This is shown at the bottom of the onboarding dialog.">
+        To help you complete tasks, Brave will receive the URLs and contents of sites on which you use Assistant, as well as information you submit through Assistant. This information may be stored in your Brave sync chain. You can turn off Assistant in Brave settings. <ph name="LEARN_MORE">$1<ex>Learn more</ex></ph>
       </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_LEARN_MORE" translateable="false" desc="The text displayed on a link on the onboarding dialog that a user can click to navigate to a Brave website with detailed information on how Automated Password Change on Desktop/ Assistant works and what data is collected.">
+      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_LEARN_MORE" desc="The text displayed on a link on the onboarding dialog that a user can click to navigate to a Brave website with detailed information on how Automated Password Change on Desktop/ Assistant works and what data is collected.">
         Learn more
       </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_BUTTON_CANCEL_TEXT" translateable="false" desc="The text on the button that declines the onboarding for Automated Password Change on Desktop.">
+      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_BUTTON_CANCEL_TEXT" desc="The text on the button that declines the onboarding for Automated Password Change on Desktop.">
         Cancel
       </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_BUTTON_ACCEPT_TEXT" translateable="false" desc="The text on the button that declines the onboarding for Automated Password Change on Desktop.">
+      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_ONBOARDING_BUTTON_ACCEPT_TEXT" desc="The text on the button that declines the onboarding for Automated Password Change on Desktop.">
         I agree
       </message>
+      <message name="IDS_AUTOFILL_ASSISTANT_PASSWORD_CHANGE_STARTING_SCREEN_TITLE" desc="The title shown on the side panel after an Automated Password Change flow has been started. This message is shown until the first response from a script is received that resets the initial state.">
+        Opening <ph name="URL">$1<ex>example.com</ex></ph>...
+      </message>
     </if>
   </messages>
 </release>
diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd
index 78a98817af35..2d1eae15ca42 100644
--- a/app/generated_resources_override.grd
+++ b/app/generated_resources_override.grd
@@ -331,6 +331,15 @@ are declared in tools/grit/grit_rule.gni.
         </message>
         </if>
 
+      <if expr="is_macosx">
+            </if>
+      <if expr="not is_macosx">
+        <if expr="not use_titlecase">
+            </if>
+          <if expr="use_titlecase">
+            </if>
+      </if>
+
       <if expr="not is_android">
         </if>
 
@@ -448,6 +457,10 @@ are declared in tools/grit/grit_rule.gni.
       <if expr="not use_titlecase">
         </if>
       <if expr="enable_extensions">
+        <if expr="is_win">
+          </if>
+        <if expr="is_macosx or is_linux">
+          </if>
         <if expr="reven">
           </if>
         <if expr="not reven">
@@ -984,9 +997,6 @@ are declared in tools/grit/grit_rule.gni.
     <if expr="is_win">
       </if>
 
-    <if expr="not is_android">
-      </if>
-
     <if expr="is_win">
       </if>
 
@@ -1007,6 +1017,9 @@ are declared in tools/grit/grit_rule.gni.
       </if>
 
     <if expr="toolkit_views">
+      <if expr="is_macosx">
+        </if>
+
       <message name="IDS_WEBAUTHN_PLATFORM_AUTHENTICATOR_OFF_THE_RECORD_INTERSTITIAL_DESCRIPTION" desc="Description of a dialog that asks for the user's permission to set up device-based sign-in (i.e. using their computer's biometric sensor or screen unlock/PIN) on a website while browsing in Private mode.">
          Sign-in data will be stored on this device after you exit Private mode. You'll be able to sign in to this website with your device again later.
       </message>
diff --git a/app/media_router_strings.grdp b/app/media_router_strings.grdp
index 092fc95a6414..62ac9dc3e00a 100644
--- a/app/media_router_strings.grdp
+++ b/app/media_router_strings.grdp
@@ -42,9 +42,6 @@
   <message name="IDS_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION" desc="Title of a menu item which, on click, toggles whether or not the Media Router action icon is always shown. When toggled off, the icon is shown only when the Media Router dialog is open or if there is an active local Media Route or an issue.">
     Always show icon
   </message>
-  <message name="IDS_MEDIA_ROUTER_REPORT_ISSUE" desc="Title of a menu item which, on click, opens a page to give feedback or report an issue with Chromecast integration.">
-    Report an issue
-  </message>
   <message name="IDS_MEDIA_ROUTER_SHOWN_BY_POLICY" desc="Title of a menu item, which indicates that the Media Router action icon was added to the toolbar by the policy enabled by the user's administrator.">
     Added by your administrator
   </message>
diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp
index 26fb6318e30b..801976ace2ca 100644
--- a/app/os_settings_search_tag_strings.grdp
+++ b/app/os_settings_search_tag_strings.grdp
@@ -1120,6 +1120,9 @@
   <message name="IDS_OS_SETTINGS_TAG_A11Y_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility (a.k.a. a11y) settings. Alternate phrase for: 'Accessibility settings'">
     A11y
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_ALT2" desc="Text for search result item which, when clicked, navigates the user to accessibility (a.k.a. a11y) settings. Alternate phrase for: 'Accessibility settings'">
+    Assistive technology
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_ALWAYS_SHOW_OPTIONS" desc="Text for search result item which, when clicked, navigates the user to accessibility (a.k.a. a11y) settings, with a toggle to enable/disable always showing accessibility options in the system menu. Alternate phrase for: 'Always show a11y options'">
     Always show accessibility options
   </message>
@@ -1132,27 +1135,63 @@
   <message name="IDS_OS_SETTINGS_TAG_A11Y_MANAGE_ALT1" desc="Text for search result item which, when clicked, navigates the user to manage accessibility (a.k.a. a11y) settings. Alternate phrase for: 'Manage accessibility features'">
     Manage a11y
   </message>
-  <message name="IDS_OS_SETTINGS_TAG_A11y_CHROMEVOX" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable BraveVox (spoken feedback).">
-    BraveVox (spoken feedback)
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_TEXT_TO_SPEECH_PAGE" desc="Text for search result item which, when clicked, navigates the user to text-to-speech accessibility settings. Alternate phrase for: 'TTS'">
+    Text-to-speech
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_TEXT_TO_SPEECH_PAGE_ALT1" desc="Text for search result item which, when clicked, navigates the user to text-to-speech accessibility settings. Alternate phrase for: 'Text-to-speech'">
+    Automatic reading
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_TEXT_TO_SPEECH_PAGE_ALT2" desc="Text for search result item which, when clicked, navigates the user to text-to-speech accessibility settings. Alternate phrase for: 'Text-to-speech'">
+    Read aloud
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_TEXT_TO_SPEECH_PAGE_ALT3" desc="Text for search result item which, when clicked, navigates the user to text-to-speech accessibility settings. Alternate phrase for: 'Text-to-speech'">
+    Low vision speech tools
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_TEXT_TO_SPEECH_PAGE_ALT4" desc="Text for search result item which, when clicked, navigates the user to text-to-speech accessibility settings. Alternate phrase for: 'Text-to-speech'">
+    Speech synthesis
   </message>
-  <message name="IDS_OS_SETTINGS_TAG_A11y_CHROMEVOX_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable BraveVox (spoken feedback). Alternate phrase for: 'BraveVox (spoken feedback)'">
+  <message name="IDS_OS_SETTINGS_TAG_A11y_CHROMEVOX" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable ChromeVox (spoken feedback).">
+    ChromeVox (spoken feedback)
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11y_CHROMEVOX_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable ChromeVox (spoken feedback). Alternate phrase for: 'ChromeVox (spoken feedback)'">
     Screen reader
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11y_CHROMEVOX_ALT2" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable ChromeVox (spoken feedback). Alternate phrase for: 'ChromeVox (spoken feedback)'">
+    Braille
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_CURSOR_COLOR" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable custom cursor colors.">
-   Cursor color
+    Cursor color
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_CURSOR_COLOR_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable custom cursor colors. Alternate phrase for: 'Cursor color'">
+    Mouse color
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_CURSOR_COLOR_ALT2" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable custom cursor colors. Alternate phrase for: 'Cursor color'">
+    Pointer color
   </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_SELECT_TO_SPEAK" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable select-to-speak (hearing text read aloud after it is selected).">
     Select-to-speak
   </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_TEXT_TO_SPEECH" desc="Text for search result item which, when clicked, navigates the user to text-to-speech voice accessibility settings. Alternate phrase for 'TTS'">
-    Text-to-speech
+    Text-to-speech voice settings
   </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_TEXT_TO_SPEECH_ALT1" desc="Text for search result item which, when clicked, navigates the user to text-to-speech voice accessibility settings. Alternate phrase for 'Text-to-speech'">
-    TTS
+    Spoken language
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_TEXT_TO_SPEECH_ALT2" desc="Text for search result item which, when clicked, navigates the user to text-to-speech voice accessibility settings. Alternate phrase for 'Text-to-speech'">
+    Speech engines
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_TEXT_TO_SPEECH_ALT3" desc="Text for search result item which, when clicked, navigates the user to text-to-speech voice accessibility settings. Alternate phrase for 'Text-to-speech'">
+    eSpeak
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_TEXT_TO_SPEECH_ALT4" desc="Text for search result item which, when clicked, navigates the user to text-to-speech voice accessibility settings. Alternate phrase for 'Text-to-speech'">
+    Preferred voice
   </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_SPEECH_RATE" desc="Text for search result item which, when clicked, navigates the user to text-to-speech voice accessibility settings, with a slider to set the speech rate.">
     Text-to-speech rate
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_SPEECH_RATE_ALT1" desc="Text for search result item which, when clicked, navigates the user to text-to-speech voice accessibility settings, with a slider to set the speech rate.">
+    Speech speed
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_SPEECH_PITCH" desc="Text for search result item which, when clicked, navigates the user to text-to-speech voice accessibility settings, with a slider to set the speech pitch.">
     Text-to-speech pitch
   </message>
@@ -1165,21 +1204,39 @@
   <message name="IDS_OS_SETTINGS_TAG_A11Y_SPEECH_ENGINES" desc="Text for search result item which, when clicked, navigates the user to text-to-speech voice accessibility settings, with the ability to view installed speech engine extensions.">
     Text-to-speech engines
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_DISPLAY_AND_MAGNIFICATION_PAGE" desc="Text for search result item which, when clicked, navigates the user to display and magnification accessibility settings. Alternate phrase for: 'Low vision display tools'">
+    Display and magnification
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_DISPLAY_AND_MAGNIFICATION_PAGE_ALT1" desc="Text for search result item which, when clicked, navigates the user to display and magnification accessibility settings. Alternate phrase for: 'Display and magnification'">
+    Low vision display tools
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_HIGH_CONTRAST" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable high-contrast mode.">
     High contrast mode
   </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_HIGH_CONTRAST_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable high-contrast mode. Alternate phrase for: 'High contrast mode'">
-    Inverted colors
+    Invert colors
   </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_FULLSCREEN_MAGNIFIER" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable full-screen magnification.">
     Fullscreen magnifier
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_FULLSCREEN_MAGNIFIER_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable full-screen magnification. Alternate phrase for: 'Fullscreen magnifier'">
+    Zoom
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_FULLSCREEN_MAGNIFIER_ALT2" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable full-screen magnification. Alternate phrase for: 'Fullscreen magnifier'">
+    Magnify screen
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_FULLSCREEN_MAGNIFIER_FOCUS_FOLLOWING" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable full-screen magnification keyboard focus-following.">
     Magnifier follows keyboard focus
   </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_DOCKED_MAGNIFIER" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable docked screen magnification.">
     Docked magnifier
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_DOCKED_MAGNIFIER_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable docked screen magnification. Alternate phrase for: 'Docked magnifier'">
+    Partial magnifier
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_KEYBOARD_AND_TEXT_INPUT_PAGE" desc="Text for search result item which, when clicked, navigates the user to display and magnification accessibility settings. Alternate phrase for: 'Low vision display tools'">
+    Keyboard and text input
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_STICKY_KEYS" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable sticky keys.">
     Sticky keys
   </message>
@@ -1192,24 +1249,85 @@
   <message name="IDS_OS_SETTINGS_TAG_A11Y_DICTATION_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable dictation (speak-to-type). Alternate phrase for: 'Dictation'">
     Speak-to-type
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_DICTATION_ALT2" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable dictation (speak-to-type). Alternate phrase for: 'Dictation'">
+    Speech-to-text
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_DICTATION_ALT3" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable dictation (speak-to-type). Alternate phrase for: 'Dictation'">
+    Speech recognition
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_DICTATION_ALT4" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable dictation (speak-to-type). Alternate phrase for: 'Dictation'">
+    Voice typing
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_HIGHLIGHT_KEYBOARD_FOCUS" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable highlighting the object with keyboard focus when it changes.">
     Highlight keyboard focus
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_HIGHLIGHT_KEYBOARD_FOCUS_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable highlighting the object with keyboard focus when it changes. Alternate phrase for: 'Highlight keyboard focus'">
+    Focus ring
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_HIGHLIGHT_TEXT_CARET" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable highlighting the text caret when it appears or moves.">
     Highlight text caret
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_HIGHLIGHT_TEXT_CARET_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable highlighting the text caret when it appears or moves. Alternate phrase for: 'Highlight text caret'">
+    Text cursor highlighter
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_CURSOR_AND_TOUCHPAD_PAGE" desc="Text for search result item which, when clicked, navigates the user to cursor and touchpad accessibility settings. Alternate phrase for: 'Mouse accessibility settings'">
+    Cursor and touchpad
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_CURSOR_AND_TOUCHPAD_PAGE_ALT1" desc="Text for search result item which, when clicked, navigates the user to cursor and touchpad accessibility settings. Alternate phrase for: 'Cursor and touchpad'">
+    Mouse accessibility settings
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_CURSOR_AND_TOUCHPAD_PAGE_ALT2" desc="Text for search result item which, when clicked, navigates the user to cursor and touchpad accessibility settings. Alternate phrase for: 'Cursor and touchpad'">
+    Pointer accessibility settings
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_AUTOMATICALLY_CLICK" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable automatically clicking when the cursor stops.">
     Automatically click when cursor stops
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_AUTOMATICALLY_CLICK_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable automatically clicking when the cursor stops. Alternate phrase for: 'Automatically click when cursor stops'">
+    Auto clicks
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_LARGE_CURSOR" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable a large mouse cursor.">
     Large cursor
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_LARGE_CURSOR_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable a large mouse cursor. Alternate phrase for: 'Large cursor'">
+    Show large mouse cursor
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_LARGE_CURSOR_ALT2" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable a large mouse cursor. Alternate phrase for: 'Large cursor'">
+    Big mouse cursor
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_LARGE_CURSOR_ALT3" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable a large mouse cursor. Alternate phrase for: 'Large cursor'">
+    Big pointer
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_LARGE_CURSOR_ALT4" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable a large mouse cursor. Alternate phrase for: 'Large cursor'">
+    Mouse size
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_HIGHLIGHT_CURSOR" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable highlighting the mouse cursor when it is moving.">
-    Highlight cursor when moving
+    Highlight mouse cursor when moving
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_HIGHLIGHT_CURSOR_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable highlighting the mouse cursor when it is moving. Alternate phrase for: 'Highlight mouse cursor when moving'">
+    Highlight pointer
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_HIGHLIGHT_CURSOR_ALT2" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable highlighting the mouse cursor when it is moving. Alternate phrase for: 'Highlight mouse cursor when moving'">
+    Circle pointer
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_HIGHLIGHT_CURSOR_ALT3" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable highlighting the mouse cursor when it is moving. Alternate phrase for: 'Highlight mouse cursor when moving'">
+    Circle cursor
   </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_TABLET_NAVIGATION_BUTTONS" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable showing navigation buttons (launcher, back, overview) in the shelf when the device is in tablet mode.">
     Tablet navigation buttons
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_AUDIO_AND_CAPTIONS_PAGE" desc="Text for search result item which, when clicked, navigates the user to audio and captions accessibility settings. Alternate phrase for: 'Subtitles'">
+    Audio and captions
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_AUDIO_AND_CAPTIONS_PAGE_ALT1" desc="Text for search result item which, when clicked, navigates the user to audio and captions accessibility settings. Alternate phrase for: 'Audio and captions'">
+    Subtitles
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_AUDIO_AND_CAPTIONS_PAGE_ALT2" desc="Text for search result item which, when clicked, navigates the user to audio and captions accessibility settings. Alternate phrase for: 'Audio and captions'">
+    Closed captions
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_AUDIO_AND_CAPTIONS_PAGE_ALT3" desc="Text for search result item which, when clicked, navigates the user to audio and captions accessibility settings. Alternate phrase for: 'Audio and captions'">
+    Text for audio
+  </message>
+
   <message name="IDS_OS_SETTINGS_TAG_A11Y_MONO_AUDIO" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable mono audio (the same sound with all speakers). Alternate phrase for: 'Same audio with all speakers'">
     Mono audio
   </message>
@@ -1219,12 +1337,18 @@
   <message name="IDS_OS_SETTINGS_TAG_A11Y_STARTUP_SOUND" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable playing a sound upon device startup.">
     Startup sound
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_STARTUP_SOUND_ALT1" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable playing a sound upon device startup. Alternate phrase for: 'Startup sound'">
+    Play sound on startup
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_CAPTIONS" desc="Text for search result item which, when clicked, navigates the user to accessibility caption preferences.">
     Caption preferences
   </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_LIVE_CAPTION" desc="Text for a search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable Live Caption.">
     Live Caption
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_A11Y_LIVE_CAPTION_ALT1" desc="Text for a search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable Live Caption. Alternate phrase for: 'Live Caption'">
+    Auto captions
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_A11Y_ENABLE_SWITCH_ACCESS" desc="Text for search result item which, when clicked, navigates the user to accessibility settings, with a toggle to enable/disable switch access, which allows users to control the computer with just one or two switches.">
     Switch access
   </message>
diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp
index e1058cd7ef8f..5dae2bf7a9d4 100644
--- a/app/os_settings_strings.grdp
+++ b/app/os_settings_strings.grdp
@@ -38,7 +38,7 @@
   </message>
 
   <!-- Settings Search Box -->
-  <message name="IDS_OS_SEARCH_RESULT_ROW_A11Y_RESULT_SELECTED" desc="BraveVox alert to indicate the position number of a selected result in a list of search results and the selected result text itself, and that the user can press enter to navigate to section described by the search result.">
+  <message name="IDS_OS_SEARCH_RESULT_ROW_A11Y_RESULT_SELECTED" desc="ChromeVox alert to indicate the position number of a selected result in a list of search results and the selected result text itself, and that the user can press enter to navigate to section described by the search result.">
     Search result <ph name="LIST_POSITION">$1<ex>1</ex></ph> of <ph name="LIST_SIZE">$2<ex>2</ex></ph>: <ph name="SEARCH_RESULT_TEXT">$3<ex>Network Settings</ex></ph>. Press Enter to navigate to section.
   </message>
 
@@ -911,7 +911,7 @@
     Show navigation buttons
   </message>
   <message name="IDS_SETTINGS_A11Y_TABLET_MODE_SHELF_BUTTONS_DESCRIPTION" desc="The description for the setting within accessibility settings that controls whether ChromeOS system shelf navigation buttons should be shown when the device is in tablet mode. The buttons whose visibility the setting controls are the button to go home (to launcher), the button to go back, and the button to go to overview.">
-    Navigate home, back, and switch apps with buttons in tablet mode. Turned on when BraveVox or Automatic clicks is enabled.
+    Navigate home, back, and switch apps with buttons in tablet mode. Turned on when ChromeVox or Automatic clicks is enabled.
   </message>
 
   <!-- A11y (OS Settings) -->
@@ -963,14 +963,14 @@
   <message name="IDS_SETTINGS_STICKY_KEYS_LABEL" desc="Label for checkbox which enables sticky keys, with an explanation of the term 'sticky keys'.">
       Enable sticky keys (to perform keyboard shortcuts by typing them sequentially)
   </message>
-  <message name="IDS_SETTINGS_CHROMEVOX_LABEL" desc="Label for checkbox which enables BraveVox, with a description of what BraveVox is.">
-      Enable BraveVox (spoken feedback)
+  <message name="IDS_SETTINGS_CHROMEVOX_LABEL" desc="Label for checkbox which enables ChromeVox, with a description of what ChromeVox is.">
+      Enable ChromeVox (spoken feedback)
   </message>
-  <message name="IDS_SETTINGS_CHROMEVOX_OPTIONS_LABEL" desc="Label for button to open BraveVox options.">
-      Open BraveVox settings
+  <message name="IDS_SETTINGS_CHROMEVOX_OPTIONS_LABEL" desc="Label for button to open ChromeVox options.">
+      Open ChromeVox settings
   </message>
-  <message name="IDS_SETTINGS_CHROMEVOX_TUTORIAL_LABEL" desc="Label for button to open BraveVox tutorial.">
-    Open BraveVox tutorial
+  <message name="IDS_SETTINGS_CHROMEVOX_TUTORIAL_LABEL" desc="Label for button to open ChromeVox tutorial.">
+    Open ChromeVox tutorial
   </message>
   <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL" desc="Label for checkbox which enables the fullscreen magnifier">
       Enable fullscreen magnifier
@@ -1524,6 +1524,36 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_ACCESSIBILITY_MANAGE_ACCESSIBILITY_FEATURES" desc="In the settings tab, the title of a link that opens a screen allowing the user to change accessibility features.">
     Manage accessibility features
   </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_TEXT_TO_SPEECH_LINK_TITLE" desc="In the settings tab, the title of a link that opens a screen allowing the user to change text-to-speech accessibility features.">
+    Text-to-Speech
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_TEXT_TO_SPEECH_LINK_DESCRIPTION" desc="In the settings tab, the description of a link that opens a screen allowing the user to change text-to-speech accessibility features.">
+    ChromeVox screen reader and select-to-speak
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_DISPLAY_AND_MAGNIFICATION_LINK_TITLE" desc="In the settings tab, the title of a link that opens a screen allowing the user to change display and magnification accessibility features.">
+    Display and magnification
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_DISPLAY_AND_MAGNIFICATION_LINK_DESCRIPTION" desc="In the settings tab, the description of a link that opens a screen allowing the user to change keyboard and text input accessibility features.">
+    High-contrast mode, magnifier, and display settings
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_KEYBOARD_AND_TEXT_INPUT_LINK_TITLE" desc="In the settings tab, the title of a link that opens a screen allowing the user to change keyboard and text input accessibility features.">
+    Keyboard and text input
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_KEYBOARD_AND_TEXT_INPUT_LINK_DESCRIPTION" desc="In the settings tab, the description of a link that opens a screen allowing the user to change keyboard and text input accessibility features.">
+    Sticky keys, on-screen keyboard, dictation, switch access, and enhanced highlight
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_CURSOR_AND_TOUCHPAD_LINK_TITLE" desc="In the settings tab, the title of a link that opens a screen allowing the user to change cursor and touchpad accessibility features.">
+    Cursor and touchpad
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_CURSOR_AND_TOUCHPAD_LINK_DESCRIPTION" desc="In the settings tab, the description of a link that opens a screen allowing the user to change cursor and touchpad accessibility features.">
+    Automatic click, cursor size, cursor color, and highlight cursor
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_AUDIO_AND_CAPTIONS_LINK_TITLE" desc="In the settings tab, the title of a link that opens a screen allowing the user to change audio and captions accessibility features.">
+    Audio and captions
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_AUDIO_AND_CAPTIONS_LINK_DESCRIPTION" desc="In the settings tab, the description of a link that opens a screen allowing the user to change audio and captions accessibility features.">
+    Mono audio, sounds on startup, and captions
+  </message>
 
   <!-- Account Manager (OS settings) -->
   <message name="IDS_SETTINGS_ACCOUNT_MANAGER_CHILD_DESCRIPTION_V2" desc="Description of the Account Manager Settings page for child users. Shown just below the title of the page.">
@@ -1844,7 +1874,7 @@ Press an assigned switch or key to remove assignment.
     Add playbook
   </message>
   <message name="IDS_SETTINGS_CROSTINI_PRECONFIGURED_CONTAINERS_ATTACH_PLAYBOOK_BUTTON_LABEL" desc="Label for button to attach an Ansible Playbook to preconfigure a Linux container.">
-    Apply playbook
+    Select playbook
   </message>
   <message name="IDS_SETTINGS_CROSTINI_ANSIBLE_PLAYBOOK_SELECT_DIALOG_TITLE" desc="The text used as the title for Ansible Playbook selection">
     Select an Ansible Playbook to add
@@ -2173,6 +2203,9 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_BLUETOOTH_DEVICE_DETAILS" desc="Name of the settings page which displays Bluetooth device details.">
     Bluetooth device details
   </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_SAVED_DEVICES" desc="Name of the settings page which displays Bluetooth saved devices.">
+   Devices saved to your account
+  </message>
   <message name="IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE" desc="Title of the settings dialog for adding or pairing Bluetooth a device.">
     Connect to Bluetooth device
   </message>
@@ -2186,7 +2219,7 @@ Press an assigned switch or key to remove assignment.
     Scan for new devices
   </message>
   <message name="IDS_BLUETOOTH_ENABLE_FAST_PAIR_SUBTITLE" desc="Subtitle that describes the toggle that enables Fast Pair on the Bluetooth settings page.">
-    Easily connect and set up devices close by
+    Easily connect and set up Fast Pair devices close by
   </message>
   <message name="IDS_SETTINGS_BLUETOOTH_ENABLED_A11Y_LABEL" desc="Bluetooth device details page: Accessibility announcement when Bluetooth state is enabled.">
     Bluetooth enabled
@@ -2194,6 +2227,12 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_BLUETOOTH_DISABLED_A11Y_LABEL" desc="Bluetooth device details page: Accessibility announcement when Bluetooth state is disabled.">
     Bluetooth disabled
   </message>
+  <message name="IDS_BLUETOOTH_SAVED_DEVICES_LABEL" desc="Label for the link row that directs to Saved Devices settings sub-page.">
+    Devices saved to your account
+  </message>
+  <message name="IDS_BLUETOOTH_SAVED_DEVICES_SUBTITLE" desc="Subtitle for the link row that directs to Saved Devices settings sub-page.">
+    Fast Pair devices saved to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com</ex></ph>
+  </message>
 
 
   <!-- Parental Controls -->
@@ -2216,6 +2255,17 @@ Press an assigned switch or key to remove assignment.
     Set up button
   </message>
 
+  <!-- Device audio page (OS settings) -->
+  <message name="IDS_SETTINGS_AUDIO_TITLE" desc="In Device Settings, the title of the audio settings subpage.">
+    Audio
+  </message>
+  <message name="IDS_SETTINGS_AUDIO_OUTPUT_TITLE" desc="In Device Settings, the title of the output section of the audio settings subpage.">
+    Output
+  </message>
+  <message name="IDS_SETTINGS_AUDIO_VOLUME_TITLE" desc="In Device Settings, the title of the volume row under the output section in audio settings subpage.">
+    Volume
+  </message>
+
   <!-- Device pointer page (OS settings) -->
   <message name="IDS_SETTINGS_MOUSE_TITLE" desc="In Device Settings, the title of the mouse settings subpage.">
     Mouse
@@ -2584,7 +2634,7 @@ Press an assigned switch or key to remove assignment.
   </message>
 
   <!-- Internet page (OS settings) -->
-  <message name="IDS_SETTINGS_INTERNET_ADD_CELLULAR" desc="The accessibility label for the add cellular icon at Settings &gt; Internet &gt; Add Cellular label. This text will not be visible, but will be announced when BraveVox is on and the user navigates to the icon. Clicking this icon will show a dialog that allows the user to activate a physical SIM or set up eSIM.">
+  <message name="IDS_SETTINGS_INTERNET_ADD_CELLULAR" desc="The accessibility label for the add cellular icon at Settings &gt; Internet &gt; Add Cellular label. This text will not be visible, but will be announced when ChromeVox is on and the user navigates to the icon. Clicking this icon will show a dialog that allows the user to activate a physical SIM or set up eSIM.">
     Add Cellular...
   </message>
   <message name="IDS_SETTINGS_INTERNET_ADD_CONNECTION" desc="Settings &gt; Internet &gt; Add connection expanding section label.">
@@ -3156,11 +3206,14 @@ Press an assigned switch or key to remove assignment.
     Set a PIN or password
   </message>
   <message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_SCREEN_LOCK_SUBTITLE" desc="The subtitle of the screen lock dialog containing the Phone Hub notification opt-in flow shown when the user has confirmed to enable the app stream that will stream phone to their Chromebook.">
-    This PIN or password protects your data on this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>, including any content you stream from your phone.
+    This PIN or password protects your data on this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>, including any information you access from your phone
   </message>
   <message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_SCREEN_LOCK_INSTRUCTION" desc="The instruction message of the screen lock dialog.">
     Choose either one each time you sign in
   </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_SCREEN_LOCK_ICON_INSTRUCTION" desc="The icon instruction message of the screen lock dialog.">
+    If Smart Lock is turned on, you won't need to enter a PIN or password
+  </message>
   <message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_INSTRUCTIONS" desc="The second paragraph of text shown in the dialog containing the Phone Hub notification opt-in flow. Alerts the user that to enable notifications, they need to have their phone unlocked, nearby, and with Bluetooth/Wi-Fi on to complete setup.">
     Make sure your phone is nearby, unlocked, and has Bluetooth and Wi-Fi turned on
   </message>
@@ -3254,11 +3307,35 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_NOTIFICATION_ACCESS_PROHIBITED_SUMMARY" desc="The text shown in the dialog containing the phone permissions opt-in flow when the phone's account notification streaming is prohibited.">
     You can't view your phone's notifications on this managed account. Try again with a different account. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
   </message>
-  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_COMPLETED_TITLE" desc="The title shown in the dialog containing the phone permissions opt-in flow when the feature is successfully turned on.">
-    Your phone and <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> are connected
+  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_ALL_COMPLETED_TITLE" desc="The title shown in the dialog containing the phone permissions opt-in flow when all features are successfully turned on.">
+    You can now view your phone's recent photos, media, notifications, and apps 
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_CAMERA_ROLL_AND_NOTIFICATIONS_COMPLETED_TITLE" desc="The title shown in the dialog containing the phone permissions opt-in flow when Phone Hub 'Recent photos' and 'Notifications' are successfully turned on.">
+    You can now view your phone's recent photos, media, and notifications
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_NOTIFICATIONS_AND_APPS_COMPLETED_TITLE" desc="The title shown in the dialog containing the phone permissions opt-in flow when Phone Hub 'Notifications' and 'Apps' are successfully turned on.">
+    You can now view your phone's notifications and apps
   </message>
-  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_COMPLETED_SUMMARY" desc="The text shown in the dialog containing the phone permissions opt-in flow. Alerts the user that dismiss notifications on the Chromebook will also dismiss them on the phone.">
-    Keep in mind, dismissing notifications on your Chromebook will also dismiss them on your phone
+  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_CAMERA_ROLL_AND_APPS_COMPLETED_TITLE" desc="The title shown in the dialog containing the phone permissions opt-in flow when Phone Hub 'Recent photos' and 'Apps' are successfully turned on.">
+    You can now view your phone's recent photos, media, and apps 
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_CAMERA_ROLL_COMPLETED_TITLE" desc="The title shown in the dialog containing the phone permissions opt-in flow when Phone Hub 'Recent photos' is successfully turned on.">
+    You can now view your phone's recent photos and media
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_NOTIFICATIONS_COMPLETED_TITLE" desc="The title shown in the dialog containing the phone permissions opt-in flow when Phone Hub 'Notifications' is successfully turned on.">
+    You can now view your phone's notifications 
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_APPS_COMPLETED_TITLE" desc="The title shown in the dialog containing the phone permissions opt-in flow when Phone Hub 'Apps' is successfully turned on.">
+    You can now view your phone's apps 
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_COMPLETED_MORE_FEATURES_SUMMARY" desc="The text shown in the dialog containing the phone permissions opt-in flow. Reminds users that some features have not been successfully turned on, and users can set it in the Phone Hub settings.">
+    You can set up more features in Phone Hub settings
+  </message> 
+  <message name="IDS_SETTINGS_MULTIDEVICE_PERMISSIONS_SETUP_DIALOG_COMPLETED_FAILED_TITLE" desc="The title shown in the dialog containing the phone permissions opt-in flow when permission was not successfully turned on.">
+    Permission still needed to complete setup 
+  </message>
+  <message name="IDS_SETTINGS_PHONE_HUB_LEARN_MORE_ARIA_LABEL" desc="The aria label (used by screen readers, not shown in UI) for the phone permissions opt-in flow.">
+    Learn more about Phone Hub
   </message>
 
   <!-- Lock Screen Page (OS settings) -->
@@ -4173,7 +4250,7 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_STORAGE_EXTERNAL_STORAGE_LIST_HEADER" desc="Header of the list of external storage devices for the subpage for setting preferences for external storage. This is shown when the list is not empty.">
     Available devices
   </message>
-  <message name="IDS_SETTINGS_STORAGE_OVERVIEW_ARIA_LABEL" desc="The label to be read aloud by BraveVox to describe the storage usage progress bar on the Storage page">
+  <message name="IDS_SETTINGS_STORAGE_OVERVIEW_ARIA_LABEL" desc="The label to be read aloud by ChromeVox to describe the storage usage progress bar on the Storage page">
     Storage Usage Overview
   </message>
   <message name="IDS_SETTINGS_STORAGE_ITEM_SYSTEM" desc="In Device Settings &gt; Storage, label for the total system size, difference between the size of the filesystem and the size of all items listed on the storage page.">
@@ -4248,9 +4325,18 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_OS_SETTINGS_PRIVACY_HUB_TITLE" desc="Text on the privacy page that opens up the privacy hub section.">
     Privacy Hub
   </message>
+  <message name="IDS_OS_SETTINGS_PRIVACY_HUB_CAMERA_HARDWARE_TOGGLE_ACTIVE_SUBTEXT" desc="Sub-label on the privacy page that indicates that the hardware camera toggle is active.">
+    Internal camera deactivated by hardware switch
+  </message>
   <message name="IDS_OS_SETTINGS_CAMERA_TOGGLE_TITLE" desc="The title of the toggle to enable/disable camera from the privacy hub.">
     Camera
   </message>
+  <message name="IDS_OS_SETTINGS_MICROPHONE_TOGGLE_TITLE" desc="The title of the toggle to enable/disable microphone from the privacy hub.">
+    Microphone
+  </message>
+  <message name="IDS_OS_SETTINGS_PRIVACY_HUB_MICROPHONE_HARDWARE_TOGGLE_ACTIVE_SUBTEXT" desc="Sub-label on the privacy page that indicates that the hardware microphone toggle is active.">
+    All microphones disabled by devices hardware switch
+  </message>
   <message name="IDS_OS_SETTINGS_HW_DATA_USAGE_TOGGLE_TITLE" desc="The label of the checkbox to enable/disable device hardware data collection and usage in ChromeOS Flex.">
     <ph name="DEVICE_OS">$1<ex>ChromeOS Flex</ex></ph> hardware support and stability
   </message>
diff --git a/app/profiles_strings.grdp b/app/profiles_strings.grdp
index 334b6425db32..3bca371a3339 100644
--- a/app/profiles_strings.grdp
+++ b/app/profiles_strings.grdp
@@ -667,9 +667,6 @@
       <message name="IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_SESSION_MANAGED_DESCRIPTION" desc="Disclaimer on the first profile creation screen, informing that the session is managed.">
         Your session is managed by your organization. Administrators can delete your profile and also monitor your network traffic.
       </message>
-      <message name="IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_SIGNIN_BUTTON_LABEL_LACROS" desc="Label for a button that prompts user to sign in">
-        Next
-      </message>
       <message name="IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_ACCOUNT_SELECTION_LACROS_TITLE" desc="Profile picker, account selection screen title">
         Choose an account
       </message>
diff --git a/app/settings_brave_strings.grdp b/app/settings_brave_strings.grdp
index a4a0f7234279..0b743bdcbd27 100644
--- a/app/settings_brave_strings.grdp
+++ b/app/settings_brave_strings.grdp
@@ -282,9 +282,12 @@
   </message>
 
     <!-- Autofill Assistant settings -->
-  <message name="IDS_SETTINGS_AUTOFILL_ASSISTANT_PREF" translateable="false" desc="The documentation string of the 'Use Brave Assistant' preference to help with automated flows on the web">
+  <message name="IDS_SETTINGS_AUTOFILL_ASSISTANT_PREF" desc="The documentation string of the 'Use Brave Assistant' preference to help with automated flows on the web">
     Brave Assistant in Brave
   </message>
+  <message name="IDS_SETTINGS_AUTOFILL_ASSISTANT_PREF_DESC" desc="The description of the 'Use Brave Assistant' preference to help with automated flows on the web">
+    Brave Assistant in Brave can complete actions across websites for you
+  </message>
 
   <!-- Languages Page -->
   <if expr="is_win">
@@ -307,4 +310,14 @@
   <message name="IDS_SETTINGS_RESET_PROFILE_FEEDBACK" desc="Feedback label in the Reset Profile Settings dialog">
     Help make Brave better by reporting the <ph name="BEGIN_LINK">&lt;a is="action-link" target="_blank"&gt;</ph>current settings<ph name="END_LINK">&lt;/a&gt;</ph>
   </message>
+
+  <!-- Brave Root Store -->
+  <if expr="chrome_root_store_supported">
+    <message name="IDS_SETTINGS_CHROME_CERTIFICATES" desc="Text for manage certificates button in Privacy options">
+      Certificates managed by Brave
+    </message>
+    <message name="IDS_SETTINGS_CHROME_CERTIFICATES_DESCRIPTION" desc="Secondary, continued explanation of how to manage SSL certificates and settings in Privacy options">
+      Information about how Brave manages its root certificates
+    </message>
+  </if>
 </grit-part>
diff --git a/app/settings_brave_strings_override.grdp b/app/settings_brave_strings_override.grdp
index c78a686c0617..291092232a91 100644
--- a/app/settings_brave_strings_override.grdp
+++ b/app/settings_brave_strings_override.grdp
@@ -34,4 +34,6 @@
   <if expr="not chromeos_ash">
     </if>
 
-  </grit-part>
+  <if expr="chrome_root_store_supported">
+    </if>
+</grit-part>
diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp
index 42e2af636760..03bd17a9e2bd 100644
--- a/app/settings_strings.grdp
+++ b/app/settings_strings.grdp
@@ -33,6 +33,9 @@
     <message name="IDS_SETTINGS_ABOUT_PAGE_REPORT_AN_ISSUE" desc="Text of the button which allows the user to report an issue with Brave.">
       Report an issue
     </message>
+    <message name="IDS_SETTINGS_ABOUT_PAGE_SEND_FEEDBACK" desc="Text of the button which allows the user to send feedback with Brave.">
+      Send feedback
+    </message>
   </if>
   <if expr="is_macosx">
     <message name="IDS_ABOUT_CHROME_AUTOUPDATE_ALL" desc="The 'Automatically update Brave for all users.' button in the About window.  Mac-only.">
@@ -160,6 +163,15 @@
   <message name="IDS_SETTINGS_SHOW_BOOKMARKS_BAR" desc="Label for the checkbox which enables or disables showing the bookmarks bar in the toolbar.">
     Show bookmarks
   </message>
+  <message name="IDS_SETTINGS_SIDE_PANEL" desc="Title for the side panel section. Allows the user to toggle which side the side panel is displayed on.">
+    Side panel
+  </message>
+  <message name="IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT" desc="Label for the button that allows the side panel to appear on the left side of the browser. Translate this verbatim, do not localize for RTL languages.">
+    Show on left
+  </message>
+  <message name="IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT" desc="Label for the button that allows the side panel to appear on the right side of the browser. Translate this verbatim, do not localize for RTL languages.">
+    Show on right
+  </message>
   <message name="IDS_SETTINGS_HOME_PAGE_NTP" desc="Description of the New Tab Page when set as the home page.">
     New Tab page
   </message>
@@ -515,9 +527,6 @@
   <message name="IDS_SETTINGS_REMOVE_COMPROMISED_PASSWORD_CONFIRMATION_DESCRIPTION" desc="Compromised password remove dialog conformation description">
     Removing this password will not delete your account on <ph name="DOMAIN">$1<ex>airbnb.com</ex></ph>. Change your password or delete your account on <ph name="DOMAIN_LINK">$2<ex>&lt;a href="https://airbnb.com" target="_blank"&gt;airbnb.com&lt;/a&gt;</ex></ph> to keep it safe from others.
   </message>
-  <message name="IDS_SETTINGS_COMPROMISED_EDIT_PASSWORD_SITE" desc="A label for the field, which displays the site for which the password was saved. The field is part of a dialog, which allows the user to edit the password.">
-    Site
-  </message>
   <message name="IDS_SETTINGS_COMPROMISED_EDIT_PASSWORD_APP" desc="A label for the field, which displays the app for which the password was saved. The field is part of a dialog, which allows the user to edit the password.">
     App
   </message>
@@ -748,6 +757,18 @@
   <message name="IDS_SETTINGS_PASSWORDS_OPT_OUT_ACCOUNT_STORAGE_LABEL" desc="Label for a button in the passwords section of settings which triggers opt out of the account-scoped password storage.">
     Remove from device
   </message>
+  <message name="IDS_SETTINGS_PASSWORDS_IMPORT_MENU_ITEM" desc="A menu item in the More Actions menu above the password list in Brave's settings. Selecting this action will open a dialog, through which the user can import passwords.">
+    Import passwords
+  </message>
+  <message name="IDS_SETTINGS_PASSWORDS_IMPORT_TITLE" desc="The title of a dialog, which offers the ability for the user to import passwords into Brave Password Manager.">
+    Import passwords
+  </message>
+  <message name="IDS_SETTINGS_PASSWORDS_IMPORT_CHOOSE_FILE" desc="A button in the dialog for importing passwords from Brave. Passwords will be imported from the file, which the user will be asked to choose after initiating this action.">
+    Choose file
+  </message>
+  <message name="IDS_SETTINGS_PASSWORDS_IMPORT_DESCRIPTION_GENERIC" desc="Text shown to the user on the dialog for importing passwords, before the user has chosen the file to import passwords from.">
+    To import passwords, select a CSV file.
+  </message>
   <message name="IDS_SETTINGS_PASSWORDS_EXPORT_MENU_ITEM" desc="A menu item in the More Actions menu above the password list in Brave's settings. Selecting this action will open a dialog, through which the user can export their passwords outside of Brave.">
     Export passwords...
   </message>
@@ -994,7 +1015,7 @@
     <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_WRITE_ERROR_FORMAT" desc="The text in the error dialog for PKCS #12 file write errors.">
       There was an error while trying to write the file: <ph name="ERROR_TEXT">$1<ex>Permission denied.</ex></ph>.
     </message>
-    <if expr="chromeos_ash">
+    <if expr="chromeos_ash or chromeos_lacros">
       <message name="IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_LIST_HEADER" desc="Header that lists the certificate provisioning processes.">
         Certificates are being provisioned for these certificate profiles
       </message>
@@ -1229,6 +1250,11 @@
   <message name="IDS_SETTINGS_LANGUAGES_PAGE_TITLE" desc="Name of the settings page which displays language preferences.">
     Languages
   </message>
+  <if expr="not chromeos_ash">
+    <message name="IDS_SETTINGS_LANGUAGES_CARD_TITLE" desc="Name of the card which manages language preferences.">
+      Preferred languages
+    </message>
+  </if>
   <message name="IDS_SETTINGS_LANGUAGE_SEARCH" desc="Placeholder/label for the text input field that allows a user to filter languages.">
     Search languages
   </message>
@@ -1293,6 +1319,9 @@
     <message name="IDS_SETTINGS_LANGUAGES_SPELL_CHECK_ENHANCED_DESCRIPTION" desc="Description for the type of spell check that sends the text the user types to Brave for spelling suggestions. It is important that it is communicated that the text the user types in the browser will be sent to Brave.">
       Uses the same spell checker that’s used in Brave search. Text you type in the browser is sent to Brave.
     </message>
+    <message name="IDS_SETTINGS_LANGUAGES_OFFER_TO_ENABLE_SPELL_CHECK" desc="The label of the toggle that enables the spell check service.">
+      Check for spelling errors when you type text on web pages
+    </message>
     <if expr="not is_macosx">
       <message name="IDS_SETTING_LANGUAGES_SPELL_CHECK_DISABLED_REASON" desc="Text that indicates to the user that spell check options are disabled because none of the languages they have added have spell check support.">
         Spell check isn’t supported for the languages you selected
@@ -1963,6 +1992,14 @@
   <message name="IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION" desc="Secondary, continued explanation of how to manage SSL certificates and settings in Privacy options">
     Manage HTTPS/SSL certificates and settings
   </message>
+  <if expr="chrome_root_store_supported">
+    <message name="IDS_SETTINGS_MANAGE_DEVICE_CERTIFICATES" desc="Text for manage device certificates button in Privacy options">
+      Manage device certificates
+    </message>
+    <message name="IDS_SETTINGS_MANAGE_DEVICE_CERTIFICATES_DESCRIPTION" desc="Secondary, continued explanation of how to manage SSL device certificates and settings in Privacy options">
+      Manage HTTPS/SSL certificates on your device
+    </message>
+  </if>
   <message name="IDS_SETTINGS_MANAGE" desc="Text displayed on a button, which when clicked opens the Extensions subpage for managing an extension">
     Manage
   </message>
@@ -2008,8 +2045,8 @@
   <message name="IDS_SETTINGS_CONTENT_SETTINGS" desc="Text of the button that takes a user to settings page thats allows users to modify site settings. Also the title of that settings page.">
     Content settings
   </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS" desc="Text of the button that takes a user to the enhanced settings page thats allows users to modify site settings. Also the title of that settings page.">
-    Site Settings
+  <message name="IDS_SETTINGS_SITE_SETTINGS" desc="Text of the button that takes a user to the enhanced settings page thats allows users to modify site settings. Also the title of that settings page. It follows sentence case.">
+    Site settings
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION" desc="Secondary, continued explanation of what content settings in Brave do">
     Control what information websites can use and what content they can show you
@@ -3125,21 +3162,39 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_ALL_STORAGE_DIALOG_TITLE" desc="Title of the dialog that warns about deleting all site data.">
     Clear all data?
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_DISPLAYED_STORAGE_DIALOG_TITLE" desc="Title of the dialog that warns about deleting displayed site data.">
+    Clear displayed data?
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_ALL_STORAGE_DESCRIPTION" desc="Label describing how much total disk space chrome is using, next to the clear all button">
-    Total storage used by sites:
+    Total storage used by sites: <ph name="TOTAL_USAGE">$1<ex>8 GB</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_DISPLAYED_STORAGE_DESCRIPTION" desc="Label describing how much total disk space chrome is using from displayed sites, next to the clear displayed button">
+    Total storage used by displayed sites: <ph name="TOTAL_USAGE">$1<ex>8 GB</ex></ph>
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_ALL_STORAGE_LABEL" desc="Label for button to clear all site data">
     Clear all data
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_DISPLAYED_STORAGE_LABEL" desc="Label for button to clear displayed site data">
+    Clear displayed data
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_ALL_STORAGE_CONFIRMATION" desc="Text for the dialog that warns about clearing storage used by all sites.">
     This will clear <ph name="TOTAL_USAGE">$1<ex>8 GB</ex></ph> of data stored by sites
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_DISPLAYED_STORAGE_CONFIRMATION" desc="Text for the dialog that warns about clearing storage used by displayed sites.">
+    This will clear <ph name="TOTAL_USAGE">$1<ex>8 GB</ex></ph> of data stored by displayed sites
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_ALL_STORAGE_CONFIRMATION_INSTALLED" desc="Text for the dialog that warns about clearing storage used by all sites, shown when there are installed apps.">
     This will clear <ph name="TOTAL_USAGE">$1<ex>8 GB</ex></ph> of data stored by sites and installed apps
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_DISPLAYED_STORAGE_CONFIRMATION_INSTALLED" desc="Text for the dialog that warns about clearing storage used by displayed sites, shown when there are installed apps.">
+    This will clear <ph name="TOTAL_USAGE">$1<ex>8 GB</ex></ph> of data stored by displayed sites and installed apps
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_ALL_STORAGE_SIGN_OUT" desc="Text for the dialog that warns about being signed out when clearing storage used by all sites.">
     You'll be signed out of all sites, including in open tabs
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_DISPLAYED_STORAGE_SIGN_OUT" desc="Text for the dialog that warns about being signed out when clearing storage used by displayed sites.">
+    You'll be signed out of displayed sites, including in open tabs
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_DIALOG_TITLE" desc="Title of the dialog that warns about deleting all site data.">
     Clear site data
   </message>
@@ -3369,9 +3424,6 @@
   <message name="IDS_SETTINGS_COOKIES_LOCAL_STORAGE" desc="Label for local storage (name of an HTML standard)">
     Local storage
   </message>
-  <message name="IDS_SETTINGS_COOKIES_MEDIA_LICENSE" desc="The text shown when there is an Media License in the Cookies table">
-    Media license
-  </message>
   <message name="IDS_SETTINGS_COOKIES_FILE_SYSTEM" desc="The text shown when there is a file system (name of an HTML standard) in the Cookies table">
     File system
   </message>
@@ -3393,6 +3445,9 @@
   <message name="IDS_SETTINGS_COOKIES_CACHE_STORAGE" desc="The text shown when there is Cache Storage (name of a Web standard) in the Cookies table">
     Cache Storage
   </message>
+  <message name="IDS_SETTINGS_COOKIES_QUOTA_STORAGE" desc="The text shown when there is Quota Managed Storage in the Cookies table">
+    Quota-managed storage
+  </message>
 
   <!-- Sync / Profiles Page -->
   <message name="IDS_SETTINGS_PEOPLE" desc="Name of the settings page which manages the user's relationship to Brave.">
@@ -3460,9 +3515,6 @@
   <message name="IDS_SETTINGS_SYNC_DISCONNECT_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button in the Sign out of Brave dialog that toggles showing the profile stats. Only visible by screen reader software.">
     Show profile stats
   </message>
-  <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE" desc="The text to display by the checkbox asking user whether to also delete profile when stopping sync.">
-    Also remove your existing data from this device
-  </message>
   <message name="IDS_SETTINGS_SYNC_WILL_START" desc="The message to tell users that sync will start once they leave the sync setup page.">
     Sync will start once you leave sync settings
   </message>
diff --git a/app/settings_strings_override.grdp b/app/settings_strings_override.grdp
index 4263cda27b53..6d323d3ef79e 100644
--- a/app/settings_strings_override.grdp
+++ b/app/settings_strings_override.grdp
@@ -54,10 +54,12 @@
     </if>
 
   <if expr="use_nss_certs">
-    <if expr="chromeos_ash">
+    <if expr="chromeos_ash or chromeos_lacros">
       </if>
   </if>
 
+  <if expr="not chromeos_ash">
+    </if>
   <if expr="not chromeos_ash">
     <if expr="not is_macosx">
       </if>
@@ -100,6 +102,8 @@
   <if expr="is_win and _google_chrome">
     </if>
 
+  <if expr="chrome_root_store_supported">
+    </if>
   <if expr="is_win and _google_chrome">
     </if>
 
diff --git a/app/shared_settings_strings.grdp b/app/shared_settings_strings.grdp
index f967a2240f53..cb3bbe6173f4 100644
--- a/app/shared_settings_strings.grdp
+++ b/app/shared_settings_strings.grdp
@@ -3,10 +3,10 @@
 <!--This file is created by l10nUtil.js. Do not edit manually.-->
 <grit-part>
   <!-- All subpages -->
-  <message name="IDS_SETTINGS_SUBPAGE_BACK_BUTTON_ARIA_LABEL" desc="Text read by screen readers when focusing on the back button. If the back button is activated, it will navigate to the previous page. This text will only be announced by BraveVox and will not be visible in the UI.">
+  <message name="IDS_SETTINGS_SUBPAGE_BACK_BUTTON_ARIA_LABEL" desc="Text read by screen readers when focusing on the back button. If the back button is activated, it will navigate to the previous page. This text will only be announced by ChromeVox and will not be visible in the UI.">
     <ph name="SUBPAGE_TITLE">$1<ex>Bluetooth</ex></ph> subpage back button
   </message>
-  <message name="IDS_SETTINGS_SUBPAGE_BACK_BUTTON_ARIA_ROLE_DESCRIPTION" desc="Description read by screen readers when focusing on the back button. Indicates to the user that activating the back button will cause the settings page to navigate away from the currently displaying subpage to the previous visited page. This text will only be announced by BraveVox and will not be visible in the UI.">
+  <message name="IDS_SETTINGS_SUBPAGE_BACK_BUTTON_ARIA_ROLE_DESCRIPTION" desc="Description read by screen readers when focusing on the back button. Indicates to the user that activating the back button will cause the settings page to navigate away from the currently displaying subpage to the previous visited page. This text will only be announced by ChromeVox and will not be visible in the UI.">
     Click to navigate away from <ph name="SUBPAGE_TITLE">$1<ex>Bluetooth</ex> subpage</ph>.
   </message>
 
@@ -228,9 +228,6 @@
   <message name="IDS_DRIVE_SUGGEST_PREF" desc="The documentation string of the 'Show Drive Results in Omnibox' preference - short description">
     Google Drive search suggestions
   </message>
-  <message name="IDS_SETTINGS_AUTOFILL_ASSISTANT_PREF_DESC" translateable="false" desc="The description of the 'Use Brave Assistant' preference to help with automated flows on the web">
-    Helps you complete tasks, such as changing your password, throughout the web
-  </message>
 
   <!-- Sync Accounts page (used by the <settings-sync-account-control> element) -->
   <message name="IDS_SETTINGS_PEOPLE_SYNCING_TO_ACCOUNT" desc="The text displayed to the user that the profile is currently syncing to a specific account.">
diff --git a/browser/android/preferences/background_video_playback_tab_helper.cc b/browser/android/preferences/background_video_playback_tab_helper.cc
index 96932c5d9f35..dfbfbcef81a5 100644
--- a/browser/android/preferences/background_video_playback_tab_helper.cc
+++ b/browser/android/preferences/background_video_playback_tab_helper.cc
@@ -71,7 +71,7 @@ void BackgroundVideoPlaybackTabHelper::DidFinishNavigation(
     return;
   }
   if (IsBackgroundVideoPlaybackEnabled(web_contents())) {
-    web_contents()->GetMainFrame()->ExecuteJavaScript(
+    web_contents()->GetPrimaryMainFrame()->ExecuteJavaScript(
         k_youtube_background_playback_script, base::NullCallback());
   }
 }
diff --git a/browser/brave_ads/ads_tab_helper.cc b/browser/brave_ads/ads_tab_helper.cc
index 75c8981f5555..ee75616e2461 100644
--- a/browser/brave_ads/ads_tab_helper.cc
+++ b/browser/brave_ads/ads_tab_helper.cc
@@ -140,7 +140,8 @@ void AdsTabHelper::DidFinishNavigation(
 }
 
 void AdsTabHelper::DocumentOnLoadCompletedInPrimaryMainFrame() {
-  content::RenderFrameHost* render_frame_host = web_contents()->GetMainFrame();
+  content::RenderFrameHost* render_frame_host =
+      web_contents()->GetPrimaryMainFrame();
   if (search_result_ad_service_) {
     search_result_ad_service_->MaybeRetrieveSearchResultAd(
         render_frame_host, tab_id_, should_process_);
diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc
index 1911e8177235..e0f72bee2021 100644
--- a/browser/brave_profile_prefs.cc
+++ b/browser/brave_profile_prefs.cc
@@ -328,10 +328,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->SetDefaultPrefValue(prefs::kPrivacySandboxApisEnabledV2,
                                 base::Value(false));
 
-  // Disable Chromium's privacy sandbox
-  registry->SetDefaultPrefValue(prefs::kPrivacySandboxFlocEnabled,
-                                base::Value(false));
-
   // Importer: selected data types
   registry->RegisterBooleanPref(kImportDialogExtensions, true);
   registry->RegisterBooleanPref(kImportDialogPayments, true);
diff --git a/browser/brave_rewards/extension_rewards_service_observer.cc b/browser/brave_rewards/extension_rewards_service_observer.cc
index 7e05b6f9aeda..eb7ae29af1fb 100644
--- a/browser/brave_rewards/extension_rewards_service_observer.cc
+++ b/browser/brave_rewards/extension_rewards_service_observer.cc
@@ -311,7 +311,7 @@ void ExtensionRewardsServiceObserver::OnUnblindedTokensReady(
   std::unique_ptr<extensions::Event> event(new extensions::Event(
       extensions::events::BRAVE_START,
       extensions::api::brave_rewards::OnUnblindedTokensReady::kEventName,
-      std::vector<base::Value>()));
+      base::Value::List()));
   event_router->BroadcastEvent(std::move(event));
 }
 
diff --git a/browser/brave_shields/domain_block_page_browsertest.cc b/browser/brave_shields/domain_block_page_browsertest.cc
index 65ffa7e6ade9..f684395fd41d 100644
--- a/browser/brave_shields/domain_block_page_browsertest.cc
+++ b/browser/brave_shields/domain_block_page_browsertest.cc
@@ -64,12 +64,12 @@ class DomainBlockTestBase : public AdBlockServiceTest {
 
   void NavigateTo(const GURL& url) {
     ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
-    content::RenderFrameHost* frame = web_contents()->GetMainFrame();
+    content::RenderFrameHost* frame = web_contents()->GetPrimaryMainFrame();
     ASSERT_TRUE(WaitForRenderFrameReady(frame));
   }
 
   void Click(const std::string& id) {
-    content::RenderFrameHost* frame = web_contents()->GetMainFrame();
+    content::RenderFrameHost* frame = web_contents()->GetPrimaryMainFrame();
     frame->ExecuteJavaScriptForTests(
         base::ASCIIToUTF16("document.getElementById('" + id + "').click();\n"),
         base::NullCallback());
diff --git a/browser/brave_wallet/brave_wallet_service_delegate_impl.cc b/browser/brave_wallet/brave_wallet_service_delegate_impl.cc
index 5274bb13236c..a0c704932c47 100644
--- a/browser/brave_wallet/brave_wallet_service_delegate_impl.cc
+++ b/browser/brave_wallet/brave_wallet_service_delegate_impl.cc
@@ -199,7 +199,7 @@ void BraveWalletServiceDelegateImpl::FireActiveOriginChanged() {
 
 url::Origin BraveWalletServiceDelegateImpl::GetActiveOriginInternal() {
   content::WebContents* contents = GetActiveWebContents();
-  return contents ? contents->GetMainFrame()->GetLastCommittedOrigin()
+  return contents ? contents->GetPrimaryMainFrame()->GetLastCommittedOrigin()
                   : url::Origin();
 }
 
diff --git a/browser/brave_wallet/brave_wallet_tab_helper_browsertest.cc b/browser/brave_wallet/brave_wallet_tab_helper_browsertest.cc
index 7e97cc168474..01fbe695b775 100644
--- a/browser/brave_wallet/brave_wallet_tab_helper_browsertest.cc
+++ b/browser/brave_wallet/brave_wallet_tab_helper_browsertest.cc
@@ -37,7 +37,7 @@ const char kEmbeddedTestServerDirectory[] = "brave-wallet";
 base::OnceClosure ShowChooserBubble(
     content::WebContents* contents,
     std::unique_ptr<permissions::ChooserController> controller) {
-  return chrome::ShowDeviceChooserDialog(contents->GetMainFrame(),
+  return chrome::ShowDeviceChooserDialog(contents->GetPrimaryMainFrame(),
                                          std::move(controller));
 }
 
diff --git a/browser/brave_wallet/brave_wallet_tab_helper_unittest.cc b/browser/brave_wallet/brave_wallet_tab_helper_unittest.cc
index 8ed873068837..973b76f1665d 100644
--- a/browser/brave_wallet/brave_wallet_tab_helper_unittest.cc
+++ b/browser/brave_wallet/brave_wallet_tab_helper_unittest.cc
@@ -34,8 +34,8 @@ std::u16string GetHIDTitle(content::WebContents* content, const GURL& url) {
   std::vector<blink::mojom::HidDeviceFilterPtr> filters;
   std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters;
   auto hid_chooser_controller = std::make_unique<HidChooserController>(
-      content->GetMainFrame(), std::move(filters), std::move(exclusion_filters),
-      base::DoNothing());
+      content->GetPrimaryMainFrame(), std::move(filters),
+      std::move(exclusion_filters), base::DoNothing());
   return hid_chooser_controller->GetTitle();
 }
 }  // namespace
diff --git a/browser/brave_wallet/ethereum_provider_impl_unittest.cc b/browser/brave_wallet/ethereum_provider_impl_unittest.cc
index 200eb0795b25..b1487127cd58 100644
--- a/browser/brave_wallet/ethereum_provider_impl_unittest.cc
+++ b/browser/brave_wallet/ethereum_provider_impl_unittest.cc
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/callback_helpers.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/memory/raw_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ -213,7 +214,7 @@ class EthereumProviderImplUnitTest : public testing::Test {
         host_content_settings_map(), json_rpc_service(), tx_service(),
         keyring_service(), brave_wallet_service_,
         std::make_unique<brave_wallet::BraveWalletProviderDelegateImpl>(
-            web_contents(), web_contents()->GetMainFrame()),
+            web_contents(), web_contents()->GetPrimaryMainFrame()),
         prefs());
 
     observer_.reset(new TestEventsListener());
@@ -369,7 +370,7 @@ class EthereumProviderImplUnitTest : public testing::Test {
   void Navigate(const GURL& url) { web_contents()->NavigateAndCommit(url); }
 
   url::Origin GetOrigin() {
-    return web_contents()->GetMainFrame()->GetLastCommittedOrigin();
+    return web_contents()->GetPrimaryMainFrame()->GetLastCommittedOrigin();
   }
 
   void CreateBraveWalletTabHelper() {
@@ -993,11 +994,9 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApproveTransaction) {
       "\"gas\":\"0x0974\",\"to\":"
       "\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\","
       "\"value\":\"0x016345785d8a0000\"}]}";
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                                       base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& response = value_with_error.value;
+  absl::optional<base::Value> response = base::JSONReader::Read(
+      normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                   base::JSONParserOptions::JSON_PARSE_RFC);
   provider()->Request(
       response->Clone(),
       base::BindLambdaForTesting(
@@ -1064,11 +1063,9 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApproveTransactionError) {
       "\",\"gasPrice\":\"0x09184e72a000\","
       "\"gas\":\"0x0974\",\"to\":\"0xbe8\","
       "\"value\":\"0x016345785d8a0000\"}]}";
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                                       base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& response = value_with_error.value;
+  absl::optional<base::Value> response = base::JSONReader::Read(
+      normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                   base::JSONParserOptions::JSON_PARSE_RFC);
   provider()->Request(
       response->Clone(),
       base::BindLambdaForTesting(
@@ -1103,11 +1100,9 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApproveTransactionNoPermission) {
       "\"gas\":\"0x0974\",\"to\":"
       "\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\","
       "\"value\":\"0x016345785d8a0000\"}]}";
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                                       base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& response = value_with_error.value;
+  absl::optional<base::Value> response = base::JSONReader::Read(
+      normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                   base::JSONParserOptions::JSON_PARSE_RFC);
   provider()->Request(
       response->Clone(),
       base::BindLambdaForTesting(
@@ -1146,11 +1141,9 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApprove1559Transaction) {
       "\",\"maxFeePerGas\":\"0x1\",\"maxPriorityFeePerGas\":\"0x1\","
       "\"gas\":\"0x1\",\"to\":\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\","
       "\"value\":\"0x00\"}]}";
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                                       base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& response = value_with_error.value;
+  absl::optional<base::Value> response = base::JSONReader::Read(
+      normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                   base::JSONParserOptions::JSON_PARSE_RFC);
   provider()->Request(
       response->Clone(),
       base::BindLambdaForTesting(
@@ -1214,11 +1207,9 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApprove1559TransactionNoChainId) {
       "\",\"maxFeePerGas\":\"0x1\",\"maxPriorityFeePerGas\":\"0x1\","
       "\"gas\":\"0x1\",\"to\":\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\","
       "\"value\":\"0x00\"}]}";
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                                       base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& response = value_with_error.value;
+  absl::optional<base::Value> response = base::JSONReader::Read(
+      normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                   base::JSONParserOptions::JSON_PARSE_RFC);
   provider()->Request(
       response->Clone(),
       base::BindLambdaForTesting(
@@ -1282,11 +1273,9 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApprove1559TransactionError) {
       "\"gasPrice\":\"0x01\", "
       "\"gas\":\"0x00\",\"to\":\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\","
       "\"value\":\"0x00\"}]}";
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                                       base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& response = value_with_error.value;
+  absl::optional<base::Value> response = base::JSONReader::Read(
+      normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                   base::JSONParserOptions::JSON_PARSE_RFC);
   provider()->Request(
       response->Clone(),
       base::BindLambdaForTesting(
@@ -1320,11 +1309,9 @@ TEST_F(EthereumProviderImplUnitTest, AddAndApprove1559TransactionNoPermission) {
       "\",\"maxFeePerGas\":\"0x0\",\"maxPriorityFeePerGas\":\"0x0\","
       "\"gas\":\"0x00\",\"to\":\"0xbe862ad9abfe6f22bcb087716c7d89a26051f74c\","
       "\"value\":\"0x00\"}]}";
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                                       base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& response = value_with_error.value;
+  absl::optional<base::Value> response = base::JSONReader::Read(
+      normalized_json_request, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                   base::JSONParserOptions::JSON_PARSE_RFC);
   provider()->Request(
       response->Clone(),
       base::BindLambdaForTesting(
diff --git a/browser/brave_wallet/external_wallets_importer.cc b/browser/brave_wallet/external_wallets_importer.cc
index 1b9a961487d8..0fc6221fe1ea 100644
--- a/browser/brave_wallet/external_wallets_importer.cc
+++ b/browser/brave_wallet/external_wallets_importer.cc
@@ -50,11 +50,7 @@ void OnRunWithStorage(base::OnceCallback<void(base::Value::Dict)> callback,
                       ValueStore* storage) {
   DCHECK(IsOnBackendSequence());
   DCHECK(storage);
-  auto current_settings = storage->Get().PassSettings();
-  if (current_settings)
-    std::move(callback).Run(std::move(*current_settings->GetIfDict()));
-  else
-    std::move(callback).Run(base::Value::Dict());
+  std::move(callback).Run(storage->Get().PassSettings());
 }
 
 std::string GetLegacyCryptoWalletsPassword(const std::string& password,
@@ -97,10 +93,10 @@ std::string GetLegacyCryptoWalletsPassword(const std::string& password,
   // bytes size
   // https://github.com/urbit/argon2-wasm/blob/c9e73723cebe3d76cf286f5c7709b64edb25c684/index.js#L73
   size_t character_count = 0;
-  for (int32_t i = 0; i < (int32_t)salt_str->size(); ++i) {
+  for (size_t i = 0; i < salt_str->size(); ++i) {
     base_icu::UChar32 code_point;
-    if (base::ReadUnicodeCharacter((const char*)salt_str->data(),
-                                   salt_str->size(), &i, &code_point))
+    if (base::ReadUnicodeCharacter(salt_str->data(), salt_str->size(), &i,
+                                   &code_point))
       ++character_count;
   }
 
@@ -124,10 +120,11 @@ std::string GetLegacyCryptoWalletsPassword(const std::string& password,
   // unicdoe encoding and replace it with � (code point 0xFFFD) // NOLINT
   // because js implementation forcibly utf8 decode sub_key
   // https://github.com/brave/KeyringController/blob/0769514cea07e85ae190f30765d0a301c631c56b/index.js#L547
-  for (int32_t i = 0; i < (int32_t)sub_key.size(); ++i) {
+  for (size_t i = 0; i < sub_key.size(); ++i) {
     base_icu::UChar32 code_point;
-    if (!base::ReadUnicodeCharacter((const char*)sub_key.data(), sub_key.size(),
-                                    &i, &code_point) ||
+    if (!base::ReadUnicodeCharacter(
+            reinterpret_cast<const char*>(sub_key.data()), sub_key.size(), &i,
+            &code_point) ||
         !base::IsValidCodepoint(code_point)) {
       code_point = 0xfffd;
     }
diff --git a/browser/brave_wallet/solana_provider_impl_unittest.cc b/browser/brave_wallet/solana_provider_impl_unittest.cc
index dfcc50de6c43..b2a0bc496ef3 100644
--- a/browser/brave_wallet/solana_provider_impl_unittest.cc
+++ b/browser/brave_wallet/solana_provider_impl_unittest.cc
@@ -117,7 +117,7 @@ class SolanaProviderImplUnitTest : public testing::Test {
     provider_ = std::make_unique<SolanaProviderImpl>(
         keyring_service_, brave_wallet_service_, tx_service_,
         std::make_unique<brave_wallet::BraveWalletProviderDelegateImpl>(
-            web_contents(), web_contents()->GetMainFrame()));
+            web_contents(), web_contents()->GetPrimaryMainFrame()));
     observer_.reset(new TestEventsListener());
     provider_->Init(observer_->GetReceiver());
   }
@@ -132,7 +132,7 @@ class SolanaProviderImplUnitTest : public testing::Test {
 
   void Navigate(const GURL& url) { web_contents()->NavigateAndCommit(url); }
   url::Origin GetOrigin() {
-    return web_contents()->GetMainFrame()->GetLastCommittedOrigin();
+    return web_contents()->GetPrimaryMainFrame()->GetLastCommittedOrigin();
   }
 
   std::vector<mojom::SignMessageRequestPtr> GetPendingSignMessageRequests()
diff --git a/browser/brave_wallet/solana_provider_renderer_browsertest.cc b/browser/brave_wallet/solana_provider_renderer_browsertest.cc
index 13e399c9b208..74e2240583da 100644
--- a/browser/brave_wallet/solana_provider_renderer_browsertest.cc
+++ b/browser/brave_wallet/solana_provider_renderer_browsertest.cc
@@ -693,7 +693,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, Connect) {
       result2.value);
 
   TestSolanaProvider* provider = test_content_browser_client_.GetProvider(
-      web_contents(browser())->GetMainFrame());
+      web_contents(browser())->GetPrimaryMainFrame());
   ASSERT_TRUE(provider);
 
   provider->SetError(SolanaProviderError::kUserRejectedRequest, kErrorMessage);
@@ -726,7 +726,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, IsConnected) {
   EXPECT_EQ(base::Value(true), result.value);
 
   TestSolanaProvider* provider = test_content_browser_client_.GetProvider(
-      web_contents(browser())->GetMainFrame());
+      web_contents(browser())->GetPrimaryMainFrame());
   ASSERT_TRUE(provider);
 
   // just make TestSolanaProvider::IsConnected to return false
@@ -806,7 +806,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, SignTransaction) {
       result4.value);
 
   TestSolanaProvider* provider = test_content_browser_client_.GetProvider(
-      web_contents(browser())->GetMainFrame());
+      web_contents(browser())->GetPrimaryMainFrame());
   ASSERT_TRUE(provider);
 
   provider->SetError(SolanaProviderError::kUserRejectedRequest, kErrorMessage);
@@ -868,7 +868,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, SignAllTransactions) {
       result5.value);
 
   TestSolanaProvider* provider = test_content_browser_client_.GetProvider(
-      web_contents(browser())->GetMainFrame());
+      web_contents(browser())->GetPrimaryMainFrame());
   ASSERT_TRUE(provider);
 
   provider->SetError(SolanaProviderError::kUserRejectedRequest, kErrorMessage);
@@ -892,7 +892,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, SignAndSendTransaction) {
                     serialized_tx_str, "])), ", send_options, ")"});
 
   TestSolanaProvider* provider = test_content_browser_client_.GetProvider(
-      web_contents(browser())->GetMainFrame());
+      web_contents(browser())->GetPrimaryMainFrame());
   ASSERT_TRUE(provider);
   provider->SetSendOptions(
       base::JSONReader::Read(send_options)->GetDict().Clone());
@@ -999,7 +999,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, SignMessage) {
   EXPECT_EQ(base::Value(true), result6.value);
 
   TestSolanaProvider* provider = test_content_browser_client_.GetProvider(
-      web_contents(browser())->GetMainFrame());
+      web_contents(browser())->GetPrimaryMainFrame());
   ASSERT_TRUE(provider);
 
   provider->SetError(SolanaProviderError::kUserRejectedRequest, kErrorMessage);
@@ -1051,7 +1051,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, Request) {
       result5.value);
 
   TestSolanaProvider* provider = test_content_browser_client_.GetProvider(
-      web_contents(browser())->GetMainFrame());
+      web_contents(browser())->GetPrimaryMainFrame());
   ASSERT_TRUE(provider);
 
   provider->SetError(SolanaProviderError::kUserRejectedRequest, kErrorMessage);
@@ -1071,7 +1071,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, OnAccountChanged) {
   EXPECT_EQ(base::Value(kTestPublicKey), result.value);
 
   TestSolanaProvider* provider = test_content_browser_client_.GetProvider(
-      web_contents(browser())->GetMainFrame());
+      web_contents(browser())->GetPrimaryMainFrame());
   ASSERT_TRUE(provider);
 
   provider->SetEmitEmptyAccountChanged(true);
@@ -1219,7 +1219,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, Iframe3P) {
     SCOPED_TRACE(testing::Message() << c.script << c.iframe_url);
     ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), c.top_url));
     content::RenderFrameHost* main_frame =
-        web_contents(browser())->GetMainFrame();
+        web_contents(browser())->GetPrimaryMainFrame();
     EXPECT_TRUE(content::EvalJs(main_frame, c.script).ExtractBool());
     EXPECT_TRUE(
         NavigateIframeToURL(web_contents(browser()), "test", c.iframe_url));
@@ -1231,7 +1231,7 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, Iframe3P) {
     SCOPED_TRACE(testing::Message() << c.script << c.top_url << c.iframe_url);
     ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), c.top_url));
     content::RenderFrameHost* main_frame =
-        web_contents(browser())->GetMainFrame();
+        web_contents(browser())->GetPrimaryMainFrame();
     EXPECT_TRUE(content::EvalJs(main_frame, c.script).ExtractBool());
     EXPECT_TRUE(
         NavigateIframeToURL(web_contents(browser()), "test", c.iframe_url));
@@ -1247,24 +1247,24 @@ IN_PROC_BROWSER_TEST_F(SolanaProviderRendererTest, SecureContextOnly) {
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
   constexpr char kEvalSolana[] = "typeof window.braveSolana !== 'undefined'";
   content::RenderFrameHost* main_frame =
-      web_contents(browser())->GetMainFrame();
+      web_contents(browser())->GetPrimaryMainFrame();
   EXPECT_TRUE(content::EvalJs(main_frame, kEvalSolana).ExtractBool());
 
   // Insecure context
   url = embedded_test_server()->GetURL("a.com", "/simple.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
-  main_frame = web_contents(browser())->GetMainFrame();
+  main_frame = web_contents(browser())->GetPrimaryMainFrame();
   EXPECT_FALSE(content::EvalJs(main_frame, kEvalSolana).ExtractBool());
 
   // Secure context localhost HTTP
   url = embedded_test_server()->GetURL("localhost", "/simple.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
-  main_frame = web_contents(browser())->GetMainFrame();
+  main_frame = web_contents(browser())->GetPrimaryMainFrame();
   EXPECT_TRUE(content::EvalJs(main_frame, kEvalSolana).ExtractBool());
 
   // Secure context 127.0.0.1 HTTP
   url = embedded_test_server()->GetURL("localhost", "/simple.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
-  main_frame = web_contents(browser())->GetMainFrame();
+  main_frame = web_contents(browser())->GetPrimaryMainFrame();
   EXPECT_TRUE(content::EvalJs(main_frame, kEvalSolana).ExtractBool());
 }
diff --git a/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc b/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc
index c9f91f295fdb..6f360c26be36 100644
--- a/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc
+++ b/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc
@@ -92,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(DecentralizedDnsNavigationThrottleBrowserTest,
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(DecentralizedDnsOptInPage::kTypeForTesting,
             GetInterstitialType(web_contents));
 
@@ -113,7 +113,7 @@ IN_PROC_BROWSER_TEST_F(DecentralizedDnsNavigationThrottleBrowserTest,
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(DecentralizedDnsOptInPage::kTypeForTesting,
             GetInterstitialType(web_contents));
 
@@ -133,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(DecentralizedDnsNavigationThrottleBrowserTest,
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(DecentralizedDnsOptInPage::kTypeForTesting,
             GetInterstitialType(web_contents));
 
@@ -153,7 +153,7 @@ IN_PROC_BROWSER_TEST_F(DecentralizedDnsNavigationThrottleBrowserTest,
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(DecentralizedDnsOptInPage::kTypeForTesting,
             GetInterstitialType(web_contents));
 
diff --git a/browser/download/brave_download_item_model.cc b/browser/download/brave_download_item_model.cc
index 24152867b8e1..66702812067e 100644
--- a/browser/download/brave_download_item_model.cc
+++ b/browser/download/brave_download_item_model.cc
@@ -50,7 +50,7 @@ std::u16string BraveDownloadItemModel::GetTooltipText() {
 // Returns origin url text and sets |is_secure|.
 std::u16string BraveDownloadItemModel::GetOriginURLText(bool* is_secure) {
   *is_secure = false;
-  const GURL gurl = model_->download()->GetURL();
+  const GURL gurl = model_->GetDownloadItem()->GetURL();
   if (gurl.is_empty()) {
     return std::u16string();
   }
diff --git a/browser/ephemeral_storage/blob_url_browsertest.cc b/browser/ephemeral_storage/blob_url_browsertest.cc
index 743830d71b12..06d5c84a5b4a 100644
--- a/browser/ephemeral_storage/blob_url_browsertest.cc
+++ b/browser/ephemeral_storage/blob_url_browsertest.cc
@@ -127,7 +127,8 @@ class BlobUrlBrowserTestBase : public EphemeralStorageBrowserTest {
 
   FramesWithRegisteredBlobs RegisterBlobs(const GURL& url) {
     FramesWithRegisteredBlobs frames_with_registered_blobs;
-    content::RenderFrameHost* main_frame = LoadURLInNewTab(url)->GetMainFrame();
+    content::RenderFrameHost* main_frame =
+        LoadURLInNewTab(url)->GetPrimaryMainFrame();
     const std::vector<content::RenderFrameHost*> rfhs = GetFrames(main_frame);
 
     for (size_t idx = 0; idx < rfhs.size(); ++idx) {
diff --git a/browser/ephemeral_storage/ephemeral_storage_1p_browsertest.cc b/browser/ephemeral_storage/ephemeral_storage_1p_browsertest.cc
index 15764d32c0d5..ad4483a05a6d 100644
--- a/browser/ephemeral_storage/ephemeral_storage_1p_browsertest.cc
+++ b/browser/ephemeral_storage/ephemeral_storage_1p_browsertest.cc
@@ -98,7 +98,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorage1pBrowserTest,
   // We set a value in the page where all the frames are first-party.
   SetValuesInFrames(first_party_tab, "b.com - first party", "from=b.com");
 
-  // The page this tab is loaded via a.com and has two b.com third-party
+  // The page in this tab is loaded via a.com and has two b.com third-party
   // iframes. The third-party iframes should have ephemeral storage. That means
   // that their values should be shared by third-party b.com iframes loaded from
   // a.com.
@@ -180,14 +180,18 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorage1pBrowserTest,
   WebContents* site_b = LoadURLInNewTab(b_site_ephemeral_storage_url_);
 
   // Main frame and 1p frame.
-  EXPECT_FALSE(SetIDBValue(site_a->GetMainFrame()));
-  EXPECT_FALSE(SetIDBValue(content::ChildFrameAt(site_a->GetMainFrame(), 2)));
+  EXPECT_FALSE(SetIDBValue(site_a->GetPrimaryMainFrame()));
+  EXPECT_FALSE(
+      SetIDBValue(content::ChildFrameAt(site_a->GetPrimaryMainFrame(), 2)));
   // 3p frames.
-  EXPECT_FALSE(SetIDBValue(content::ChildFrameAt(site_a->GetMainFrame(), 0)));
-  EXPECT_FALSE(SetIDBValue(content::ChildFrameAt(site_a->GetMainFrame(), 1)));
+  EXPECT_FALSE(
+      SetIDBValue(content::ChildFrameAt(site_a->GetPrimaryMainFrame(), 0)));
+  EXPECT_FALSE(
+      SetIDBValue(content::ChildFrameAt(site_a->GetPrimaryMainFrame(), 1)));
 
   // 3p frame.
-  EXPECT_FALSE(SetIDBValue(content::ChildFrameAt(site_b->GetMainFrame(), 2)));
+  EXPECT_FALSE(
+      SetIDBValue(content::ChildFrameAt(site_b->GetPrimaryMainFrame(), 2)));
 }
 
 IN_PROC_BROWSER_TEST_F(EphemeralStorage1pBrowserTest,
@@ -277,13 +281,15 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorage1pBrowserTest,
                   .empty());
 
   // JS cookie request should return valid results.
-  EXPECT_EQ("name=acom", GetCookiesInFrame(site_a_set_cookies->GetMainFrame()));
-  EXPECT_EQ("name=bcom", GetCookiesInFrame(site_b_set_cookies->GetMainFrame()));
-  EXPECT_EQ("name=acom", GetCookiesInFrame(site_a->GetMainFrame()));
+  EXPECT_EQ("name=acom",
+            GetCookiesInFrame(site_a_set_cookies->GetPrimaryMainFrame()));
+  EXPECT_EQ("name=bcom",
+            GetCookiesInFrame(site_b_set_cookies->GetPrimaryMainFrame()));
+  EXPECT_EQ("name=acom", GetCookiesInFrame(site_a->GetPrimaryMainFrame()));
 
   // The third-party iframe should not have the b.com cookie that was set on the
   // main frame.
-  RenderFrameHost* main_frame = site_a->GetMainFrame();
+  RenderFrameHost* main_frame = site_a->GetPrimaryMainFrame();
   RenderFrameHost* iframe_a = content::ChildFrameAt(main_frame, 0);
   RenderFrameHost* iframe_b = content::ChildFrameAt(main_frame, 1);
   EXPECT_EQ("", GetCookiesInFrame(iframe_a));
@@ -298,11 +304,11 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorage1pBrowserTest,
   ASSERT_EQ("name=bcom_ephemeral", GetCookiesInFrame(iframe_a));
   ASSERT_EQ("name=bcom_ephemeral", GetCookiesInFrame(iframe_b));
 
-  // The cookie set in the ephemeral area should not visible in the main
+  // The cookie set in the ephemeral area should not be visible in the main
   // cookie storage.
   EXPECT_TRUE(content::GetCookies(browser()->profile(), GURL("https://b.com/"))
                   .empty());
-  EXPECT_EQ("name=bcom", GetCookiesInFrame(site_b->GetMainFrame()));
+  EXPECT_EQ("name=bcom", GetCookiesInFrame(site_b->GetPrimaryMainFrame()));
 
   // Navigating to a new TLD should clear all ephemeral cookies after keep-alive
   // timeout.
@@ -339,7 +345,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorage1pBrowserTest,
   ASSERT_TRUE(
       ui_test_utils::NavigateToURL(browser(), a_site_ephemeral_storage_url_));
 
-  RenderFrameHost* site_a_main_frame = web_contents->GetMainFrame();
+  RenderFrameHost* site_a_main_frame = web_contents->GetPrimaryMainFrame();
   RenderFrameHost* nested_frames_tab =
       content::ChildFrameAt(site_a_main_frame, 3);
   ASSERT_NE(nested_frames_tab, nullptr);
@@ -348,7 +354,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorage1pBrowserTest,
   ASSERT_NE(first_party_nested_acom, nullptr);
 
   WebContents* site_b_tab = LoadURLInNewTab(b_site_ephemeral_storage_url_);
-  RenderFrameHost* site_b_main_frame = site_b_tab->GetMainFrame();
+  RenderFrameHost* site_b_main_frame = site_b_tab->GetPrimaryMainFrame();
   RenderFrameHost* third_party_nested_acom =
       content::ChildFrameAt(site_b_main_frame, 2);
   ASSERT_NE(first_party_nested_acom, nullptr);
@@ -532,11 +538,12 @@ IN_PROC_BROWSER_TEST_F(
 }
 
 // By default SESSION_ONLY setting means that data for a website should be
-// deleted after a restart, but this also implicitly change how a website
+// deleted after a restart, but this also implicitly changes how a website
 // behaves in 3p context: when the setting is explicit, Chromium removes 3p
-// restrictions which effectively allows the website store any data persistently
-// in 3p context. We change Chromium behaviour for this option to keep blocking
-// a website in 3p context when a global "block_third_party" option is enabled.
+// restrictions which effectively allows the website to store any data
+// persistently in 3p context. We change Chromium's behavior for this option to
+// keep blocking a website in 3p context when a global "block_third_party"
+// option is enabled.
 IN_PROC_BROWSER_TEST_F(EphemeralStorage1pDisabledBrowserTest,
                        SessionOnlyModeUsesEphemeralStorage) {
   SetCookieSetting(b_site_ephemeral_storage_url_, CONTENT_SETTING_SESSION_ONLY);
diff --git a/browser/ephemeral_storage/ephemeral_storage_1p_domain_block_browsertest.cc b/browser/ephemeral_storage/ephemeral_storage_1p_domain_block_browsertest.cc
index 7787583d4ab3..a6c9b7e8c6e1 100644
--- a/browser/ephemeral_storage/ephemeral_storage_1p_domain_block_browsertest.cc
+++ b/browser/ephemeral_storage/ephemeral_storage_1p_domain_block_browsertest.cc
@@ -66,7 +66,7 @@ class EphemeralStorage1pDomainBlockBrowserTest
   }
 
   void Click(WebContents* web_contents, const std::string& id) {
-    content::RenderFrameHost* frame = web_contents->GetMainFrame();
+    content::RenderFrameHost* frame = web_contents->GetPrimaryMainFrame();
     frame->ExecuteJavaScriptForTests(
         base::ASCIIToUTF16("document.getElementById('" + id + "').click();\n"),
         base::NullCallback());
@@ -99,7 +99,7 @@ class EphemeralStorage1pDomainBlockBrowserTest
       ClickAndWaitForNavigation(first_party_tab, "primary-button");
     }
 
-    RenderFrameHost* main_frame = first_party_tab->GetMainFrame();
+    RenderFrameHost* main_frame = first_party_tab->GetPrimaryMainFrame();
     SetValuesInFrame(main_frame, "a.com", "from=a.com");
 
     ValuesFromFrame main_frame_values = GetValuesFromFrame(main_frame);
@@ -124,7 +124,7 @@ class EphemeralStorage1pDomainBlockBrowserTest
     ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), a_site_simple_url_));
 
     ExpectValuesFromFrameAreEmpty(
-        FROM_HERE, GetValuesFromFrame(first_party_tab->GetMainFrame()));
+        FROM_HERE, GetValuesFromFrame(first_party_tab->GetPrimaryMainFrame()));
     EXPECT_EQ(GetCookieSetting(a_site_simple_url_),
               ContentSetting::CONTENT_SETTING_SESSION_ONLY);
   }
@@ -142,7 +142,7 @@ class EphemeralStorage1pDomainBlockBrowserTest
 
     {
       ValuesFromFrame first_party_values =
-          GetValuesFromFrame(first_party_tab->GetMainFrame());
+          GetValuesFromFrame(first_party_tab->GetPrimaryMainFrame());
       EXPECT_EQ("a.com", first_party_values.local_storage);
       EXPECT_EQ("a.com", first_party_values.session_storage);
       EXPECT_EQ("from=a.com", first_party_values.cookies);
@@ -187,7 +187,7 @@ IN_PROC_BROWSER_TEST_F(
     FirstPartyEphemeralIsNotEnabledIfLocalStorageDataStored) {
   // Store local storage value in a.com.
   WebContents* first_party_tab = LoadURLInNewTab(a_site_simple_url_);
-  SetStorageValueInFrame(first_party_tab->GetMainFrame(), "a.com",
+  SetStorageValueInFrame(first_party_tab->GetPrimaryMainFrame(), "a.com",
                          StorageType::Local);
   // Navigate away to b.com.
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), b_site_simple_url_));
@@ -219,7 +219,7 @@ IN_PROC_BROWSER_TEST_F(
   ClickAndWaitForNavigation(first_party_tab, "primary-button");
 
   ExpectValuesFromFrameAreEmpty(
-      FROM_HERE, GetValuesFromFrame(first_party_tab->GetMainFrame()));
+      FROM_HERE, GetValuesFromFrame(first_party_tab->GetPrimaryMainFrame()));
   EXPECT_EQ(0u, GetAllCookies().size());
   EXPECT_EQ(GetCookieSetting(a_site_simple_url_),
             ContentSetting::CONTENT_SETTING_SESSION_ONLY);
@@ -242,7 +242,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorage1pDomainBlockBrowserTest,
   EXPECT_FALSE(IsShowingInterstitial(first_party_tab));
 
   ValuesFromFrame first_party_values =
-      GetValuesFromFrame(first_party_tab->GetMainFrame());
+      GetValuesFromFrame(first_party_tab->GetPrimaryMainFrame());
   EXPECT_EQ("a.com", first_party_values.local_storage);
   EXPECT_EQ("a.com", first_party_values.session_storage);
   EXPECT_EQ("from=a.com", first_party_values.cookies);
diff --git a/browser/ephemeral_storage/ephemeral_storage_browsertest.cc b/browser/ephemeral_storage/ephemeral_storage_browsertest.cc
index ad6668e788d6..29bf2448b430 100644
--- a/browser/ephemeral_storage/ephemeral_storage_browsertest.cc
+++ b/browser/ephemeral_storage/ephemeral_storage_browsertest.cc
@@ -210,7 +210,7 @@ void EphemeralStorageBrowserTest::SetValuesInFrame(RenderFrameHost* frame,
 void EphemeralStorageBrowserTest::SetValuesInFrames(WebContents* web_contents,
                                                     std::string storage_value,
                                                     std::string cookie_value) {
-  RenderFrameHost* main = web_contents->GetMainFrame();
+  RenderFrameHost* main = web_contents->GetPrimaryMainFrame();
   SetValuesInFrame(main, storage_value, cookie_value);
   SetValuesInFrame(content::ChildFrameAt(main, 0), storage_value, cookie_value);
   SetValuesInFrame(content::ChildFrameAt(main, 1), storage_value, cookie_value);
@@ -227,7 +227,7 @@ EphemeralStorageBrowserTest::GetValuesFromFrame(RenderFrameHost* frame) {
 
 EphemeralStorageBrowserTest::ValuesFromFrames
 EphemeralStorageBrowserTest::GetValuesFromFrames(WebContents* web_contents) {
-  RenderFrameHost* main_frame = web_contents->GetMainFrame();
+  RenderFrameHost* main_frame = web_contents->GetPrimaryMainFrame();
   return {
       GetValuesFromFrame(main_frame),
       GetValuesFromFrame(content::ChildFrameAt(main_frame, 0)),
@@ -805,7 +805,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
   // The third-party iframe should not have the b.com cookie that was set on the
   // main frame.
   auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents();
-  RenderFrameHost* main_frame = web_contents->GetMainFrame();
+  RenderFrameHost* main_frame = web_contents->GetPrimaryMainFrame();
   RenderFrameHost* iframe_a = content::ChildFrameAt(main_frame, 0);
   RenderFrameHost* iframe_b = content::ChildFrameAt(main_frame, 1);
   ASSERT_EQ("", GetCookiesInFrame(iframe_a));
@@ -931,7 +931,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
   // Gather all WebContents and frames in a usable structure.
   base::flat_map<WebContents*, std::vector<RenderFrameHost*>> frames;
   for (auto* wc : {site_a_tab1, site_a_tab2, site_b_tab1, site_b_tab2}) {
-    auto* main_rfh = wc->GetMainFrame();
+    auto* main_rfh = wc->GetPrimaryMainFrame();
     CreateBroadcastChannel(main_rfh);
     frames[wc].push_back(main_rfh);
     for (size_t child_idx = 0; child_idx < 4; ++child_idx) {
@@ -1017,7 +1017,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
   ASSERT_TRUE(
       ui_test_utils::NavigateToURL(browser(), a_site_ephemeral_storage_url_));
 
-  RenderFrameHost* site_a_main_frame = web_contents->GetMainFrame();
+  RenderFrameHost* site_a_main_frame = web_contents->GetPrimaryMainFrame();
   RenderFrameHost* nested_frames_tab =
       content::ChildFrameAt(site_a_main_frame, 3);
   ASSERT_NE(nested_frames_tab, nullptr);
@@ -1026,7 +1026,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest,
   ASSERT_NE(first_party_nested_acom, nullptr);
 
   WebContents* site_b_tab = LoadURLInNewTab(b_site_ephemeral_storage_url_);
-  RenderFrameHost* site_b_main_frame = site_b_tab->GetMainFrame();
+  RenderFrameHost* site_b_main_frame = site_b_tab->GetPrimaryMainFrame();
   RenderFrameHost* third_party_nested_acom =
       content::ChildFrameAt(site_b_main_frame, 2);
   ASSERT_NE(first_party_nested_acom, nullptr);
diff --git a/browser/ephemeral_storage/hsts_partitioning_browsertest.cc b/browser/ephemeral_storage/hsts_partitioning_browsertest.cc
index 902fb66b2694..5927c019353a 100644
--- a/browser/ephemeral_storage/hsts_partitioning_browsertest.cc
+++ b/browser/ephemeral_storage/hsts_partitioning_browsertest.cc
@@ -160,17 +160,17 @@ class HSTSPartitioningBrowserTestBase : public InProcessBrowserTest {
     return result;
   }
 
-  base::Value NetworkContextGetHSTSState(const std::string& host) {
+  base::Value::Dict NetworkContextGetHSTSState(const std::string& host) {
     content::StoragePartition* partition =
         browser()->profile()->GetDefaultStoragePartition();
     base::RunLoop run_loop;
-    base::Value result;
+    base::Value::Dict result;
     partition->GetNetworkContext()->GetHSTSState(
-        host,
-        base::BindLambdaForTesting([&run_loop, &result](base::Value sts_state) {
-          result = std::move(sts_state);
-          run_loop.Quit();
-        }));
+        host, base::BindLambdaForTesting(
+                  [&run_loop, &result](base::Value::Dict sts_state) {
+                    result = std::move(sts_state);
+                    run_loop.Quit();
+                  }));
     run_loop.Run();
     return result;
   }
@@ -481,13 +481,13 @@ IN_PROC_BROWSER_TEST_F(HSTSPartitioningEnabledBrowserTest, NetworkContextAPI) {
   ExpectHSTSState(a_com_rfh, "a.com", true);
   EXPECT_TRUE(NetworkContextIsHSTSActiveForHost("a.com"));
   EXPECT_TRUE(
-      NetworkContextGetHSTSState("a.com").FindIntKey("dynamic_upgrade_mode"));
+      NetworkContextGetHSTSState("a.com").FindInt("dynamic_upgrade_mode"));
 
   SetHSTS(a_com_rfh, "b.com");
   ExpectHSTSState(a_com_rfh, "b.com", true);
   EXPECT_FALSE(NetworkContextIsHSTSActiveForHost("b.com"));
   EXPECT_FALSE(
-      NetworkContextGetHSTSState("b.com").FindIntKey("dynamic_upgrade_mode"));
+      NetworkContextGetHSTSState("b.com").FindInt("dynamic_upgrade_mode"));
 
   GURL b_com_url("http://b.com/iframe.html");
   auto* b_com_rfh = ui_test_utils::NavigateToURLWithDisposition(
@@ -511,8 +511,8 @@ IN_PROC_BROWSER_TEST_F(HSTSPartitioningEnabledBrowserTest,
                        NetworkContextAddHSTS) {
   NetworkContextAddHSTS("sub.a.com");
   EXPECT_TRUE(NetworkContextIsHSTSActiveForHost("sub.a.com"));
-  EXPECT_TRUE(NetworkContextGetHSTSState("sub.a.com")
-                  .FindIntKey("dynamic_upgrade_mode"));
+  EXPECT_TRUE(
+      NetworkContextGetHSTSState("sub.a.com").FindInt("dynamic_upgrade_mode"));
 
   GURL a_com_url("http://sub.a.com/iframe.html");
   auto* a_com_rfh = ui_test_utils::NavigateToURL(browser(), a_com_url);
diff --git a/browser/farbling/brave_font_whitelist_browsertest.cc b/browser/farbling/brave_font_whitelist_browsertest.cc
index b0e71aa32c09..9071a0ec9790 100644
--- a/browser/farbling/brave_font_whitelist_browsertest.cc
+++ b/browser/farbling/brave_font_whitelist_browsertest.cc
@@ -8,7 +8,6 @@
 #include "brave/components/content_settings/renderer/brave_content_settings_agent_impl.h"
 #include "brave/third_party/blink/renderer/brave_font_whitelist.h"
 #include "content/public/renderer/render_frame.h"
-#include "content/public/renderer/render_view.h"
 #include "content/public/test/render_view_test.h"
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/public/web/web_document.h"
diff --git a/browser/favicon/favicon_database_browsertest.cc b/browser/favicon/favicon_database_browsertest.cc
index 5f7b22ece164..fc42675d82b2 100644
--- a/browser/favicon/favicon_database_browsertest.cc
+++ b/browser/favicon/favicon_database_browsertest.cc
@@ -157,7 +157,7 @@ class BraveFaviconDatabaseBrowserTest : public InProcessBrowserTest {
     ui_test_utils::UrlLoadObserver load_complete(
         landing_url(), content::NotificationService::AllSources());
     ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
-    EXPECT_EQ(contents()->GetMainFrame()->GetLastCommittedURL(), url);
+    EXPECT_EQ(contents()->GetPrimaryMainFrame()->GetLastCommittedURL(), url);
     load_complete.Wait();
 
     EXPECT_EQ(contents()->GetLastCommittedURL(), landing_url());
diff --git a/browser/ipfs/ipfs_tab_helper.cc b/browser/ipfs/ipfs_tab_helper.cc
index 853b7d8b6250..bb55fb20c35f 100644
--- a/browser/ipfs/ipfs_tab_helper.cc
+++ b/browser/ipfs/ipfs_tab_helper.cc
@@ -152,8 +152,8 @@ void IPFSTabHelper::ResolveIPFSLink() {
   auto resolved_callback = base::BindOnce(&IPFSTabHelper::HostResolvedCallback,
                                           weak_ptr_factory_.GetWeakPtr());
   const auto& key =
-      web_contents()->GetMainFrame()
-          ? web_contents()->GetMainFrame()->GetNetworkIsolationKey()
+      web_contents()->GetPrimaryMainFrame()
+          ? web_contents()->GetPrimaryMainFrame()->GetNetworkIsolationKey()
           : net::NetworkIsolationKey();
   resolver_->Resolve(host_port_pair, key, net::DnsQueryType::TXT,
                      std::move(resolved_callback));
diff --git a/browser/ipfs/test/ipfs_navigation_throttle_browsertest.cc b/browser/ipfs/test/ipfs_navigation_throttle_browsertest.cc
index d9fd9cef3833..a434369f4db7 100644
--- a/browser/ipfs/test/ipfs_navigation_throttle_browsertest.cc
+++ b/browser/ipfs/test/ipfs_navigation_throttle_browsertest.cc
@@ -180,7 +180,7 @@ IN_PROC_BROWSER_TEST_F(IpfsNavigationThrottleBrowserTest,
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(IPFSNotConnectedPage::kTypeForTesting,
             GetInterstitialType(web_contents));
   EXPECT_FALSE(GetPrefs()->GetBoolean(kIPFSAutoFallbackToGateway));
@@ -196,7 +196,7 @@ IN_PROC_BROWSER_TEST_F(IpfsNavigationThrottleBrowserTest,
   // time without interstitials.
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), ipfs_url()));
   web_contents = browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(nullptr, GetInterstitialType(web_contents));
   EXPECT_EQ(gateway_url(), web_contents->GetURL());
 }
@@ -215,7 +215,7 @@ IN_PROC_BROWSER_TEST_F(IpfsNavigationThrottleBrowserTest,
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(nullptr, GetInterstitialType(web_contents));
 }
 
diff --git a/browser/ipfs/test/ipfs_not_connected_page_browsertest.cc b/browser/ipfs/test/ipfs_not_connected_page_browsertest.cc
index e1a75277a77b..ae5c6bfd7019 100644
--- a/browser/ipfs/test/ipfs_not_connected_page_browsertest.cc
+++ b/browser/ipfs/test/ipfs_not_connected_page_browsertest.cc
@@ -145,7 +145,7 @@ IN_PROC_BROWSER_TEST_F(IpfsNotConnectedPageBrowserTest,
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(IPFSNotConnectedPage::kTypeForTesting,
             GetInterstitialType(web_contents));
   EXPECT_FALSE(GetPrefs()->GetBoolean(kIPFSAutoFallbackToGateway));
@@ -159,7 +159,7 @@ IN_PROC_BROWSER_TEST_F(IpfsNotConnectedPageBrowserTest,
   // time without interstitials.
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), ipfs_url()));
   web_contents = browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(nullptr, GetInterstitialType(web_contents));
   EXPECT_EQ(gateway_url(), web_contents->GetURL());
 }
diff --git a/browser/ipfs/test/ipfs_onboarding_page_browsertest.cc b/browser/ipfs/test/ipfs_onboarding_page_browsertest.cc
index 562b1a670bcf..fd4a590ea333 100644
--- a/browser/ipfs/test/ipfs_onboarding_page_browsertest.cc
+++ b/browser/ipfs/test/ipfs_onboarding_page_browsertest.cc
@@ -172,7 +172,7 @@ IN_PROC_BROWSER_TEST_F(IpfsOnboardingPageBrowserTest, ShowAndUseLocalNode) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(IPFSOnboardingPage::kTypeForTesting,
             GetInterstitialType(web_contents));
   EXPECT_FALSE(GetPrefs()->GetBoolean(kIPFSAutoFallbackToGateway));
@@ -188,7 +188,7 @@ IN_PROC_BROWSER_TEST_F(IpfsOnboardingPageBrowserTest, ShowAndUseLocalNode) {
   // time without interstitials.
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), ipfs_url()));
   web_contents = browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(nullptr, GetInterstitialType(web_contents));
   EXPECT_EQ(resolved_url, web_contents->GetURL());
 }
@@ -207,7 +207,7 @@ IN_PROC_BROWSER_TEST_F(IpfsOnboardingPageBrowserTest, ShowAndUseGateway) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(IPFSOnboardingPage::kTypeForTesting,
             GetInterstitialType(web_contents));
   EXPECT_FALSE(GetPrefs()->GetBoolean(kIPFSAutoFallbackToGateway));
@@ -222,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(IpfsOnboardingPageBrowserTest, ShowAndUseGateway) {
   // time without interstitials.
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), ipfs_url()));
   web_contents = browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(nullptr, GetInterstitialType(web_contents));
   EXPECT_EQ(gateway_url(), web_contents->GetURL());
 }
@@ -241,7 +241,7 @@ IN_PROC_BROWSER_TEST_F(IpfsOnboardingPageBrowserTest, LearnMore) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(IPFSOnboardingPage::kTypeForTesting,
             GetInterstitialType(web_contents));
   EXPECT_FALSE(GetPrefs()->GetBoolean(kIPFSAutoFallbackToGateway));
@@ -270,7 +270,7 @@ IN_PROC_BROWSER_TEST_F(IpfsOnboardingPageBrowserTest, OpenSettings) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetMainFrame()));
+  EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame()));
   EXPECT_EQ(IPFSOnboardingPage::kTypeForTesting,
             GetInterstitialType(web_contents));
   EXPECT_FALSE(GetPrefs()->GetBoolean(kIPFSAutoFallbackToGateway));
diff --git a/browser/ipfs/test/ipfs_service_browsertest.cc b/browser/ipfs/test/ipfs_service_browsertest.cc
index 5340f920d412..402c131efd4f 100644
--- a/browser/ipfs/test/ipfs_service_browsertest.cc
+++ b/browser/ipfs/test/ipfs_service_browsertest.cc
@@ -870,7 +870,7 @@ IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest,
 
   int child_index = 0;
   while (auto* child_frame =
-             ChildFrameAt(contents->GetMainFrame(), child_index++)) {
+             ChildFrameAt(contents->GetPrimaryMainFrame(), child_index++)) {
     auto location =
         EvalJs(child_frame,
                "const timer = setInterval(function () {"
@@ -903,7 +903,7 @@ IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest, CannotLoadIframeFromHTTP) {
 
   int child_index = 0;
   while (auto* child_frame =
-             ChildFrameAt(contents->GetMainFrame(), child_index++)) {
+             ChildFrameAt(contents->GetPrimaryMainFrame(), child_index++)) {
     auto location =
         EvalJs(child_frame,
                "const timer = setInterval(function () {"
@@ -938,7 +938,7 @@ IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest,
 
   int child_index = 0;
   while (auto* child_frame =
-             ChildFrameAt(contents->GetMainFrame(), child_index++)) {
+             ChildFrameAt(contents->GetPrimaryMainFrame(), child_index++)) {
     auto location =
         EvalJs(child_frame,
                "const timer = setInterval(function () {"
@@ -992,10 +992,11 @@ IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest, CanLoadIFrameFromIPFS) {
       contents->GetLastCommittedURL(),
       ipfs::GetIPFSGatewayURL("Qmc2JTQo4iXf24g98otZmGFQq176eQ2Cdbb88qA5ToMEvC",
                               "simple_content", GetDefaultIPFSGateway(prefs)));
-  EXPECT_EQ(ChildFrameAt(contents->GetMainFrame(), 0)->GetLastCommittedURL(),
-            ipfs::GetIPFSGatewayURL(
-                "Qmc2JTQo4iXf24g98otZmGFQq176eQ2Cdbb88qA5ToMEvC",
-                "simple_content_2", GetDefaultIPFSGateway(prefs)));
+  EXPECT_EQ(
+      ChildFrameAt(contents->GetPrimaryMainFrame(), 0)->GetLastCommittedURL(),
+      ipfs::GetIPFSGatewayURL("Qmc2JTQo4iXf24g98otZmGFQq176eQ2Cdbb88qA5ToMEvC",
+                              "simple_content_2",
+                              GetDefaultIPFSGateway(prefs)));
 }
 
 // Make sure an <img src="ipfs://..."> can load within another ipfs:// scheme
diff --git a/browser/net/brave_network_delegate_browsertest.cc b/browser/net/brave_network_delegate_browsertest.cc
index f6748cd42c63..a93de1b2fc26 100644
--- a/browser/net/brave_network_delegate_browsertest.cc
+++ b/browser/net/brave_network_delegate_browsertest.cc
@@ -335,7 +335,7 @@ IN_PROC_BROWSER_TEST_F(BraveNetworkDelegateBrowserTest,
                   "nested_iframe");
 
   content::RenderFrameHost* child_frame =
-      content::ChildFrameAt(web_contents->GetMainFrame(), 0);
+      content::ChildFrameAt(web_contents->GetPrimaryMainFrame(), 0);
   NavigateRenderFrameToURL(child_frame, "iframe_cookie",
                            subdomain_first_party_cookie_url_);
 
diff --git a/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc b/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc
index 32f688d3374c..a6ea8b93e1bf 100644
--- a/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc
+++ b/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc
@@ -190,7 +190,8 @@ class BraveSiteHacksNetworkDelegateBrowserTest : public InProcessBrowserTest {
     ui_test_utils::UrlLoadObserver load_complete(
         landing_url, content::NotificationService::AllSources());
     ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), original_url));
-    EXPECT_EQ(contents()->GetMainFrame()->GetLastCommittedURL(), original_url);
+    EXPECT_EQ(contents()->GetPrimaryMainFrame()->GetLastCommittedURL(),
+              original_url);
     load_complete.Wait();
 
     EXPECT_EQ(contents()->GetLastCommittedURL(), landing_url);
diff --git a/browser/net/global_privacy_control_network_delegate_helper_browsertest.cc b/browser/net/global_privacy_control_network_delegate_helper_browsertest.cc
index ae1aae56f1c9..7b7148200172 100644
--- a/browser/net/global_privacy_control_network_delegate_helper_browsertest.cc
+++ b/browser/net/global_privacy_control_network_delegate_helper_browsertest.cc
@@ -85,8 +85,10 @@ IN_PROC_BROWSER_TEST_F(GlobalPrivacyControlNetworkDelegateBrowserTest,
   const GURL target = https_server().GetURL("a.test", "/index.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), target));
 
-  auto* rfh =
-      browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame();
+  auto* rfh = browser()
+                  ->tab_strip_model()
+                  ->GetActiveWebContents()
+                  ->GetPrimaryMainFrame();
 
   EXPECT_EQ(true, content::EvalJs(rfh, "navigator.globalPrivacyControl"));
   EXPECT_EQ(true, content::EvalJs(rfh,
diff --git a/browser/net/ipfs_redirect_network_delegate_helper_browsertest.cc b/browser/net/ipfs_redirect_network_delegate_helper_browsertest.cc
index 457647cf218b..8be51d479c96 100644
--- a/browser/net/ipfs_redirect_network_delegate_helper_browsertest.cc
+++ b/browser/net/ipfs_redirect_network_delegate_helper_browsertest.cc
@@ -88,7 +88,7 @@ IN_PROC_BROWSER_TEST_F(IpfsRedirectNetworkDelegateHelperBrowserTest,
   // Try to navigate to the url. The navigation should be canceled and the
   // NavigationHandle should have the right error code.
   EXPECT_TRUE(ui_test_utils::NavigateToURL(private_browser, ipfs_url()));
-  EXPECT_TRUE(private_wc->GetMainFrame()->IsErrorDocument());
+  EXPECT_TRUE(private_wc->GetPrimaryMainFrame()->IsErrorDocument());
   EXPECT_EQ(net::ERR_INCOGNITO_IPFS_NOT_ALLOWED, observer.net_error_code());
 }
 
@@ -108,7 +108,7 @@ IN_PROC_BROWSER_TEST_F(IpfsRedirectNetworkDelegateHelperBrowserTest,
   // Try to navigate to the url. The navigation should be canceled and the
   // NavigationHandle should have the right error code.
   EXPECT_TRUE(ui_test_utils::NavigateToURL(browser(), ipfs_url()));
-  EXPECT_TRUE(wc->GetMainFrame()->IsErrorDocument());
+  EXPECT_TRUE(wc->GetPrimaryMainFrame()->IsErrorDocument());
   EXPECT_EQ(net::ERR_IPFS_DISABLED, observer.net_error_code());
 }
 
diff --git a/browser/permissions/brave_wallet_permission_context_browsertest.cc b/browser/permissions/brave_wallet_permission_context_browsertest.cc
index 4c8850405965..4d582eac393e 100644
--- a/browser/permissions/brave_wallet_permission_context_browsertest.cc
+++ b/browser/permissions/brave_wallet_permission_context_browsertest.cc
@@ -122,8 +122,8 @@ IN_PROC_BROWSER_TEST_F(BraveWalletPermissionContextBrowserTest,
 
   // No allowed accounts before setting permissions.
   BraveWalletPermissionContext::GetAllowedAccounts(
-      blink::PermissionType::BRAVE_ETHEREUM, web_contents()->GetMainFrame(),
-      addresses,
+      blink::PermissionType::BRAVE_ETHEREUM,
+      web_contents()->GetPrimaryMainFrame(), addresses,
       base::BindOnce(&OnGetAllowedAccountsResult, &was_called, true,
                      std::vector<std::string>()));
 
@@ -145,8 +145,8 @@ IN_PROC_BROWSER_TEST_F(BraveWalletPermissionContextBrowserTest,
         ContentSetting::CONTENT_SETTING_ALLOW);
   }
   BraveWalletPermissionContext::GetAllowedAccounts(
-      blink::PermissionType::BRAVE_ETHEREUM, web_contents()->GetMainFrame(),
-      addresses,
+      blink::PermissionType::BRAVE_ETHEREUM,
+      web_contents()->GetPrimaryMainFrame(), addresses,
       base::BindOnce(&OnGetAllowedAccountsResult, &was_called, true,
                      expected_allowed_accounts));
   content::RunAllTasksUntilIdle();
diff --git a/browser/permissions/permission_lifetime_manager_browsertest.cc b/browser/permissions/permission_lifetime_manager_browsertest.cc
index b9d56c087909..02b070456d2b 100644
--- a/browser/permissions/permission_lifetime_manager_browsertest.cc
+++ b/browser/permissions/permission_lifetime_manager_browsertest.cc
@@ -114,7 +114,7 @@ class PermissionLifetimeManagerBrowserTest : public InProcessBrowserTest {
   }
 
   content::RenderFrameHost* GetActiveMainFrame() {
-    return active_web_contents()->GetMainFrame();
+    return active_web_contents()->GetPrimaryMainFrame();
   }
 
   void ReadPreTestData() {
diff --git a/browser/permissions/permission_manager_browsertest.cc b/browser/permissions/permission_manager_browsertest.cc
index d87c0c223187..8bf94559e8a6 100644
--- a/browser/permissions/permission_manager_browsertest.cc
+++ b/browser/permissions/permission_manager_browsertest.cc
@@ -169,8 +169,8 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, RequestPermissions) {
         permission_request_manager);
 
     permission_manager()->RequestPermissionsForOrigin(
-        permissions, web_contents()->GetMainFrame(), origin.GetURL(), true,
-        base::DoNothing());
+        permissions, web_contents()->GetPrimaryMainFrame(), origin.GetURL(),
+        true, base::DoNothing());
 
     content::RunAllTasksUntilIdle();
 
@@ -206,8 +206,8 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, RequestPermissions) {
 
     observer->Reset();
     permission_manager()->RequestPermissionsForOrigin(
-        permissions, web_contents()->GetMainFrame(), origin.GetURL(), true,
-        base::DoNothing());
+        permissions, web_contents()->GetPrimaryMainFrame(), origin.GetURL(),
+        true, base::DoNothing());
 
     content::RunAllTasksUntilIdle();
     EXPECT_TRUE(permission_request_manager->IsRequestInProgress())
@@ -296,8 +296,8 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest,
         permission_request_manager);
 
     permission_manager()->RequestPermissionsForOrigin(
-        permissions, web_contents()->GetMainFrame(), origin.GetURL(), true,
-        base::DoNothing());
+        permissions, web_contents()->GetPrimaryMainFrame(), origin.GetURL(),
+        true, base::DoNothing());
 
     content::RunAllTasksUntilIdle();
 
diff --git a/browser/renderer_context_menu/brave_mock_render_view_context_menu.cc b/browser/renderer_context_menu/brave_mock_render_view_context_menu.cc
index 335183f6c431..ba4bc740e49c 100644
--- a/browser/renderer_context_menu/brave_mock_render_view_context_menu.cc
+++ b/browser/renderer_context_menu/brave_mock_render_view_context_menu.cc
@@ -133,7 +133,7 @@ void BraveMockRenderViewContextMenu::AddSubMenu(int command_id,
   item.has_submenu = true;
   items_.push_back(item);
 
-  for (int i = 0; i < model->GetItemCount(); ++i) {
+  for (size_t i = 0; i < model->GetItemCount(); ++i) {
     MockMenuItem sub_item;
     sub_item.is_submenu = true;
     if (model->GetTypeAt(i) != ui::MenuModel::TYPE_SEPARATOR) {
diff --git a/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc b/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc
index 55d0f4147696..5b191aa2c5f1 100644
--- a/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc
+++ b/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc
@@ -14,6 +14,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/prefs/pref_service.h"
 #include "components/spellcheck/browser/pref_names.h"
+#include "components/spellcheck/common/spellcheck_features.h"
 #include "content/public/browser/context_menu_params.h"
 #include "content/public/test/browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -73,9 +74,20 @@ class BraveSpellingMenuObserverTest : public InProcessBrowserTest {
  private:
   std::unique_ptr<SpellingMenuObserver> observer_;
   std::unique_ptr<BraveMockRenderViewContextMenu> menu_;
+
+#if BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
+  base::test::ScopedFeatureList feature_list_;
+#endif  // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
 };
 
+#if BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
+BraveSpellingMenuObserverTest::BraveSpellingMenuObserverTest() {
+  feature_list_.InitAndDisableFeature(
+      spellcheck::kWinDelaySpellcheckServiceInit);
+}
+#else
 BraveSpellingMenuObserverTest::BraveSpellingMenuObserverTest() = default;
+#endif
 
 BraveSpellingMenuObserverTest::~BraveSpellingMenuObserverTest() = default;
 
diff --git a/browser/renderer_context_menu/brave_spelling_options_submenu_observer.cc b/browser/renderer_context_menu/brave_spelling_options_submenu_observer.cc
index b4b0bf2b6d4b..b4e26ddf3fd2 100644
--- a/browser/renderer_context_menu/brave_spelling_options_submenu_observer.cc
+++ b/browser/renderer_context_menu/brave_spelling_options_submenu_observer.cc
@@ -27,9 +27,9 @@ void BraveSpellingOptionsSubMenuObserver::InitMenu(
   // 2. We overrode RenderViewContextMenu::AddSpellCheckServiceItem so that the
   // spelling suggestions toggle isn't added to the menu by the base class.
   DCHECK(!use_spelling_service_.GetValue());
-  DCHECK_EQ(
-      submenu_model_.GetIndexOfCommandId(IDC_CONTENT_CONTEXT_SPELLING_TOGGLE),
-      -1);
+  DCHECK(
+      !submenu_model_.GetIndexOfCommandId(IDC_CONTENT_CONTEXT_SPELLING_TOGGLE)
+           .has_value());
 
   // Check if we ended up with a separator as the last item and, if so, get rid
   // of it.
diff --git a/browser/resources/settings/brave_appearance_page/BUILD.gn b/browser/resources/settings/brave_appearance_page/BUILD.gn
index 7146452789a6..45c05547a955 100644
--- a/browser/resources/settings/brave_appearance_page/BUILD.gn
+++ b/browser/resources/settings/brave_appearance_page/BUILD.gn
@@ -32,7 +32,6 @@ js_library("brave_appearance_browser_proxy") {
 js_library("brave_theme") {
   deps = [
     ":brave_appearance_browser_proxy",
-    "//chrome/browser/resources/settings:router",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
@@ -43,7 +42,6 @@ js_library("brave_theme") {
 
 js_library("super_referral") {
   deps = [
-    "//chrome/browser/resources/settings:router",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
diff --git a/browser/resources/settings/brave_appearance_page/brave_theme.html b/browser/resources/settings/brave_appearance_page/brave_theme.html
index 3cb652a2ca31..e8fa0a210430 100644
--- a/browser/resources/settings/brave_appearance_page/brave_theme.html
+++ b/browser/resources/settings/brave_appearance_page/brave_theme.html
@@ -13,7 +13,7 @@
   </select>
 </div>
 <template is="dom-if" if="[[useThemesSubPage_()]]">
-  <cr-link-row class="hr" id="themes-subpage-trigger"
+  <cr-link-row class="first" id="themes-subpage-trigger"
       label="$i18n{themes}" on-click="onThemeTap_"
       role-description="$i18n{subpageArrowRoleDescription}">
   </cr-link-row>
diff --git a/browser/resources/settings/brave_appearance_page/brave_theme.js b/browser/resources/settings/brave_appearance_page/brave_theme.js
index 3c733863d86a..f72ca4188695 100644
--- a/browser/resources/settings/brave_appearance_page/brave_theme.js
+++ b/browser/resources/settings/brave_appearance_page/brave_theme.js
@@ -8,7 +8,7 @@ import {WebUIListenerBehavior} from 'chrome://resources/js/web_ui_listener_behav
 import {routes} from '../route.js';
 import {Router} from '../router.js';
 import 'chrome://resources/cr_elements/md_select_css.m.js';
-import '../settings_shared_css.js';
+import '../settings_shared.css.js';
 import '../settings_vars.css.js';
 import {loadTimeData} from "../i18n_setup.js"
 import {BraveAppearanceBrowserProxy,  BraveAppearanceBrowserProxyImpl} from './brave_appearance_browser_proxy.js';
diff --git a/browser/resources/settings/brave_appearance_page/sidebar.js b/browser/resources/settings/brave_appearance_page/sidebar.js
index ad6b19585a38..1a924c004ad2 100644
--- a/browser/resources/settings/brave_appearance_page/sidebar.js
+++ b/browser/resources/settings/brave_appearance_page/sidebar.js
@@ -4,7 +4,7 @@
 // you can obtain one at http://mozilla.org/MPL/2.0/.
 
 import {Polymer, html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import '../settings_shared_css.js';
+import '../settings_shared.css.js';
 import '../settings_vars.css.js';
 import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'
 
diff --git a/browser/resources/settings/brave_appearance_page/toolbar.js b/browser/resources/settings/brave_appearance_page/toolbar.js
index 47789bebd348..c57c1d028ca8 100644
--- a/browser/resources/settings/brave_appearance_page/toolbar.js
+++ b/browser/resources/settings/brave_appearance_page/toolbar.js
@@ -5,7 +5,7 @@
 
 import {Polymer, html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 import {loadTimeData} from "../i18n_setup.js"
-import '../settings_shared_css.js';
+import '../settings_shared.css.js';
 import '../settings_vars.css.js';
 import { I18nBehavior } from 'chrome://resources/js/i18n_behavior.m.js'
 
diff --git a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.js b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.js
index 75e57bdc5512..be00f3ef8ebc 100644
--- a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.js
+++ b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_on_exit_page.js
@@ -4,7 +4,7 @@
 // you can obtain one at http://mozilla.org/MPL/2.0/.
 
 import 'chrome://resources/cr_elements/shared_vars_css.m.js';
-import '../settings_shared_css.js';
+import '../settings_shared.css.js';
 import '../settings_vars.css.js';
 import '../controls/settings_checkbox.js';
 
diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html
index 6c209deb42a7..6e479780a7dc 100644
--- a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html
+++ b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html
@@ -5,7 +5,7 @@
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="brave_default_extensions_browser_proxy.html">
 <script type="module" src="../settings_page/settings_section.js"></script>
-<script type="module" src="../settings_shared_css.js"></script>
+<script type="module" src="../settings_shared.css.js"></script>
 <script type="module" src="../settings_vars.css.js"></script>
 <script type="module" src="chrome://resources/cr_elements/cr_link_row/cr_link_row.js"></script>
 
diff --git a/browser/resources/settings/brave_help_tips_page/brave_help_tips_page.html b/browser/resources/settings/brave_help_tips_page/brave_help_tips_page.html
index bfdd12c6e00b..b4dc1ec742e3 100644
--- a/browser/resources/settings/brave_help_tips_page/brave_help_tips_page.html
+++ b/browser/resources/settings/brave_help_tips_page/brave_help_tips_page.html
@@ -1,3 +1,4 @@
+<style include="cr-shared-style"></style>
 
 <if expr="enable_brave_wayback_machine">
   <settings-toggle-button class="cr-row"
@@ -5,12 +6,12 @@
                           label="$i18n{braveHelpTipsWaybackMachineLabel}">
   </settings-toggle-button>
 </if>
-  <settings-toggle-button class="cr-row"
+  <settings-toggle-button class="cr-row hr"
                           pref="{{prefs.brave.enable_window_closing_confirm}}"
                           label="$i18n{braveHelpTipsWarnBeforeClosingWindow}">
   </settings-toggle-button>
 <if expr="is_macosx">
-  <settings-toggle-button class="cr-row"
+  <settings-toggle-button class="cr-row hr"
                           pref="{{prefs.browser.confirm_to_quit}}"
                           label="$i18n{warnBeforeQuitting}">
   </settings-toggle-button>
diff --git a/browser/resources/settings/brave_ipfs_page/add_ipfs_peer_dialog.html b/browser/resources/settings/brave_ipfs_page/add_ipfs_peer_dialog.html
index 378b70a8d98f..a351ea12277c 100644
--- a/browser/resources/settings/brave_ipfs_page/add_ipfs_peer_dialog.html
+++ b/browser/resources/settings/brave_ipfs_page/add_ipfs_peer_dialog.html
@@ -1,5 +1,5 @@
 <script type="module" src="brave_ipfs_browser_proxy.js"></script>
-<script type="module" src="../settings_shared_css.js"></script>
+<script type="module" src="../settings_shared.css.js"></script>
 
 <style include="settings-shared">
   #submit {
diff --git a/browser/resources/settings/brave_ipfs_page/add_p2p_key_dialog.html b/browser/resources/settings/brave_ipfs_page/add_p2p_key_dialog.html
index e8498e2c79e9..1e34c2956c28 100644
--- a/browser/resources/settings/brave_ipfs_page/add_p2p_key_dialog.html
+++ b/browser/resources/settings/brave_ipfs_page/add_p2p_key_dialog.html
@@ -1,5 +1,5 @@
 <script type="module" src="brave_ipfs_browser_proxy.js"></script>
-<script type="module" src="../settings_shared_css.js"></script>
+<script type="module" src="../settings_shared.css.js"></script>
 
 <style include="settings-shared">
   #submit {
diff --git a/browser/resources/settings/brave_ipfs_page/change_ipfs_gateway_dialog.js b/browser/resources/settings/brave_ipfs_page/change_ipfs_gateway_dialog.js
index 3da9443365ec..8e014c7a3edf 100644
--- a/browser/resources/settings/brave_ipfs_page/change_ipfs_gateway_dialog.js
+++ b/browser/resources/settings/brave_ipfs_page/change_ipfs_gateway_dialog.js
@@ -15,7 +15,7 @@ import 'chrome://resources/cr_elements/cr_input/cr_input.m.js';
 import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 import {I18nMixin} from 'chrome://resources/js/i18n_mixin.js';
 import {PrefsMixin} from '../prefs/prefs_mixin.js';
-import '../settings_shared_css.js';
+import '../settings_shared.css.js';
 import {BraveIPFSBrowserProxyImpl} from './brave_ipfs_browser_proxy.m.js';
 
 const ChangeIpfsGatewayDialogBase = I18nMixin(PrefsMixin(PolymerElement))
diff --git a/browser/resources/settings/brave_ipfs_page/ipfs_peers_subpage.html b/browser/resources/settings/brave_ipfs_page/ipfs_peers_subpage.html
index 0333cc1de87e..144de96bcc47 100644
--- a/browser/resources/settings/brave_ipfs_page/ipfs_peers_subpage.html
+++ b/browser/resources/settings/brave_ipfs_page/ipfs_peers_subpage.html
@@ -6,7 +6,7 @@
 <link rel="import" href="add_ipfs_peer_dialog.js">
 <script type="module" src="../brave_ipfs_browser_proxy.js"></script>
 <script type="module" src="../../settings_page/settings_section.js"></script>
-<script type="module" src="../../settings_shared_css.js"></script>
+<script type="module" src="../../settings_shared.css.js"></script>
 <script type="module" src="../../settings_vars.css.js"></script>
 <script type="module" src="chrome://resources/cr_elements/cr_link_row/cr_link_row.js"></script>
 
diff --git a/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.html b/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.html
index 13b7ca1544a1..dc199fb3d074 100644
--- a/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.html
+++ b/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.html
@@ -7,7 +7,7 @@
 <link rel="import" href="rotate_p2p_key_dialog.js">
 <script type="module" src="brave_ipfs_browser_proxy.js"></script>
 <script type="module" src="../settings_page/settings_section.js"></script>
-<script type="module" src="../settings_shared_css.js"></script>
+<script type="module" src="../settings_shared.css.js"></script>
 <script type="module" src="../settings_vars.css.js"></script>
 <script type="module" src="chrome://resources/cr_elements/cr_link_row/cr_link_row.js"></script>
 
diff --git a/browser/resources/settings/brave_ipfs_page/rotate_p2p_key_dialog.html b/browser/resources/settings/brave_ipfs_page/rotate_p2p_key_dialog.html
index f7e41705c34e..b273d1f7e07e 100644
--- a/browser/resources/settings/brave_ipfs_page/rotate_p2p_key_dialog.html
+++ b/browser/resources/settings/brave_ipfs_page/rotate_p2p_key_dialog.html
@@ -1,5 +1,5 @@
 <script type="module" src="brave_ipfs_browser_proxy.js"></script>
-<script type="module" src="../settings_shared_css.js"></script>
+<script type="module" src="../settings_shared.css.js"></script>
 
 <style include="settings-shared">
   #submit {
diff --git a/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.html b/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.html
index 8d69b9b1b8ae..0f5b17815d13 100644
--- a/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.html
+++ b/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.html
@@ -3,7 +3,7 @@
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
 <link rel="import" href="brave_new_tab_browser_proxy.html">
-<script type="module" src="../settings_shared_css.js"></script>
+<script type="module" src="../settings_shared.css.js"></script>
 <script type="module" src="../settings_vars.css.js"></script>
 
 <dom-module id="settings-brave-new-tab-page">
@@ -36,7 +36,7 @@
     </div>
     <template is="dom-if" if="[[showNewTabDashboardSettings_]]">
       <div class="settings-row">
-        <cr-link-row
+        <cr-link-row class="hr"
           label="$i18n{braveNewTabNewTabCustomizeWidgets}"
           on-click="openNewTabPage_" external>
         </cr-link-row>
diff --git a/browser/resources/settings/brave_overrides/appearance_page.js b/browser/resources/settings/brave_overrides/appearance_page.js
index 2e7133acb518..b8fc89fdff47 100644
--- a/browser/resources/settings/brave_overrides/appearance_page.js
+++ b/browser/resources/settings/brave_overrides/appearance_page.js
@@ -21,6 +21,13 @@ RegisterPolymerTemplateModifications({
     if (!theme) {
       console.error(`[Brave Settings Overrides] Couldn't find #themeRow`)
     } else {
+      const useDefaultButtonTemplate = templateContent.querySelector('template[is=dom-if][if="[[prefs.extensions.theme.id.value]]"]')
+      if (!useDefaultButtonTemplate) {
+        console.error('[Brave Settings Overrides] Appearance Page cannot find use default theme button template')
+      } else {
+        useDefaultButtonTemplate.setAttribute("restamp", "true")
+      }
+      theme.setAttribute("class", "settings-row hr")
       theme.insertAdjacentHTML('beforebegin', `
         <settings-brave-appearance-theme prefs="{{prefs}}"></settings-brave-appearance-theme>
       `)
diff --git a/browser/resources/settings/brave_overrides/basic_page.js b/browser/resources/settings/brave_overrides/basic_page.js
index 68af949f7375..c71f9bbfd536 100644
--- a/browser/resources/settings/brave_overrides/basic_page.js
+++ b/browser/resources/settings/brave_overrides/basic_page.js
@@ -109,6 +109,12 @@ RegisterPolymerTemplateModifications({
     if (!basicPageEl) {
       console.error('[Brave Settings Overrides] Could not find basicPage element to insert Getting Started section')
     } else {
+      const privacyGuidePromoSection = actualTemplate.content.querySelector('#privacyGuidePromoSection')
+      if (!privacyGuidePromoSection) {
+        console.error('[Brave Settings Overrides] Could not find privacyGuidePromoSection element to hide')
+      } else {
+        privacyGuidePromoSection.remove()
+      }
       const sectionGetStarted = document.createElement('template')
       sectionGetStarted.setAttribute('is', 'dom-if')
       sectionGetStarted.setAttribute('restamp', true)
diff --git a/browser/resources/settings/brave_overrides/privacy_page.js b/browser/resources/settings/brave_overrides/privacy_page.js
index d0206b976ad6..62f0170a249f 100644
--- a/browser/resources/settings/brave_overrides/privacy_page.js
+++ b/browser/resources/settings/brave_overrides/privacy_page.js
@@ -95,5 +95,17 @@ RegisterPolymerTemplateModifications({
         }
       }
     }
+
+    const showPrivacyGuideEntryPointTemplate = templateContent.querySelector(`template[if*='showPrivacyGuideEntryPoint_']`)
+    if (!showPrivacyGuideEntryPointTemplate) {
+      console.error('[Brave Settings Overrides] Could not find template with if*=showPrivacyGuideEntryPoint_ on privacy page.')
+    } else {
+      const privacyGuideLinkRow = showPrivacyGuideEntryPointTemplate.content.getElementById('privacyGuideLinkRow')
+      if (!privacyGuideLinkRow) {
+        console.error('[Brave Settings Overrides] Could not find privacyGuideLinkRow id on privacy page.')
+      } else {
+        privacyGuideLinkRow.setAttribute('hidden', 'true')
+      }
+    }
   },
 })
diff --git a/browser/resources/settings/brave_privacy_page/brave_personalization_options.html b/browser/resources/settings/brave_privacy_page/brave_personalization_options.html
index 26391025c9ae..616bbf06ca0b 100644
--- a/browser/resources/settings/brave_privacy_page/brave_personalization_options.html
+++ b/browser/resources/settings/brave_privacy_page/brave_personalization_options.html
@@ -4,7 +4,7 @@
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
 <link rel="import" href="brave_privacy_page_browser_proxy.html">
-<script type="module" src="../settings_shared_css.js"></script>
+<script type="module" src="../settings_shared.css.js"></script>
 <script type="module" src="../settings_vars.css.js"></script>
 
 <dom-module id="settings-brave-personalization-options">
diff --git a/browser/resources/settings/brave_search_engines_page/brave_search_engines_page.js b/browser/resources/settings/brave_search_engines_page/brave_search_engines_page.js
index 19d2ae1bfbcc..2d0899c12fc3 100644
--- a/browser/resources/settings/brave_search_engines_page/brave_search_engines_page.js
+++ b/browser/resources/settings/brave_search_engines_page/brave_search_engines_page.js
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import '../settings_shared_css.js';
+import '../settings_shared.css.js';
 import '../settings_vars.css.js';
 
 import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/browser/resources/settings/brave_sync_page/brave_sync_code_dialog.js b/browser/resources/settings/brave_sync_page/brave_sync_code_dialog.js
index bab8224a8cc4..dd563223ba88 100644
--- a/browser/resources/settings/brave_sync_page/brave_sync_code_dialog.js
+++ b/browser/resources/settings/brave_sync_page/brave_sync_code_dialog.js
@@ -3,7 +3,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // you can obtain one at http://mozilla.org/MPL/2.0/.
 
-import '../settings_shared_css.js';
+import '../settings_shared.css.js';
 
 import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
 import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
diff --git a/browser/resources/settings/brave_sync_page/brave_sync_page.js b/browser/resources/settings/brave_sync_page/brave_sync_page.js
index d67c3d95eff5..5e4e02f0b57f 100644
--- a/browser/resources/settings/brave_sync_page/brave_sync_page.js
+++ b/browser/resources/settings/brave_sync_page/brave_sync_page.js
@@ -11,7 +11,7 @@ import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
 import 'chrome://resources/cr_elements/icons.m.js';
 import '../settings_page/settings_animated_pages.js';
 import '../settings_page/settings_subpage.js';
-import '../settings_shared_css.js';
+import '../settings_shared.css.js';
 import '../settings_vars.css.js';
 import './brave_sync_subpage.js';
 
diff --git a/browser/resources/settings/brave_sync_page/brave_sync_subpage.js b/browser/resources/settings/brave_sync_page/brave_sync_subpage.js
index 35f246ae9c1c..cbb32788b37c 100644
--- a/browser/resources/settings/brave_sync_page/brave_sync_subpage.js
+++ b/browser/resources/settings/brave_sync_page/brave_sync_subpage.js
@@ -11,7 +11,7 @@ import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.m.js';
 import 'chrome://resources/cr_elements/icons.m.js';
 import 'chrome://resources/cr_elements/shared_style_css.m.js';
 import 'chrome://resources/cr_elements/shared_vars_css.m.js';
-import '../settings_shared_css.js';
+import '../settings_shared.css.js';
 import '../settings_vars.css.js';
 import '../people_page/sync_controls.js';
 import './brave_sync_configure.js';
diff --git a/browser/resources/settings/brave_tor_page/brave_tor_bridges_dialog.js b/browser/resources/settings/brave_tor_page/brave_tor_bridges_dialog.js
index 93a40f6befd6..eb59ff78b3bd 100644
--- a/browser/resources/settings/brave_tor_page/brave_tor_bridges_dialog.js
+++ b/browser/resources/settings/brave_tor_page/brave_tor_bridges_dialog.js
@@ -9,7 +9,7 @@ import 'chrome://resources/cr_elements/cr_input/cr_input.m.js';
 import { html, PolymerElement } from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 import { I18nMixin } from 'chrome://resources/js/i18n_mixin.js';
 import { PrefsMixin } from '../prefs/prefs_mixin.js';
-import '../settings_shared_css.js';
+import '../settings_shared.css.js';
 import { BraveTorBrowserProxyImpl } from './brave_tor_browser_proxy.js'
 
 const RequestBridgesDialogBase = I18nMixin(PrefsMixin(PolymerElement))
diff --git a/browser/resources/settings/brave_wallet_page/BUILD.gn b/browser/resources/settings/brave_wallet_page/BUILD.gn
index 641d770185e6..b3da35900db8 100644
--- a/browser/resources/settings/brave_wallet_page/BUILD.gn
+++ b/browser/resources/settings/brave_wallet_page/BUILD.gn
@@ -32,7 +32,6 @@ js_modulizer("modules") {
 
 js_library("wallet_networks") {
   deps = [
-    "//chrome/browser/resources/settings:router",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
diff --git a/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.html b/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.html
index 05ba2bb8d168..81c25899b56f 100644
--- a/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.html
+++ b/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.html
@@ -1,4 +1,4 @@
-<script type="module" src="../settings_shared_css.js"></script>
+<script type="module" src="../settings_shared.css.js"></script>
 <script type="module" src="../settings_vars_css.js"></script>
 
 <style include="settings-shared">
diff --git a/browser/resources/settings/social_blocking_page/social_blocking_page.html b/browser/resources/settings/social_blocking_page/social_blocking_page.html
index 73c53b024a4f..df50a50869d9 100644
--- a/browser/resources/settings/social_blocking_page/social_blocking_page.html
+++ b/browser/resources/settings/social_blocking_page/social_blocking_page.html
@@ -2,7 +2,7 @@
 
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
-<script type="module" src="../settings_shared_css.js"></script>
+<script type="module" src="../settings_shared.css.js"></script>
 <script type="module" src="../settings_vars.css.js"></script>
 
 <dom-module id="settings-social-blocking-page">
diff --git a/browser/test/disabled_features/navigator_storage_browsertest.cc b/browser/test/disabled_features/navigator_storage_browsertest.cc
index 9867b4725b73..8f0843a5113f 100644
--- a/browser/test/disabled_features/navigator_storage_browsertest.cc
+++ b/browser/test/disabled_features/navigator_storage_browsertest.cc
@@ -35,6 +35,6 @@ IN_PROC_BROWSER_TEST_F(NavigatorStorageEstimateQuotaTest, Is2Gb) {
   ASSERT_TRUE(content::WaitForLoadStop(contents));
   EXPECT_EQ(url, contents->GetURL());
 
-  EXPECT_EQ(true, content::EvalJs(contents->GetMainFrame(),
+  EXPECT_EQ(true, content::EvalJs(contents->GetPrimaryMainFrame(),
                                   "getStorageEstimateIs2Gb()"));
 }
diff --git a/browser/test/disabled_features/window_name_browsertest.cc b/browser/test/disabled_features/window_name_browsertest.cc
index d40c0702e23c..d4f45d8811e8 100644
--- a/browser/test/disabled_features/window_name_browsertest.cc
+++ b/browser/test/disabled_features/window_name_browsertest.cc
@@ -67,7 +67,7 @@ class BraveWindowNameBrowserTest : public InProcessBrowserTest {
   }
 
   void SetHref(const std::string& id, const std::string& href) {
-    content::RenderFrameHost* frame = web_contents()->GetMainFrame();
+    content::RenderFrameHost* frame = web_contents()->GetPrimaryMainFrame();
     frame->ExecuteJavaScriptForTests(
         base::ASCIIToUTF16("document.getElementById('" + id + "').href='" +
                            href + "';\n"),
@@ -76,7 +76,7 @@ class BraveWindowNameBrowserTest : public InProcessBrowserTest {
 
   void Click(const std::string& id) {
     content::TestNavigationObserver observer(web_contents());
-    content::RenderFrameHost* frame = web_contents()->GetMainFrame();
+    content::RenderFrameHost* frame = web_contents()->GetPrimaryMainFrame();
     frame->ExecuteJavaScriptForTests(
         base::ASCIIToUTF16("document.getElementById('" + id + "').click();\n"),
         base::NullCallback());
diff --git a/browser/themes/brave_private_window_theme_supplier.cc b/browser/themes/brave_private_window_theme_supplier.cc
index 1f74854775a4..f57f1dd0a2e1 100644
--- a/browser/themes/brave_private_window_theme_supplier.cc
+++ b/browser/themes/brave_private_window_theme_supplier.cc
@@ -20,4 +20,6 @@ void BravePrivateWindowThemeSupplier::AddColorMixers(
     const ui::ColorProviderManager::Key& key) const {
   for_private_window_ ? AddBravePrivateThemeColorMixer(provider, key)
                       : AddBraveTorThemeColorMixer(provider, key);
+  // Private/Tor uses same omnibox colors.
+  AddBraveOmniboxPrivateThemeColorMixer(provider, key);
 }
diff --git a/browser/themes/brave_theme_helper.cc b/browser/themes/brave_theme_helper.cc
deleted file mode 100644
index 75d047d5bd84..000000000000
--- a/browser/themes/brave_theme_helper.cc
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/browser/themes/brave_theme_helper.h"
-
-#include "base/numerics/safe_conversions.h"
-#include "brave/browser/themes/brave_dark_mode_utils.h"
-#include "brave/browser/themes/brave_theme_helper_utils.h"
-#include "brave/browser/themes/theme_properties.h"
-#include "brave/browser/ui/color/color_palette.h"
-#include "brave/components/brave_vpn/buildflags/buildflags.h"
-#include "brave/components/sidebar/buildflags/buildflags.h"
-#include "build/build_config.h"
-#include "chrome/browser/themes/theme_properties.h"
-#include "chrome/browser/ui/omnibox/omnibox_theme.h"
-#include "ui/gfx/color_palette.h"
-#include "ui/gfx/color_utils.h"
-
-#if BUILDFLAG(IS_LINUX)
-#include "chrome/browser/themes/custom_theme_supplier.h"
-#endif
-
-namespace {
-
-#if BUILDFLAG(IS_LINUX)
-bool IsUsingSystemTheme(const CustomThemeSupplier* theme_supplier) {
-  return theme_supplier &&
-         theme_supplier->get_theme_type() ==
-             ui::ColorProviderManager::ThemeInitializerSupplier::ThemeType::
-                 kNativeX11;
-}
-#endif
-
-}  // namespace
-
-BraveThemeHelper::~BraveThemeHelper() = default;
-
-SkColor BraveThemeHelper::GetDefaultColor(
-    int id,
-    bool incognito,
-    const CustomThemeSupplier* theme_supplier) const {
-  const bool is_brave_theme_properties =
-      BraveThemeProperties::IsBraveThemeProperties(id);
-#if BUILDFLAG(IS_LINUX)
-  // IF gtk theme is selected, respect it.
-  if (!is_brave_theme_properties && IsUsingSystemTheme(theme_supplier)) {
-    return ThemeHelper::GetDefaultColor(id, incognito, theme_supplier);
-  }
-#endif
-
-  if (!is_brave_theme_properties && theme_supplier)
-    return ThemeHelper::GetDefaultColor(id, incognito, theme_supplier);
-
-  // Brave Tor profiles are always 'incognito' (for now)
-  if (!incognito && (is_tor_ || is_guest_)) {
-    incognito = true;
-  }
-
-  switch (id) {
-    // Pick most contrast color between our light and dark colors based on
-    // current toolbar color.
-#if BUILDFLAG(ENABLE_SIDEBAR)
-    case BraveThemeProperties::COLOR_SIDEBAR_ITEM_DRAG_INDICATOR_COLOR:
-    case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUTTON_DISABLED:
-    case BraveThemeProperties::COLOR_SIDEBAR_BUTTON_BASE:
-    case BraveThemeProperties::COLOR_SIDEBAR_ARROW_NORMAL:
-    case BraveThemeProperties::COLOR_SIDEBAR_ARROW_DISABLED: {
-      const auto toolbar_color =
-          GetColor(ThemeProperties::COLOR_TOOLBAR, incognito, theme_supplier);
-      const auto base_button_color_light = MaybeGetDefaultColorForBraveUi(
-          id, incognito, is_tor_,
-          dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT);
-      const auto base_button_color_dark = MaybeGetDefaultColorForBraveUi(
-          id, incognito, is_tor_,
-          dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK);
-      DCHECK(base_button_color_light && base_button_color_dark);
-      return color_utils::PickContrastingColor(base_button_color_light.value(),
-                                               base_button_color_dark.value(),
-                                               toolbar_color);
-    }
-    case BraveThemeProperties::COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED:
-    case BraveThemeProperties::COLOR_SIDEBAR_ITEM_BACKGROUND_HOVERED: {
-      // Copied from chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h
-      // to use same hover background with toolbar button.
-      constexpr float kToolbarInkDropHighlightVisibleOpacity = 0.08f;
-      return SkColorSetA(GetColor(ThemeProperties::COLOR_TOOLBAR_INK_DROP,
-                                  incognito, theme_supplier),
-                         0xFF * kToolbarInkDropHighlightVisibleOpacity);
-    }
-#endif
-#if BUILDFLAG(ENABLE_BRAVE_VPN)
-    case BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_TEXT_CONNECTED:
-    case BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_TEXT_DISCONNECTED: {
-      const auto toolbar_color =
-          GetColor(ThemeProperties::COLOR_TOOLBAR, incognito, theme_supplier);
-      const auto color_for_light = MaybeGetDefaultColorForBraveUi(
-          id, incognito, is_tor_,
-          dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT);
-      const auto color_for_dark = MaybeGetDefaultColorForBraveUi(
-          id, incognito, is_tor_,
-          dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK);
-      DCHECK(color_for_light && color_for_dark);
-      return color_utils::PickContrastingColor(
-          color_for_light.value(), color_for_dark.value(), toolbar_color);
-    }
-#endif
-    default:
-      break;
-  }
-
-  const dark_mode::BraveDarkModeType type =
-      dark_mode::GetActiveBraveDarkModeType();
-  const absl::optional<SkColor> braveColor =
-      MaybeGetDefaultColorForBraveUi(id, incognito, is_tor_, type);
-  if (braveColor) {
-    return braveColor.value();
-  }
-
-  // Handles omnibox colors before upstream handles.
-  // We shares most of dark mode colors with upstream's incognito color.
-  // We set |incognito| to true below for dark mode before fetching upstream's
-  // default color because we share upstream's incognito colors for our dark
-  // mode. So, we should handle here for using our omnibox colors before setting
-  // |incognito|.
-  const absl::optional<SkColor> omnibox_color =
-      GetOmniboxColor(id, incognito, theme_supplier);
-  if (omnibox_color.has_value())
-    return omnibox_color.value();
-
-  // Make sure we fallback to Chrome's dark theme (incognito) for our dark theme
-  if (type == dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK) {
-    incognito = true;
-  }
-
-  DCHECK(!is_brave_theme_properties);
-  return ThemeHelper::GetDefaultColor(id, incognito, theme_supplier);
-}
-
-absl::optional<SkColor> BraveThemeHelper::GetOmniboxColor(
-    int id,
-    bool incognito,
-    const CustomThemeSupplier* theme_supplier) const {
-#if BUILDFLAG(IS_LINUX)
-  // If gtk theme is selected, respect it.
-  if (IsUsingSystemTheme(theme_supplier)) {
-    return ThemeHelper::GetOmniboxColor(id, incognito, theme_supplier);
-  }
-#endif
-
-  if (theme_supplier)
-    return ThemeHelper::GetOmniboxColor(id, incognito, theme_supplier);
-
-  const bool dark = dark_mode::GetActiveBraveDarkModeType() ==
-                    dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK;
-  incognito = incognito || is_tor_ || is_guest_;
-  // TODO(petemill): Get colors from color-pallete and theme constants
-  switch (id) {
-    case ThemeProperties::COLOR_OMNIBOX_BACKGROUND: {
-      return GetLocationBarBackground(dark, incognito, /*hover*/ false);
-    }
-    case ThemeProperties::COLOR_OMNIBOX_BACKGROUND_HOVERED: {
-      return GetLocationBarBackground(dark, incognito, /*hover*/ true);
-    }
-    case ThemeProperties::COLOR_OMNIBOX_TEXT: {
-      return (dark || incognito) ? kDarkOmniboxText : kLightOmniboxText;
-    }
-    case ThemeProperties::COLOR_OMNIBOX_RESULTS_BG:
-    case ThemeProperties::COLOR_OMNIBOX_RESULTS_BG_HOVERED:
-    case ThemeProperties::COLOR_OMNIBOX_RESULTS_BG_SELECTED: {
-      return GetOmniboxResultBackground(id, dark, incognito);
-    }
-    default:
-      break;
-  }
-
-  // All other values, call original function
-  return ThemeHelper::GetOmniboxColor(id, incognito, theme_supplier);
-}
diff --git a/browser/themes/brave_theme_helper.h b/browser/themes/brave_theme_helper.h
deleted file mode 100644
index 8ac220482503..000000000000
--- a/browser/themes/brave_theme_helper.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef BRAVE_BROWSER_THEMES_BRAVE_THEME_HELPER_H_
-#define BRAVE_BROWSER_THEMES_BRAVE_THEME_HELPER_H_
-
-#include "chrome/browser/themes/theme_helper.h"
-#include "third_party/abseil-cpp/absl/types/optional.h"
-
-class Profile;
-
-class BraveThemeHelper : public ThemeHelper {
- public:
-  BraveThemeHelper() = default;
-  ~BraveThemeHelper() override;
-
-  BraveThemeHelper(const BraveThemeHelper&) = delete;
-  BraveThemeHelper& operator=(const BraveThemeHelper&) = delete;
-
-  void set_is_tor() { is_tor_ = true; }
-  void set_is_guest() { is_guest_ = true; }
-
- protected:
-  // ThemeHelper overrides:
-  SkColor GetDefaultColor(
-      int id,
-      bool incognito,
-      const CustomThemeSupplier* theme_supplier) const override;
-
-  absl::optional<SkColor> GetOmniboxColor(
-      int id,
-      bool incognito,
-      const CustomThemeSupplier* theme_supplier) const override;
-
- private:
-  bool is_tor_ = false;
-  bool is_guest_ = false;
-};
-
-#endif  // BRAVE_BROWSER_THEMES_BRAVE_THEME_HELPER_H_
diff --git a/browser/themes/brave_theme_helper_utils.cc b/browser/themes/brave_theme_helper_utils.cc
deleted file mode 100644
index d78cea99a385..000000000000
--- a/browser/themes/brave_theme_helper_utils.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (c) 2022 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/browser/themes/brave_theme_helper_utils.h"
-
-#include "base/numerics/safe_conversions.h"
-#include "chrome/browser/themes/theme_properties.h"
-#include "chrome/browser/ui/omnibox/omnibox_theme.h"
-#include "ui/gfx/color_palette.h"
-#include "ui/gfx/color_utils.h"
-#include "ui/native_theme/native_theme.h"
-
-namespace {
-
-// Location bar colors
-const SkColor kPrivateLocationBarBgBase = SkColorSetRGB(0x0B, 0x07, 0x24);
-const SkColor kDarkLocationBarBgBase = SkColorSetRGB(0x18, 0x1A, 0x21);
-const SkColor kDarkLocationBarHoverBg = SkColorSetRGB(0x23, 0x25, 0x2F);
-
-}  // namespace
-
-SkColor GetLocationBarBackground(bool dark, bool priv, bool hover) {
-  if (priv) {
-    return hover ? color_utils::HSLShift(kPrivateLocationBarBgBase,
-                                         {-1, -1, 0.54})
-                 : kPrivateLocationBarBgBase;
-  }
-
-  if (dark) {
-    return hover ? kDarkLocationBarHoverBg : kDarkLocationBarBgBase;
-  }
-
-  return hover ? color_utils::AlphaBlend(SK_ColorWHITE,
-                                         SkColorSetRGB(0xf3, 0xf3, 0xf3), 0.7f)
-               : SK_ColorWHITE;
-}
-
-// Omnibox result bg colors
-SkColor GetOmniboxResultBackground(int id, bool dark, bool priv) {
-  // For high contrast, selected rows use inverted colors to stand out more.
-  ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
-  bool high_contrast =
-      native_theme && native_theme->UserHasContrastPreference();
-  OmniboxPartState state = OmniboxPartState::NORMAL;
-  if (id == ThemeProperties::COLOR_OMNIBOX_RESULTS_BG_HOVERED) {
-    state = OmniboxPartState::HOVERED;
-  } else if (id == ThemeProperties::COLOR_OMNIBOX_RESULTS_BG_SELECTED) {
-    state = OmniboxPartState::SELECTED;
-  }
-
-  SkColor color;
-  if (priv) {
-    color = high_contrast ? color_utils::HSLShift(kPrivateLocationBarBgBase,
-                                                  {-1, -1, 0.45})
-                          : kPrivateLocationBarBgBase;
-  } else if (dark) {
-    color = high_contrast ? gfx::kGoogleGrey900 : kDarkLocationBarBgBase;
-  } else {
-    color = SK_ColorWHITE;
-  }
-  return color_utils::BlendTowardMaxContrast(
-      color, base::ClampRound(GetOmniboxStateOpacity(state) * 0xff));
-}
diff --git a/browser/themes/brave_theme_helper_utils.h b/browser/themes/brave_theme_helper_utils.h
deleted file mode 100644
index e18c808dd76d..000000000000
--- a/browser/themes/brave_theme_helper_utils.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Copyright (c) 2022 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef BRAVE_BROWSER_THEMES_BRAVE_THEME_HELPER_UTILS_H_
-#define BRAVE_BROWSER_THEMES_BRAVE_THEME_HELPER_UTILS_H_
-
-#include "third_party/skia/include/core/SkColor.h"
-
-SkColor GetLocationBarBackground(bool dark, bool priv, bool hover);
-SkColor GetOmniboxResultBackground(int id, bool dark, bool priv);
-
-#endif  // BRAVE_BROWSER_THEMES_BRAVE_THEME_HELPER_UTILS_H_
diff --git a/browser/themes/brave_theme_helper_win.cc b/browser/themes/brave_theme_helper_win.cc
deleted file mode 100644
index c1bcca9f4bbc..000000000000
--- a/browser/themes/brave_theme_helper_win.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/browser/themes/brave_theme_helper_win.h"
-
-#include "chrome/browser/themes/theme_properties.h"
-
-SkColor BraveThemeHelperWin::GetDefaultColor(
-    int id,
-    bool incognito,
-    const CustomThemeSupplier* theme_supplier) const {
-  // Prevent dcheck in chrome/browser/themes/theme_properties.cc(384)
-  // It assumes these ids are handled in theme service.
-  if (id == ThemeProperties::COLOR_ACCENT_BORDER_ACTIVE ||
-      id == ThemeProperties::COLOR_ACCENT_BORDER_INACTIVE) {
-    return ThemeHelperWin::GetDefaultColor(id, incognito, theme_supplier);
-  }
-  // Skip ThemeHelperWin::GetDefaultColor() to prevent using dwm frame color.
-  return BraveThemeHelper::GetDefaultColor(id, incognito, theme_supplier);
-}
diff --git a/browser/themes/brave_theme_helper_win.h b/browser/themes/brave_theme_helper_win.h
deleted file mode 100644
index b61713e79271..000000000000
--- a/browser/themes/brave_theme_helper_win.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef BRAVE_BROWSER_THEMES_BRAVE_THEME_HELPER_WIN_H_
-#define BRAVE_BROWSER_THEMES_BRAVE_THEME_HELPER_WIN_H_
-
-#include "chrome/browser/themes/theme_helper_win.h"
-
-class BraveThemeHelperWin : public ThemeHelperWin {
- public:
-  BraveThemeHelperWin() = default;
-  BraveThemeHelperWin(const BraveThemeHelperWin&) = delete;
-  BraveThemeHelperWin& operator=(const BraveThemeHelperWin&) = delete;
-  ~BraveThemeHelperWin() override = default;
-
- private:
-  // ThemeHelperWin overrides:
-  SkColor GetDefaultColor(
-      int id,
-      bool incognito,
-      const CustomThemeSupplier* theme_supplier) const override;
-};
-
-#endif  // BRAVE_BROWSER_THEMES_BRAVE_THEME_HELPER_WIN_H_
diff --git a/browser/themes/brave_theme_service.cc b/browser/themes/brave_theme_service.cc
index fde71353d593..f222b86947d5 100644
--- a/browser/themes/brave_theme_service.cc
+++ b/browser/themes/brave_theme_service.cc
@@ -5,52 +5,11 @@
 
 #include "brave/browser/themes/brave_theme_service.h"
 
-#include "base/no_destructor.h"
 #include "brave/browser/extensions/brave_theme_event_router.h"
-#include "brave/browser/profiles/profile_util.h"
-#include "brave/browser/themes/brave_theme_helper.h"
-#include "build/build_config.h"
-#include "chrome/browser/profiles/profile.h"
 
-#if BUILDFLAG(IS_WIN)
-#include "brave/browser/themes/brave_theme_helper_win.h"
-#endif
-
-namespace {
-
-const ThemeHelper& GetBraveThemeHelper(Profile* profile) {
-#if BUILDFLAG(IS_WIN)
-  using BraveThemeHelper = BraveThemeHelperWin;
-#endif
-  // Because the helper is created as a NoDestructor static, we need separate
-  // instances for regular, tor and guest profiles.
-  if (profile->IsTor()) {
-    static base::NoDestructor<std::unique_ptr<ThemeHelper>> dark_theme_helper(
-        std::make_unique<BraveThemeHelper>());
-    (static_cast<BraveThemeHelper*>(dark_theme_helper.get()->get()))
-        ->set_is_tor();
-    return **dark_theme_helper;
-  } else if (brave::IsGuestProfile(profile)) {
-    static base::NoDestructor<std::unique_ptr<ThemeHelper>> dark_theme_helper(
-        std::make_unique<BraveThemeHelper>());
-    (static_cast<BraveThemeHelper*>(dark_theme_helper.get()->get()))
-        ->set_is_guest();
-    return **dark_theme_helper;
-  } else {
-    static base::NoDestructor<std::unique_ptr<ThemeHelper>> theme_helper(
-        std::make_unique<BraveThemeHelper>());
-    return **theme_helper;
-  }
-}
-
-}  // namespace
-
-// Replace Chromium's ThemeHelper with BraveThemeHelper that is appropriate for
-// the given profile. There should only be 3 static ThemeHelpers at most: the
-// original Chromium one, and 2 Brave ones.
 BraveThemeService::BraveThemeService(Profile* profile,
                                      const ThemeHelper& theme_helper)
-    : ThemeService(profile, GetBraveThemeHelper(profile)) {
+    : ThemeService(profile, theme_helper) {
   brave_theme_event_router_.reset(
       new extensions::BraveThemeEventRouter(profile));
 }
diff --git a/browser/themes/brave_theme_service_browsertest.cc b/browser/themes/brave_theme_service_browsertest.cc
index 44a47f818a7a..ef1664972359 100644
--- a/browser/themes/brave_theme_service_browsertest.cc
+++ b/browser/themes/brave_theme_service_browsertest.cc
@@ -4,16 +4,17 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "brave/browser/themes/brave_dark_mode_utils.h"
-#include "brave/browser/themes/brave_theme_helper_utils.h"
 #include "brave/browser/themes/theme_properties.h"
+#include "brave/browser/ui/color/brave_color_id.h"
+#include "brave/browser/ui/color/brave_color_mixer.h"
 #include "brave/browser/ui/color/color_palette.h"
 #include "brave/components/constants/pref_names.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "chrome/browser/ui/omnibox/omnibox_theme.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -68,23 +69,18 @@ class BraveThemeServiceTestWithoutSystemTheme : public InProcessBrowserTest {
 IN_PROC_BROWSER_TEST_F(BraveThemeServiceTestWithoutSystemTheme,
                        BraveThemeChangeTest) {
   Profile* profile = browser()->profile();
-  Profile* profile_private =
-      profile->GetPrimaryOTRProfile(/*create_if_needed=*/true);
-
-  const ui::ThemeProvider& tp =
-      ThemeService::GetThemeProviderForProfile(profile);
-  const ui::ThemeProvider& tp_private =
-      ThemeService::GetThemeProviderForProfile(profile_private);
-
-  auto test_theme_property = BraveThemeProperties::COLOR_FOR_TEST;
+  auto test_theme_color = kColorForTest;
 
   // Test light theme
   dark_mode::SetBraveDarkModeType(
       dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT);
   EXPECT_EQ(dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT,
             dark_mode::GetActiveBraveDarkModeType());
+
+  const ui::ColorProvider* color_provider =
+      ThemeServiceFactory::GetForProfile(profile)->GetColorProvider();
   EXPECT_EQ(BraveThemeProperties::kLightColorForTest,
-            tp.GetColor(test_theme_property));
+            color_provider->GetColor(test_theme_color));
 
   // Test dark theme
   dark_mode::SetBraveDarkModeType(
@@ -92,12 +88,20 @@ IN_PROC_BROWSER_TEST_F(BraveThemeServiceTestWithoutSystemTheme,
   EXPECT_EQ(
       dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK,
       dark_mode::GetActiveBraveDarkModeType());
+
+  color_provider =
+      ThemeServiceFactory::GetForProfile(profile)->GetColorProvider();
   EXPECT_EQ(BraveThemeProperties::kDarkColorForTest,
-            tp.GetColor(test_theme_property));
+            color_provider->GetColor(test_theme_color));
 
   // Test dark theme private
-  EXPECT_EQ(BraveThemeProperties::kPrivateColorForTest,
-            tp_private.GetColor(test_theme_property));
+  Profile* profile_private =
+      profile->GetPrimaryOTRProfile(/*create_if_needed=*/true);
+  const ui::ColorProvider* color_provider_private =
+      ThemeServiceFactory::GetForProfile(profile_private)->GetColorProvider();
+  // Private color mixer overrides are not loaded because there's no theme.
+  EXPECT_EQ(BraveThemeProperties::kDarkColorForTest,
+            color_provider_private->GetColor(test_theme_color));
 }
 
 // Test whether appropriate native/web theme observer is called when brave theme
@@ -159,35 +163,33 @@ IN_PROC_BROWSER_TEST_F(BraveThemeServiceTest, SystemThemeChangeTest) {
 
 IN_PROC_BROWSER_TEST_F(BraveThemeServiceTest, OmniboxColorTest) {
   auto* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
-  auto* tp = browser_view->GetThemeProvider();
   const int hovered = false;
 
   // Change to light.
   dark_mode::SetBraveDarkModeType(
       dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT);
   bool dark = false;
+  auto* color_provider = browser_view->GetColorProvider();
   EXPECT_EQ(GetLocationBarBackground(dark, false /* incognito */, hovered),
-            GetOmniboxColor(tp, OmniboxPart::LOCATION_BAR_BACKGROUND));
-  EXPECT_EQ(
-      GetOmniboxResultBackground(ThemeProperties::COLOR_OMNIBOX_RESULTS_BG,
-                                 dark, false /* incognito */),
-      tp->GetColor(ThemeProperties::COLOR_OMNIBOX_RESULTS_BG));
+            color_provider->GetColor(kColorOmniboxBackground));
+  EXPECT_EQ(GetOmniboxResultBackground(kColorOmniboxResultsBackground, dark,
+                                       false /* incognito */),
+            color_provider->GetColor(kColorOmniboxResultsBackground));
 
   // Change to dark.
   dark_mode::SetBraveDarkModeType(
       dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK);
   dark = true;
-
+  color_provider = browser_view->GetColorProvider();
   EXPECT_EQ(GetLocationBarBackground(dark, false /* incognito */, hovered),
-            GetOmniboxColor(tp, OmniboxPart::LOCATION_BAR_BACKGROUND));
+            color_provider->GetColor(kColorOmniboxBackground));
   // Check color is different on dark mode and incognito mode.
   EXPECT_NE(GetLocationBarBackground(dark, true /* incognito */, hovered),
-            GetOmniboxColor(tp, OmniboxPart::LOCATION_BAR_BACKGROUND));
+            color_provider->GetColor(kColorOmniboxBackground));
 
-  EXPECT_EQ(
-      GetOmniboxResultBackground(ThemeProperties::COLOR_OMNIBOX_RESULTS_BG,
-                                 dark, false /* incognito */),
-      tp->GetColor(ThemeProperties::COLOR_OMNIBOX_RESULTS_BG));
+  EXPECT_EQ(GetOmniboxResultBackground(kColorOmniboxResultsBackground, dark,
+                                       false /* incognito */),
+            color_provider->GetColor(kColorOmniboxResultsBackground));
 }
 
 // Check some colors from color provider pipeline.
diff --git a/browser/themes/sources.gni b/browser/themes/sources.gni
index e788dc457176..c08416bb4df9 100644
--- a/browser/themes/sources.gni
+++ b/browser/themes/sources.gni
@@ -12,21 +12,10 @@ if (!is_android) {
     "//brave/browser/themes/brave_dark_mode_utils.cc",
     "//brave/browser/themes/brave_private_window_theme_supplier.cc",
     "//brave/browser/themes/brave_private_window_theme_supplier.h",
-    "//brave/browser/themes/brave_theme_helper.cc",
-    "//brave/browser/themes/brave_theme_helper.h",
-    "//brave/browser/themes/brave_theme_helper_utils.cc",
-    "//brave/browser/themes/brave_theme_helper_utils.h",
     "//brave/browser/themes/brave_theme_service.cc",
     "//brave/browser/themes/brave_theme_service.h",
   ]
 
-  if (is_win) {
-    brave_browser_themes_sources += [
-      "//brave/browser/themes/brave_theme_helper_win.cc",
-      "//brave/browser/themes/brave_theme_helper_win.h",
-    ]
-  }
-
   brave_browser_themes_deps += [
     "//base",
     "//brave/app:brave_generated_resources_grit",
diff --git a/browser/themes/theme_properties.cc b/browser/themes/theme_properties.cc
index 0cb619be0930..945b8613666e 100644
--- a/browser/themes/theme_properties.cc
+++ b/browser/themes/theme_properties.cc
@@ -37,6 +37,7 @@ absl::optional<SkColor> MaybeGetDefaultColorForBraveLightUi(int id) {
       return kLightToolbar;
     case ThemeProperties::COLOR_TAB_FOREGROUND_ACTIVE_FRAME_ACTIVE:
     case ThemeProperties::COLOR_BOOKMARK_TEXT:
+    case BraveThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT:
     case ThemeProperties::COLOR_TAB_FOREGROUND_INACTIVE_FRAME_ACTIVE:
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON:
       return kLightToolbarIcon;
@@ -44,14 +45,6 @@ absl::optional<SkColor> MaybeGetDefaultColorForBraveLightUi(int id) {
       return color_utils::AlphaBlend(kLightToolbarIcon, kLightToolbar, 0.3f);
     case BraveThemeProperties::COLOR_ICON_BASE:
       return SkColorSetRGB(0x49, 0x50, 0x57);
-    case BraveThemeProperties::COLOR_TOGGLE_BUTTON_THUMB_ON_COLOR:
-      return SkColorSetRGB(0x4C, 0x54, 0xD2);
-    case BraveThemeProperties::COLOR_TOGGLE_BUTTON_THUMB_OFF_COLOR:
-      return SK_ColorWHITE;
-    case BraveThemeProperties::COLOR_TOGGLE_BUTTON_TRACK_ON_COLOR:
-      return SkColorSetRGB(0xE1, 0xE2, 0xF6);
-    case BraveThemeProperties::COLOR_TOGGLE_BUTTON_TRACK_OFF_COLOR:
-      return SkColorSetRGB(0xDA, 0xDC, 0xE8);
     case BraveThemeProperties::COLOR_MENU_ITEM_SUB_TEXT_COLOR:
       return SkColorSetRGB(0x86, 0x8E, 0x96);
 #if BUILDFLAG(ENABLE_SIDEBAR)
@@ -153,6 +146,7 @@ absl::optional<SkColor> MaybeGetDefaultColorForBraveDarkUi(int id) {
     case ThemeProperties::COLOR_TAB_FOREGROUND_ACTIVE_FRAME_ACTIVE:
       return SkColorSetRGB(0xF3, 0xF3, 0xF3);
     case ThemeProperties::COLOR_BOOKMARK_TEXT:
+    case BraveThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT:
     case ThemeProperties::COLOR_TAB_FOREGROUND_INACTIVE_FRAME_ACTIVE:
       return SkColorSetRGB(0xFF, 0xFF, 0xFF);
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON:
@@ -161,14 +155,6 @@ absl::optional<SkColor> MaybeGetDefaultColorForBraveDarkUi(int id) {
       return color_utils::AlphaBlend(kDarkToolbarIcon, kDarkToolbar, 0.3f);
     case BraveThemeProperties::COLOR_ICON_BASE:
       return SkColorSetRGB(0xC2, 0xC4, 0xCF);
-    case BraveThemeProperties::COLOR_TOGGLE_BUTTON_THUMB_ON_COLOR:
-      return SkColorSetRGB(0x44, 0x36, 0xE1);
-    case BraveThemeProperties::COLOR_TOGGLE_BUTTON_THUMB_OFF_COLOR:
-      return SK_ColorWHITE;
-    case BraveThemeProperties::COLOR_TOGGLE_BUTTON_TRACK_ON_COLOR:
-      return SkColorSetRGB(0x76, 0x79, 0xB1);
-    case BraveThemeProperties::COLOR_TOGGLE_BUTTON_TRACK_OFF_COLOR:
-      return SkColorSetRGB(0x5E, 0x61, 0x75);
     case BraveThemeProperties::COLOR_MENU_ITEM_SUB_TEXT_COLOR:
       return SkColorSetRGB(0x84, 0x88, 0x9C);
 #if BUILDFLAG(ENABLE_SIDEBAR)
@@ -266,7 +252,6 @@ absl::optional<SkColor> MaybeGetDefaultColorForPrivateUi(int id) {
     case ThemeProperties::COLOR_TAB_FOREGROUND_ACTIVE_FRAME_ACTIVE:
       return SkColorSetRGB(0xF3, 0xF3, 0xF3);
     case ThemeProperties::COLOR_BOOKMARK_TEXT:
-    case BraveThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT:
     case ThemeProperties::COLOR_TAB_FOREGROUND_INACTIVE_FRAME_ACTIVE:
       return SkColorSetRGB(0xFF, 0xFF, 0xFF);
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON:
@@ -311,14 +296,6 @@ absl::optional<SkColor> MaybeGetDefaultColorForPrivateTorUi(int id) {
 
 }  // namespace
 
-namespace BraveThemeProperties {
-
-bool IsBraveThemeProperties(int id) {
-  return id >= BRAVE_THEME_PROPERTIES_START &&
-         id <= BRAVE_THEME_PROPERTIES_LAST;
-}
-
-}  // namespace BraveThemeProperties
 // Returns a |nullopt| if the UI color is not handled by Brave.
 absl::optional<SkColor> MaybeGetDefaultColorForBraveUi(
     int id,
diff --git a/browser/themes/theme_properties.h b/browser/themes/theme_properties.h
index d66103da6920..4376fe73e6eb 100644
--- a/browser/themes/theme_properties.h
+++ b/browser/themes/theme_properties.h
@@ -23,14 +23,11 @@ enum TestProperty {
   COLOR_FOR_TEST = 9000
 };
 
+// TODO(simonhong): Handling all these color directly in brave_color_mixer.cc
+// and remove this file.
 enum ThemeProperties {
   BRAVE_THEME_PROPERTIES_START = 10000,
   COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT = BRAVE_THEME_PROPERTIES_START,
-  COLOR_DOWNLOAD_SHELF_BUTTON_TEXT,
-  COLOR_TOGGLE_BUTTON_THUMB_ON_COLOR,
-  COLOR_TOGGLE_BUTTON_THUMB_OFF_COLOR,
-  COLOR_TOGGLE_BUTTON_TRACK_ON_COLOR,
-  COLOR_TOGGLE_BUTTON_TRACK_OFF_COLOR,
   COLOR_MENU_ITEM_SUB_TEXT_COLOR,
 #if BUILDFLAG(ENABLE_SIDEBAR)
   COLOR_SIDEBAR_ADD_BUBBLE_BACKGROUND,
@@ -71,8 +68,6 @@ enum ThemeProperties {
   BRAVE_THEME_PROPERTIES_LAST = COLOR_ICON_BASE,
 };
 
-bool IsBraveThemeProperties(int id);
-
 }  // namespace BraveThemeProperties
 
 absl::optional<SkColor> MaybeGetDefaultColorForBraveUi(
diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java
index 00889473fe0d..76f0c0e448f3 100644
--- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java
+++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java
@@ -39,7 +39,6 @@
 import org.chromium.chrome.browser.omnibox.suggestions.entity.EntitySuggestionViewBinder;
 import org.chromium.chrome.browser.omnibox.suggestions.header.HeaderView;
 import org.chromium.chrome.browser.omnibox.suggestions.header.HeaderViewBinder;
-import org.chromium.chrome.browser.omnibox.suggestions.mostvisited.ExploreIconProvider;
 import org.chromium.chrome.browser.omnibox.suggestions.mostvisited.MostVisitedTilesProcessor;
 import org.chromium.chrome.browser.omnibox.suggestions.pedal.PedalSuggestionView;
 import org.chromium.chrome.browser.omnibox.suggestions.pedal.PedalSuggestionViewBinder;
diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
index 64d274d5b7f9..cf4d59324143 100644
--- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
+++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
@@ -19,7 +19,6 @@
 import org.chromium.chrome.browser.omnibox.suggestions.BraveDropdownItemViewInfoListManager;
 import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
 import org.chromium.chrome.browser.omnibox.suggestions.brave_search.BraveSearchBannerProcessor;
-import org.chromium.chrome.browser.omnibox.suggestions.mostvisited.ExploreIconProvider;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.share.ShareDelegate;
@@ -46,12 +45,11 @@ public BraveAutocompleteMediator(@NonNull Context context,
             @NonNull Callback<Tab> bringTabToFrontCallback,
             @NonNull Supplier<TabWindowManager> tabWindowManagerSupplier,
             @NonNull BookmarkState bookmarkState, @NonNull JankTracker jankTracker,
-            @NonNull ExploreIconProvider exploreIconProvider,
             @NonNull OmniboxPedalDelegate omniboxPedalDelegate) {
         super(context, delegate, textProvider, listPropertyModel, handler,
                 modalDialogManagerSupplier, activityTabSupplier, shareDelegateSupplier,
                 locationBarDataProvider, bringTabToFrontCallback, tabWindowManagerSupplier,
-                bookmarkState, jankTracker, exploreIconProvider, omniboxPedalDelegate);
+                bookmarkState, jankTracker, omniboxPedalDelegate);
     }
 
     @Override
diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java
index db0c9560e5e3..db0aa9863286 100644
--- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java
+++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java
@@ -23,7 +23,6 @@
 import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider;
 import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
 import org.chromium.chrome.browser.omnibox.suggestions.brave_search.BraveSearchBannerProcessor;
-import org.chromium.chrome.browser.omnibox.suggestions.mostvisited.ExploreIconProvider;
 import org.chromium.chrome.browser.search_engines.settings.BraveSearchEngineAdapter;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.components.omnibox.AutocompleteMatch;
@@ -52,9 +51,9 @@ class BraveDropdownItemViewInfoListBuilder extends DropdownItemViewInfoListBuild
     private Context mContext;
 
     BraveDropdownItemViewInfoListBuilder(@NonNull Supplier<Tab> tabSupplier,
-            BookmarkState bookmarkState, @NonNull ExploreIconProvider exploreIconProvider,
-            @NonNull OmniboxPedalDelegate omniboxPedalDelegate) {
-        super(tabSupplier, bookmarkState, exploreIconProvider, omniboxPedalDelegate);
+            BookmarkState bookmarkState, @NonNull OmniboxPedalDelegate omniboxPedalDelegate) {
+        super(tabSupplier, bookmarkState, omniboxPedalDelegate);
+
         mActivityTabSupplier = tabSupplier;
     }
 
diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java
index dde23b13c50d..343414f2a18a 100644
--- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java
+++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java
@@ -10,6 +10,7 @@
 import android.content.Context;
 
 import org.chromium.base.supplier.Supplier;
+import org.chromium.chrome.browser.omnibox.suggestions.FaviconFetcher;
 import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost;
 import org.chromium.chrome.browser.omnibox.suggestions.UrlBarDelegate;
 import org.chromium.chrome.browser.share.ShareDelegate;
@@ -21,9 +22,9 @@ public class BraveEditUrlSuggestionProcessor extends EditUrlSuggestionProcessor
     private boolean mHasClearedOmniboxForFocus;
 
     public BraveEditUrlSuggestionProcessor(Context context, SuggestionHost suggestionHost,
-            UrlBarDelegate locationBarDelegate, Supplier<LargeIconBridge> iconBridgeSupplier,
+            UrlBarDelegate locationBarDelegate, FaviconFetcher faviconFetcher,
             Supplier<Tab> tabSupplier, Supplier<ShareDelegate> shareDelegateSupplier) {
-        super(context, suggestionHost, locationBarDelegate, iconBridgeSupplier, tabSupplier,
+        super(context, suggestionHost, locationBarDelegate, faviconFetcher, tabSupplier,
                 shareDelegateSupplier);
     }
 
diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd
index b4909c78bb51..312f8a094893 100644
--- a/browser/ui/android/strings/android_chrome_strings.grd
+++ b/browser/ui/android/strings/android_chrome_strings.grd
@@ -276,10 +276,6 @@ CHAR_LIMIT guidelines:
         USB
       </message>
 
-      <message name="IDS_UNSUPPORTED" desc="Message displayed to the user when an attempted action is not supported.">
-        Unsupported
-      </message>
-
       <!-- Sign-in, sync and personalization preferences -->
       <message name="IDS_PREFS_SECTION_ACCOUNT_AND_GOOGLE_SERVICES" desc="Title for the group of account-related entries and google services in Settings. [CHAR_LIMIT=32]">
         You and Brave
@@ -552,7 +548,7 @@ CHAR_LIMIT guidelines:
         Remove
       </message>
       <message name="IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_DIALOG_EDUCATION_TEXT" desc="Text explaining the benefit of enrolling a credit card as a virtual card. Also contains a link to learn more about virtual cards from IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_LEARN_MORE_LINK_LABEL.">
-        A virtual card disguises your actual card to help protect you from potential fraud. <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>Learn more about virtual cards<ph name="END_LINK1">&lt;/link1&gt;</ph>
+        A virtual card hides your actual card to help protect you from potential fraud. <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>Learn more about virtual cards<ph name="END_LINK1">&lt;/link1&gt;</ph>
       </message>
       <message name="IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_DIALOG_CARD_CONTAINER_TITLE" desc="Text describing how the virtual card will be shown to the user in autofill suggestions.">
         Virtual card
@@ -592,7 +588,7 @@ CHAR_LIMIT guidelines:
           other {<ph name="CONTACT_PREVIEW">%1$s<ex>Jerry, 438-123-1922</ex></ph>\u2026 and <ph name="NUMBER_OF_ADDITIONAL_CONTACTS">%2$s<ex>2</ex></ph> more}}
       </message>
 
-      <!-- Password Settings -->
+      <!-- Password Manager -->
       <message name="IDS_PASSWORD_SETTINGS_TITLE" desc="Title for the settings screen with saved passwords and the header for the list of saved passwords in that screen. [CHAR_LIMIT=32]">
         Passwords
       </message>
@@ -743,6 +739,12 @@ CHAR_LIMIT guidelines:
       <message name="IDS_PASSWORD_SETTINGS_EXPORT_ERROR_DETAILS" desc="A short prefix to introduce a technical error message passed to the user from Android after exporting passwords through a temporary file fails. Both the prefix and the error message are shown in the body of an alert dialog.">
         Details: <ph name="ERROR_DESCRIPTION">%1$s<ex>IOException: No space left on device</ex></ph>
       </message>
+      <message name="IDS_UPM_ERROR_NOTIFICATION_TITLE" translateable="false" desc="The title of the UI surface telling the user that the new password manager backend has encountered an error.">
+        Unified password manager error
+      </message>
+      <message name="IDS_UPM_ERROR_NOTIFICATION_CONTENTS" translateable="false" desc="The contents of the UI surface shown when the new password manager backend encounters an error, prompting the user to file a bug.">
+        The unified password manager was automatically disabled. Please submit an issue via the bug app!
+      </message>
 
       <!-- Lock Screen Fragment -->
       <message name="IDS_LOCKSCREEN_DESCRIPTION_COPY" desc="When a user attempts to copy a password for a particular website into clipboard in Brave's settings, Brave launches a lock screen to verify the user's identity and displays the following explanation.">
@@ -804,22 +806,9 @@ CHAR_LIMIT guidelines:
       <message name="IDS_CONTEXTUAL_SEARCH_TITLE" desc="Name for the Contextual Search feature, which allows users to search for a term in a web page by tapping on it.">
         Touch to Search
       </message>
-      <message name="IDS_CONTEXTUAL_SEARCH_TAP_DESCRIPTION" desc="Description for Contextual Search preference">
-        Learn about topics on websites without leaving the page. Touch to Search sends a word and its surrounding context to Brave Search, returning definitions, pictures, search results, and other details.
-
-Tap any word to search. To refine your search, touch &amp; hold to select more or fewer words. To edit your search, open the panel, tap the icon to open in a new tab, and make your changes in the search box.
-      </message>
       <message name="IDS_CONTEXTUAL_SEARCH_DESCRIPTION" desc="Description for Contextual Search preference">
-        Learn about topics on websites without leaving the page. Touch to Search sends a word and its surrounding context to Brave Search, returning definitions, pictures, search results, and other details.
-
-Touch &amp; hold any word to search. To refine your search, select more or fewer words. To edit your search, open the panel, tap the icon to open in a new tab, and make your changes in the search box.
-      </message>
-      <message name="IDS_CONTEXTUAL_SEARCH_DESCRIPTION_REVISED" desc="Description for Contextual Search preference">
         Learn about topics on websites without leaving the page. Select one or more words on the page to search for them.
       </message>
-      <message name="IDS_CONTEXTUAL_SEARCH_SHORT_DESCRIPTION" desc="A promo message shown to users with Touch to Search to explain the new behavior and provide an option to opt in or out">
-        Touch to Search sends the selected word and the current page as context to Brave Search. You can turn it off in <ph name="BEGIN_LINK">&lt;link&gt;</ph>Settings<ph name="END_LINK">&lt;/link&gt;</ph>.
-      </message>
       <message name="IDS_CONTEXTUAL_SEARCH_PROMO_TITLE" desc="The title of the promo message for the contextual search.">
         Include surrounding text in Brave searches?
       </message>
@@ -829,9 +818,6 @@ Touch &amp; hold any word to search. To refine your search, select more or fewer
       <message name="IDS_CONTEXTUAL_SEARCH_INCLUDE_BUTTON" desc="A button to confirm and dismiss opt in promo">
         Include
       </message>
-      <message name="IDS_CONTEXTUAL_SEARCH_ALLOW_BUTTON" desc="A button to confirm and dismiss opt out promo">
-        Allow
-      </message>
       <message name="IDS_CONTEXTUAL_SEARCH_NO_THANKS_BUTTON" desc="A button to confirm and dismiss opt out promo">
         No thanks
       </message>
@@ -966,48 +952,84 @@ Based on your interaction with a site, like regularly signing in to an account,
 
 Trust tokens improve privacy on the web and can’t be used to find out who you are.
       </message>
-      <message name="IDS_PRIVACY_SANDBOX_LEARN_MORE_DESCRIPTION_1" desc="TOPICS API Bullet 1 of 3 that appear beneath the “Your interests as estimated by Brave” subtitle. We break the description into the 3 pieces users most care about: 1) what data, 2) why this data, 3) what can I do about it? * “What data is used:” is bold and serves as a label to help profiles skimming the page. * “Your browsing history”: The user’s browsing history is available beneath the “History” menu at Brave’s top level. The Topics API estimates topics of interest based on sites in the user’s browsing history that are participating in the trials.">
+      <message name="IDS_PRIVACY_SANDBOX_LEARN_MORE_DESCRIPTION_TOPICS_1" desc="TOPICS API Bullet 1 of 3 that appear beneath the “Your interests as estimated by Brave” subtitle. We break the description into the 3 pieces users most care about: 1) what data, 2) why this data, 3) what can I do about it? * “What data is used:” is bold and serves as a label to help profiles skimming the page. * “Your browsing history”: The user’s browsing history is available beneath the “History” menu at Brave’s top level. The Topics API estimates topics of interest based on sites in the user’s browsing history that are participating in the trials.">
         <ph name="BEGIN_BOLD">&lt;b&gt;</ph>What data is used:<ph name="END_BOLD">&lt;/b&gt;</ph> Your browsing history, a record of sites you’ve visited using Brave on this device.
       </message>
-      <message name="IDS_PRIVACY_SANDBOX_LEARN_MORE_DESCRIPTION_2" desc="TOPICS API Bullet 2 of 3 that appear beneath the “Your interests as estimated by Brave” subtitle. We break the description into the 3 pieces users most care about: 1) what data, 2) why this data, 3) what can I do about it? * “How we use this data:” is bold and serves as a label to help profiles skimming the page. * “estimate your interests”: Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”).">
+      <message name="IDS_PRIVACY_SANDBOX_LEARN_MORE_DESCRIPTION_TOPICS_2" desc="TOPICS API Bullet 2 of 3 that appear beneath the “Your interests as estimated by Brave” subtitle. We break the description into the 3 pieces users most care about: 1) what data, 2) why this data, 3) what can I do about it? * “How we use this data:” is bold and serves as a label to help profiles skimming the page. * “estimate your interests”: Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”).">
         <ph name="BEGIN_BOLD">&lt;b&gt;</ph>How we use this data:<ph name="END_BOLD">&lt;/b&gt;</ph> Brave can estimate your interests. Later, a site you visit can ask Brave to see your interests in order to personalize the ads you see.
       </message>
-      <message name="IDS_PRIVACY_SANDBOX_LEARN_MORE_DESCRIPTION_3" desc="TOPICS API Bullet 3 of 3 that appear beneath the “Your interests as estimated by Brave” subtitle. We break the description into the 3 pieces users most care about: 1) what data, 2) why this data, 3) what can I do about it? * “How you can manage your data:” is bold and serves as a label to help profiles skimming the page. * “To protect your privacy”: Today, most data is kept for long periods of time. This new Topics API doesn’t retain estimated topics for more than 3 weeks. The only reason for this feature is to protect the user’s privacy. * “auto”: isn’t strictly necessary, but it conveys that this feature is an ongoing part of the service. This isn’t describing, for example, a one-time deletion. * “older than 4 weeks”: We’re trying to convey a rolling delete. Imagine a user opens a browser for the very first time. As the user browses, Brave will estimate up to 5 topics of interest in the first week. In the second week, Brave will estimate up to 5 additional topics of interest. The same for the third week, for a total of 15 potential interests. In week 4, Brave will automatically delete the 5 interests from week 1 so that there aren’t ever more than 15 topics associated with a user at any given time. * “interests can refresh”: If a user loves horror films and reads about them for months on end, the interest “Horror movies” might get deleted and refreshed in the same week, so that “Horror movies” doesn’t ever disappear from the user’s list of interests. * “Or you can…”: A user might love horror movies but can’t stand the idea of seeing ads about horror movies (because even the visuals will ruin the surprise of opening night). In this case, the user can remove “Horror movies” from the list of interests Brave will consider. This removal remains in place indefinitely. Note that the user might still see ads about Horror movies from different ad networks or by other means than Brave’s “Browser-based ad personalization” setting.">
+      <message name="IDS_PRIVACY_SANDBOX_LEARN_MORE_DESCRIPTION_TOPICS_3" desc="TOPICS API Bullet 3 of 3 that appear beneath the “Your interests as estimated by Brave” subtitle. We break the description into the 3 pieces users most care about: 1) what data, 2) why this data, 3) what can I do about it? * “How you can manage your data:” is bold and serves as a label to help profiles skimming the page. * “To protect your privacy”: Today, most data is kept for long periods of time. This new Topics API doesn’t retain estimated topics for more than 3 weeks. The only reason for this feature is to protect the user’s privacy. * “auto”: isn’t strictly necessary, but it conveys that this feature is an ongoing part of the service. This isn’t describing, for example, a one-time deletion. * “older than 4 weeks”: We’re trying to convey a rolling delete. Imagine a user opens a browser for the very first time. As the user browses, Brave will estimate up to 5 topics of interest in the first week. In the second week, Brave will estimate up to 5 additional topics of interest. The same for the third week, for a total of 15 potential interests. In week 4, Brave will automatically delete the 5 interests from week 1 so that there aren’t ever more than 15 topics associated with a user at any given time. * “interests can refresh”: If a user loves horror films and reads about them for months on end, the interest “Horror movies” might get deleted and refreshed in the same week, so that “Horror movies” doesn’t ever disappear from the user’s list of interests. * “Or you can…”: A user might love horror movies but can’t stand the idea of seeing ads about horror movies (because even the visuals will ruin the surprise of opening night). In this case, the user can remove “Horror movies” from the list of interests Brave will consider. This removal remains in place indefinitely. Note that the user might still see ads about Horror movies from different ad networks or by other means than Brave’s “Browser-based ad personalization” setting.">
         <ph name="BEGIN_BOLD">&lt;b&gt;</ph>How you can manage your data:<ph name="END_BOLD">&lt;/b&gt;</ph> To protect your privacy, we auto-delete your interests that are older than 4 weeks. As you keep browsing, an interest might appear on the list again. Or you can remove interests you don’t want Brave to consider.
       </message>
+      <message name="IDS_PRIVACY_SANDBOX_LEARN_MORE_DESCRIPTION_FLEDGE_1" desc="FLEDGE APIBullet 1 of 3 that appear beneath the “Sites you visit that define your interests” subtitle. We break the description into the 3 pieces users most care about: 1) what data, 2) why this data, 3) what can I do about it? * “What data is used:” is bold and serves as a label to help profiles skimming the page. * “Your browsing history”: The user’s browsing history is available beneath the “History” menu at Brave’s top level. This content taken in isolation is somewhat misleading. With FLEDGE, a site can store information in Brave about the user’s visit to their site. For example, the site might store “running_shoes_red_size_35” to indicate that the user showed interest in a particular shoe. We’re OK with the simplification in this bullet because 1) we explain it in the next bullet and 2) we want the user to understand that at the top level, both Topics &amp; Fledge are based on the same thing and that is the user’s browsing history.">
+        <ph name="BEGIN_BOLD">&lt;b&gt;</ph>What data is used:<ph name="END_BOLD">&lt;/b&gt;</ph> Your browsing history, a record of sites you’ve visited using Brave on this device.
+      </message>
+      <message name="IDS_PRIVACY_SANDBOX_LEARN_MORE_DESCRIPTION_FLEDGE_2" desc="FLEDGE API Bullet 2 of 3 that appear beneath the “Sites you visit that define your interests” subtitle. We break the description into the 3 pieces users most care about: 1) what data, 2) why this data, 3) what can I do about it? * “How we use this data:” is bold and serves as a label to help profiles skimming the page.">
+        <ph name="BEGIN_BOLD">&lt;b&gt;</ph>How we use this data:<ph name="END_BOLD">&lt;/b&gt;</ph> Sites can store information with Brave about your interests. For example, if you visit a site to buy shoes for a marathon, the site might define your interest as running marathons. Later, if you visit a different site to register for a race, that site can show you an ad for running shoes based on your interests.
+      </message>
+      <message name="IDS_PRIVACY_SANDBOX_LEARN_MORE_DESCRIPTION_FLEDGE_3" desc="FLEDGE API Bullet 3 of 3 that appear beneath the “Sites you visit that define your interests” subtitle. We break the description into the 3 pieces users most care about: 1) what data, 2) why this data, 3) what can I do about it? * “How you can manage your data:” is bold and serves as a label to help profiles skimming the page. * “To protect your privacy”: Today, most data is kept for long periods of time. This new Topics API doesn’t retain estimated topics for more than 3 weeks. The only reason for this feature is to protect the user’s privacy. * “auto”: isn’t strictly necessary, but it conveys that this feature is an ongoing part of the service. This isn’t describing, for example, a one-time deletion. * “older than 4 weeks”: We’re trying to convey a rolling delete. Imagine a user opens a browser for the very first time. As the user browses, sites can store info with Brave for up to 4 weeks. So in week 1, the user visits site A. When week 5 starts, site A is removed from the list of sites. * “a site you visit…”: If a user visits site A every week for months on end, that site will remain on the user’s list of sites for months on end. * “Or you can…”: Say a user strongly dislikes www.siteB.com. But that user might visit siteB.com as part of their job, or just to see how bad it really is. The user can stop siteB from defining interests for them. This block lasts indefinitely.">
+        <ph name="BEGIN_BOLD">&lt;b&gt;</ph>How you can manage your data:<ph name="END_BOLD">&lt;/b&gt;</ph> To protect your privacy, we auto-delete sites from the list that are older than 4 weeks. A site you visit again might appear on the list again. Or you can remove a site if you don’t want that site to ever define interests for you.
+      </message>
       <message name="IDS_PRIVACY_SANDBOX_LEARN_MORE_TITLE" desc="Title of the settings page to explain ad personalization in the Privacy Sandbox.">
         About ad personalization
       </message>
       <message name="IDS_PRIVACY_SANDBOX_ADD_INTEREST_BUTTON_DESCRIPTION" desc="Content description for button that adds an ad interest for the Topics API of the Privacy Sandbox.">
         Add <ph name="INTEREST">%1$s<ex>Acting and Theater</ex></ph>
       </message>
+      <message name="IDS_PRIVACY_SANDBOX_ADD_SITE_BUTTON_DESCRIPTION" desc="Content description for button that adds an ad interest for the FLEDGE API of the Privacy Sandbox.">
+        Add <ph name="SITE">%1$s<ex>example.com</ex></ph>
+      </message>
       <message name="IDS_PRIVACY_SANDBOX_ADD_INTEREST_SNACKBAR" desc="Text on a snackbar after an ad personalization interest was added to the Topics API of the Privacy Sandbox.">
-        Interest added
+        Brave can consider this interest
+      </message>
+      <message name="IDS_PRIVACY_SANDBOX_ADD_SITE_SNACKBAR" desc="Text on a snackbar after an ad personalization interest was added to the FLEDGE API of the Privacy Sandbox.">
+        Site can define interests
       </message>
       <message name="IDS_PRIVACY_SANDBOX_REMOVE_INTEREST_BUTTON_DESCRIPTION" desc="Content description for button that removes an ad interest for the Topics API of the Privacy Sandbox.">
         Remove <ph name="INTEREST">%1$s<ex>Acting and Theater</ex></ph>
       </message>
+      <message name="IDS_PRIVACY_SANDBOX_REMOVE_SITE_BUTTON_DESCRIPTION" desc="Content description for button that removes an ad interest for the FLEDGE API of the Privacy Sandbox.">
+        Remove <ph name="DOMAIN">%1$s<ex>example.com</ex></ph>
+      </message>
       <message name="IDS_PRIVACY_SANDBOX_REMOVE_INTEREST_SNACKBAR" desc="Text on a snackbar after an ad personalization interest was removed from the Topics API of the Privacy Sandbox.">
         Interest removed
       </message>
        <message name="IDS_PRIVACY_SANDBOX_REMOVE_INTEREST_TITLE" desc="Title of the settings page to configure interests that were removed from ad personalization in the Privacy Sandbox.">
         Interests you removed
       </message>
+      <message name="IDS_PRIVACY_SANDBOX_REMOVE_SITE_SNACKBAR" desc="Text on a snackbar after an ad personalization interest was removed from the FLEDGE API of the Privacy Sandbox.">
+        Site removed
+      </message>
+      <message name="IDS_PRIVACY_SANDBOX_REMOVE_SITES_TITLE" desc="Title of the settings page to configure sites that were removed from ad personalization in the Privacy Sandbox.">
+        Sites you removed
+      </message>
       <message name="IDS_PRIVACY_SANDBOX_REMOVE_INTEREST_DESCRIPTION" desc="A paragraph beneath the card title. The page title explains why things appear on this page. This string explains why the user might want to “un-remove” or “re-allow” an item from the list. If a user does choose “Allow” for an item, there won’t be any immediate change in the interface because the item simply becomes eligible again. So, for example, the user previously blocked the interest “Horror movies.” Today, they “allow” “Horror movies” because they’ve decided that as about horror movies are actually OK to see. It might take another week or longer, based on the user’s browsing history, for “Horror movies” to appear in the list of interests again as an active interest within the last 3 weeks. * “Allow”: This aligns with the button label titled “allow”. It wouldn’t make much sense if the user couldn’t see the Allow button on the card.">
         Allow an interest or site if you think ads related to the item would be useful to you
       </message>
        <message name="IDS_PRIVACY_SANDBOX_AD_PERSONALIZATION_SUBTITLE" desc="Subtitle of page where the user controls thier Browser-based ad personalization settings.">
         Browser-based ad personalization
       </message>
-       <message name="IDS_PRIVACY_SANDBOX_TOPIC_INTERESTS_SUBTITLE" desc="TOPICS API A sub title that describes the first of 2 ways a site can get info from Brave in order to target ads to the user. Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. * “Your”: we need to convey a sense of ownership, even if the user didn’t explicitly choose the interests we’re talking about. Without the “your”, it could sound like Brave is simply building a generic library of interests. * “estimated”: It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “by Brave”: This is new behavior for a browser (Brave) to take an active role in processing user data for the purposes of showing ads. It’s important to convey “chrome”, the actor in this case.">
+      <message name="IDS_PRIVACY_SANDBOX_TOPIC_INTERESTS_SUBTITLE" desc="TOPICS API A sub title that describes the first of 2 ways a site can get info from Brave in order to target ads to the user. Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. * “Your”: we need to convey a sense of ownership, even if the user didn’t explicitly choose the interests we’re talking about. Without the “your”, it could sound like Brave is simply building a generic library of interests. * “estimated”: It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “by Brave”: This is new behavior for a browser (Brave) to take an active role in processing user data for the purposes of showing ads. It’s important to convey “chrome”, the actor in this case.">
         Your interests as estimated by Brave
       </message>
+      <message name="IDS_PRIVACY_SANDBOX_FLEDGE_INTERESTS_SUBTITLE" desc="FLEDGE API. A sub title that describes the second of 2 ways a site can get info from Brave in order to target ads to the user.">
+        Sites you visit that define your interests
+      </message>
       <message name="IDS_PRIVACY_SANDBOX_TOPIC_EMPTY_STATE" desc="Summary shown when no interests for ad personlization are available for the Topics API of the Privacy Sandbox.">
         A list of interests will appear here as you browse the web
       </message>
       <message name="IDS_PRIVACY_SANDBOX_REMOVED_TOPICS_EMPTY_STATE" desc="Summary shown when no interests for ad personlization were removed from the Topics API of the Privacy Sandbox.">
         Interests you removed will appear here
       </message>
+      <message name="IDS_PRIVACY_SANDBOX_REMOVED_SITES_EMPTY_STATE" desc="Summary shown when no interests for ad personlization were removed from the FLEDGE API of the Privacy Sandbox.">
+        Sites you removed will appear here
+      </message>
+      <message name="IDS_PRIVACY_SANDBOX_FLEDGE_SUBTITLE" desc="FLEDGE API A sub title that describes the second of 2 ways a site can get info from Brave in order to target ads to the user.">
+        Sites you visit that define your interests
+      </message>
+      <message name="IDS_PRIVACY_SANDBOX_FLEDGE_EMPTY_STATE" desc="Summary shown when no interests for ad personlization are available for the FLEDGE API of the Privacy Sandbox.">
+        A list of sites will appear here as you browse the web
+      </message>
 
       <!-- Privacy Sandbox dialog. -->
       <message name="IDS_PRIVACY_SANDBOX_DIALOG_NO_BUTTON" desc="A button that allows the user to decline joining the Privacy Sandbox trials. If the user chooses “No thanks” this consent page disappears and the flow is complete.">
@@ -1031,21 +1053,24 @@ Trust tokens improve privacy on the web and can’t be used to find out who you
       <message name="IDS_PRIVACY_SANDBOX_CONSENT_HEADING_ONE" desc="1 of 2 subtitles on the page. We want to write for users who skim the page. That means that the page title, the sub titles, and the button label all work well together as a mini story: 1) Help us build a more private web How? 2) Limit sharing between sites 3) More control over the ads you see 4) Yes, I’ll try it">
         Limited sharing between sites
       </message>
-      <message name="IDS_PRIVACY_SANDBOX_CONSENT_DESCRIPTION_ONE" desc="* “exploring” conveys that this is a work in progress. * “restrict” means to lessen. We don’t want to suggest that we’re “eliminating” cross-site tracking. * “cross-site tracking”: An example: a user visits site A and then site B. Based on how third-party cookies work today, when that user later visits site C, site C can be aware that the user visited sites A and B, and can even have some sense for what they did on those sites. * “stop ad spam and fraud”:  This feature isn’t really related to restricting cross-site tracking but we combined these features in the same sentence / section for structural reasons.">
-        We’re exploring ways to restrict cross-site tracking while enabling sites to stop ad spam and fraud.
+      <message name="IDS_PRIVACY_SANDBOX_CONSENT_DESCRIPTION_ONE" desc="The description beneath the “Limited sharing between sites” subtitle. * “exploring” conveys that this is a work in progress. * “restrict” means to lessen. We don’t want to suggest that we’re “eliminating” cross-site tracking. * “tracking”: An example: a user visits site A and then site B. Based on how third-party cookies work today, when that user later visits site C, site C can be aware that the user visited sites A and B, and can even have some sense for what they did on those sites. * “stop ad spam and fraud”:  This feature isn’t really related to restricting cross-site tracking but we combined these features in the same sentence / section for structural reasons.">
+        We’re exploring ways to restrict tracking while enabling sites to stop ad spam and fraud.
       </message>
       <message name="IDS_PRIVACY_SANDBOX_CONSENT_HEADING_TWO" desc="2 of 2 subtitles on the page. We want to write for users who skim the page. That means that the page title, the sub titles, and the button label all work well together as a mini story: 1) Help us build a more private web How? 2) Limit sharing between sites 3) More control over the ads you see 4) Yes, I’ll try it">
         More control over the ads you see
       </message>
-      <message name="IDS_PRIVACY_SANDBOX_CONSENT_DESCRIPTION_TWO" desc="A paragraph beneath the “More control over the ads you see” subtitle. * “During the trials”: The trials happens in addition to today’s current system based on third-party cookies. In other words, even by agreeing to or remaining in a trial,, the user’s core experience doesn’t change much. This is an experiment, and we need the user to understand as much. * “see and remove topics of interests”: we want to stress the element of control * “estimate topics”: Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “recent browsing history”: Later in the UI, we define this as “a record of sites you’ve visited using Brave on this device.” By “recent”, we mean the last 3 weeks (also defined later in the UI).">
-        During the trials, you can see and remove topics of interest sites use to show you ads. Brave estimates your interests based on your recent browsing history.
+      <message name="IDS_PRIVACY_SANDBOX_CONSENT_DESCRIPTION_TWO" desc="A paragraph beneath the “More control over the ads you see” subtitle. * “see and remove topics of interests”: we want to stress the element of control * “estimate topics”: Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “recent browsing history”: Later in the UI, we define this as “a record of sites you’ve visited using Brave on this device.” By “recent”, we mean the last 3 weeks (also defined later in the UI).">
+        You can see and remove topics of interest sites use to show you ads. Brave estimates your interests based on your recent browsing history.
       </message>
       <message name="IDS_PRIVACY_SANDBOX_CONSENT_DROPDOWN_BUTTON" desc="Learn more link * Unfolds content within the page * The text that appears describes 2 ways in which a site can target ads: the “Topics API” and the “FLEDGE API”. You can see what those are at www.privacysanbox.com or they’re described for the user’s benefit in other text. * “ad personalization” can mean different things in different contexts. Here, we’re using it as a simple noun. In other words, it’s not the name of a control but a descriptive term used to describe the personalization of ads in the Brave browser. This “ad personalization” shouldn’t be confused with the setting in the Brave sync chain called “Ad personalization”.">
         Learn more about ad personalization in Brave
       </message>
-      <message name="IDS_PRIVACY_SANDBOX_CONSENT_DROPDOWN_HEADING" desc="TOPICS API A sub title that describes the first of 2 ways a site can get info from Brave in order to target ads to the user. Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. * “Your”: we need to convey a sense of ownership, even if the user didn’t explicitly choose the interests we’re talking about. Without the “your”, it could sound like Brave is simply building a generic library of interests. * “estimated”: It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “by Brave”: This is new behavior for a browser (Brave) to take an active role in processing user data for the purposes of showing ads. It’s important to convey “chrome”, the actor in this case.">
+      <message name="IDS_PRIVACY_SANDBOX_CONSENT_DROPDOWN_TOPICS_HEADING" desc="TOPICS API A sub title that describes the first of 2 ways a site can get info from Brave in order to target ads to the user. Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. * “Your”: we need to convey a sense of ownership, even if the user didn’t explicitly choose the interests we’re talking about. Without the “your”, it could sound like Brave is simply building a generic library of interests. * “estimated”: It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “by Brave”: This is new behavior for a browser (Brave) to take an active role in processing user data for the purposes of showing ads. It’s important to convey “chrome”, the actor in this case.">
         Your interests as estimated by Brave
       </message>
+      <message name="IDS_PRIVACY_SANDBOX_CONSENT_DROPDOWN_FLEDGE_HEADING" desc="FLEDGE API. A sub title that describes the second of 2 ways a site can get info from Brave in order to target ads to the user.">
+      Sites you visit that define your interests
+      </message>
       <message name="IDS_PRIVACY_SANDBOX_CONSENT_DESCRIPTION_THREE" desc="A conclusion paragraph for the entire page. It sits beneath the “More control over the ads you see” subtitle but it’s no more associated with that topic than “Limit sharing between sites”. * “You can change your mind”: When writing a consent moment, we have a legal obligation to inform the user how they can “revoke their consent” or “opt out”. A friendlier way to say this is “change your mind”. * “in Brave settings”: The URL is chrome://settings/privacySandbox. We don’t make it a live link because we need the users to stay in this moment until they make a choice. * “The trials run alongside…”: The trials happen in addition to today’s current system based on third-party cookies. In other words, even by accepting in this consent moment, the user’s core experience doesn’t change much. This is an experiment, and we need the user to understand as much.">
         You can change your mind at any time in Brave settings. The trials run alongside the current way ads get served, so you won’t see changes right away.
       </message>
@@ -1064,8 +1089,8 @@ Trust tokens improve privacy on the web and can’t be used to find out who you
       <message name="IDS_PRIVACY_SANDBOX_NOTICE_SHEET_TITLE" desc="CONTEXT: there are updates to the Brave browser each month. Just after the user accepts the latest update, this message will appear. The title of the page. * “Help us” is intended to convey a sense of collaboration. Privacy Sandbox is an ongoing multi-year effort. There are sites participating to help us and we also need users to agree to these trials so that we can measure the effectiveness of the features we're building. * “build” is intended to convey that this is a process. The user is agreeing to an effort rather than a stable set of features. Something like “make” doesn't have the same nuance. * See www.privacysandbox.com for more context.">
         Help us build a better web
       </message>
-      <message name="IDS_PRIVACY_SANDBOX_NOTICE_SHEET_DESCRIPTION" desc="* “During the trials”: The trials happen in addition to today’s current system (which is based on third-party cookies). In other words, even by agreeing to or remaining in a trial, the user’s core experience doesn’t change much. This is an experiment, and we need the user to understand as much. * “estimate your interests”: Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”).">
-        During trials, Brave is exploring ways to limit spam, fraud, and sharing between sites. Brave also <ph name="BEGIN_LINK">&lt;link&gt;</ph>estimates your interests<ph name="END_LINK">&lt;/link&gt;</ph> that sites can use to show you ads. You can manage your interests in settings.
+      <message name="IDS_PRIVACY_SANDBOX_NOTICE_SHEET_DESCRIPTION" desc="* “Brave is finding new ways”: “finding” is meant to convey a work in progress, like “build” in the title. The features are live and functional, but still in beta. So we want a verb that’s stronger than “exploring” but weaker than “launching”. * “reduce tracking”: This used to read “reduce cross-site tracking”, but we’ve dropped “cross-site” because it makes the idea unnecessarily complicated. * “estimate your interests”: Topics of interest include things like “Live comedy” and “Rock music”. Brave estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “Then” is an important keyword. It suggests some amount of time later. The first step is that interests are generated. Later (minutes or weeks), a different site might request interests.">
+        Brave is finding new ways to reduce tracking and keep you even safer as you browse. Brave also <ph name="BEGIN_LINK">&lt;link&gt;</ph>estimates your interests<ph name="END_LINK">&lt;/link&gt;</ph> and enables you to manage them. Then, sites you visit can ask Brave for your interests to show you ads.
       </message>
 
       <!-- Secure DNS Settings.  Used by //chrome/browser/privacy. -->
@@ -1228,22 +1253,22 @@ Your Brave account may have other forms of browsing history like searches and ac
         Privacy guide
       </message>
       <message name="IDS_PREFS_PRIVACY_REVIEW_SUMMARY" desc="The summary of the privacy menu item.">
-        Review privacy and security settings
+        Review key privacy and security controls
       </message>
       <message name="IDS_PRIVACY_REVIEW_WELCOME_TITLE" desc="Title on the welcome page of the privacy review.">
-        The most important privacy and security controls in one place
+        A guide of your privacy choices
       </message>
       <message name="IDS_PRIVACY_REVIEW_WELCOME_DESCRIPTION" desc="Description on the welcome page of the privacy review.">
-        Brave provides reasonable defaults, but you can customize it to best fit your browsing habit
+        Take a guided tour of key privacy and security controls. For more options, go to individual settings.
       </message>
       <message name="IDS_PRIVACY_REVIEW_START_BUTTON" desc="Text on the privacy review start button on the welcome screen.">
         Let’s go
       </message>
-      <message name="IDS_PRIVACY_REVIEW_WHAT_YOU_GET" desc="Section header text describing what the user gets out of the feature.">
-        What you get
+      <message name="IDS_PRIVACY_REVIEW_WHEN_ON" desc="Header of a description text that describes the behavior of a particular feature. This description is shown to users alongside the feature itself." meaning="Privacy Guide - feature benefits">
+        When on
       </message>
-      <message name="IDS_PRIVACY_REVIEW_WHAT_YOU_SHARE" desc="Section header text describing what data the user shares when using the feature.">
-        What you share with Brave
+      <message name="IDS_PRIVACY_REVIEW_THINGS_TO_CONSIDER" desc="Header of a text column that describes things users should consider about a feature. This description is shown to users alongside the feature itself." meaning="Privacy Guide - feature considerations">
+        Things to consider
       </message>
       <message name="IDS_PRIVACY_REVIEW_MSBB_ITEM_ONE" desc="First bullet point that describes the details of the MSBB toggle.">
         You’ll browse faster because content is proactively loaded based on your current webpage visit
@@ -1252,7 +1277,7 @@ Your Brave account may have other forms of browsing history like searches and ac
         You’ll get improved suggestions in the address bar
       </message>
       <message name="IDS_PRIVACY_REVIEW_MSBB_ITEM_THREE" desc="Third bullet point that describes the details of the MSBB toggle.">
-        URLs you visit are sent to Brave
+        URLs you visit are sent to Brave to predict what sites you might visit next
       </message>
       <message name="IDS_PRIVACY_REVIEW_MSBB_ITEM_FOUR" desc="Fourth bullet point that describes the details of the MSBB toggle.">
         If you also share Brave usage reports, those reports include the URLs you visit
@@ -1261,13 +1286,13 @@ Your Brave account may have other forms of browsing history like searches and ac
         History sync
       </message>
       <message name="IDS_PRIVACY_REVIEW_SYNC_ITEM_ONE" desc="First bullet point that describes the details of the history sync toggle.">
-        You’ll have your history on all your synced devices, so you can continue what you were doing
+        You’ll have your history on all your synced devices so you can continue what you were doing
       </message>
       <message name="IDS_PRIVACY_REVIEW_SYNC_ITEM_TWO" desc="Second bullet point that describes the details of the history sync toggle.">
         If Brave is also your default search engine, you’ll see better, contextually relevant suggestions
       </message>
       <message name="IDS_PRIVACY_REVIEW_SYNC_ITEM_THREE" desc="Third bullet point that describes the details of the history sync toggle.">
-        The URLs you visit are saved to your Brave account
+        The URLs you visit are saved to your Brave sync chain
       </message>
       <message name="IDS_PRIVACY_REVIEW_COOKIES_INTRO" desc="Text introducing the cookies control.">
         Choose when to block third-party cookies
@@ -1342,22 +1367,22 @@ Your Brave account may have other forms of browsing history like searches and ac
         If a site tries to steal your password, or when you download a harmful file, Brave may send URLs including bits of page content to Safe Browsing
       </message>
       <message name="IDS_PRIVACY_REVIEW_SB_ENHANCED_ITEM_ONE" desc="First bullet point that describes the details of the Safe Browsing control.">
-        Warns you about dangerous events before they happen
+        Predicts and warns you about dangerous events before they happen
       </message>
       <message name="IDS_PRIVACY_REVIEW_SB_ENHANCED_ITEM_TWO" desc="Second bullet point that describes the details of the Safe Browsing control.">
         Keeps you safe on Brave and may be used to improve your security in other Brave apps when you are signed in
       </message>
       <message name="IDS_PRIVACY_REVIEW_SB_ENHANCED_ITEM_THREE" desc="Third bullet point that describes the details of the Safe Browsing control.">
-        Warns you if passwords are exposed in a data breach
+        Improves security for you and everyone on the web
       </message>
       <message name="IDS_PRIVACY_REVIEW_SB_ENHANCED_ITEM_FOUR" desc="Fourth bullet point that describes the details of the Safe Browsing control.">
-        Improves security for you and everyone on the web
+        Warns you if passwords are exposed in a data breach
       </message>
       <message name="IDS_PRIVACY_REVIEW_SB_ENHANCED_ITEM_FIVE" desc="Fifth bullet point that describes the details of the Safe Browsing control.">
         Sends URLs to Safe Browsing to check them
       </message>
       <message name="IDS_PRIVACY_REVIEW_SB_ENHANCED_ITEM_SIX" desc="Sixth bullet point that describes the details of the Safe Browsing control.">
-        Sends a small sample of pages, downloads, extension activity, and system information to help discover new threats
+        Also sends a small sample of pages, downloads, extension activity, and system information to help discover new threats
       </message>
       <message name="IDS_PRIVACY_REVIEW_SB_ENHANCED_ITEM_SEVEN" desc="Seventh bullet point that describes the details of the Safe Browsing control.">
         Temporarily links this data to your Brave sync chain when you’re signed in, to protect you across Brave apps
@@ -1420,6 +1445,9 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_SAFETY_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT" desc="Text to display when the password check hits the daily quota limit.">
         Brave couldn’t check all passwords
       </message>
+      <message name="IDS_SAFETY_CHECK_PASSWORDS_UPDATE_PLAY_SERVICES" desc="Text to display when the password check is unable to run because Google Play services version is not supported.">
+        Update Google Play services to check your passwords
+      </message>
       <message name="IDS_SAFETY_CHECK_UPDATES_UPDATED" desc="Text to display when the updates check confirms that the latest version is already installed.">
         Brave is up to date
       </message>
@@ -1560,7 +1588,7 @@ Your Brave account may have other forms of browsing history like searches and ac
         Other languages
       </message>
       <message name="IDS_LANGUAGES_CONTENT_TITLE" desc="Title of Language settings section to add or remove preferred content languages. Content languages are selected by the user and tell Brave what language the user prefers webpage content in.  [CHAR_LIMIT=32]">
-        Content languages
+        Preferred languages
       </message>
       <message name="IDS_LANGUAGES_CONTENT_DESCRIPTION" desc="Description of Content language on the Language settings screen. Appears above a list of one or more languages that the user selects to tell Brave which languages they prefer webpage content in.">
         To show content in your preferred languages, the sites you visit can see your preferences
@@ -1586,6 +1614,9 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_LANGUAGES_SRP_SUBTITLE" desc="Subtitle warning a user that the language of their keyboard will not change if they change the application language of Brave on Android.">
         Your keyboard won’t change
       </message>
+      <message name="IDS_LANGUAGES_MORE_LANGUAGES" desc="Text used in a language picker to hide languages that a user is less likely to select. [CHAR_LIMIT=32]">
+        More languages
+      </message>
       <message name="IDS_LANGUAGES_SRP_LOADING_TEXT" desc="Text to display while a language pack is being downloaded.">
         Loading <ph name="LANG">%1$s<ex>Hindi</ex></ph>
       </message>
@@ -1658,45 +1689,12 @@ Your Brave account may have other forms of browsing history like searches and ac
         </message>
 
       <!-- Download later -->
-      <message name="IDS_DOWNLOAD_LATER_DIALOG_TITLE" desc="Title of the download later dialog that let the user to choose the time to download.">
-        Download later instead?
-      </message>
-      <message name="IDS_DOWNLOAD_LATER_DIALOG_SUBTITLE" desc="Subtitle of the download later dialog that let the user to choose the time to download.">
-        You'll see a notification when this file is ready
-      </message>
-      <message name="IDS_DOWNLOAD_LATER_DOWNLOAD_NOW_TEXT" desc="The text for the radio button to trigger the download now in download later dialog.">
-        Now
-      </message>
-      <message name="IDS_DOWNLOAD_LATER_EDIT_LOCATION" desc="The text in the download later dialog that can be clicked to edit download location.">
-        Your file will be saved to <ph name="BEGIN_BOLD">&lt;b&gt;</ph><ph name="DIRECTORY">%1$s<ex>Downloads</ex></ph><ph name="END_BOLD">&lt;/b&gt;</ph>. <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Edit<ph name="END_LINK2">&lt;/LINK2&gt;</ph>.
-      </message>
       <message name="IDS_DOWNLOAD_DATE_TIME_PICKER_NEXT_TEXT" desc="The text for the positive button of the download date time picker dialog.">
         Next
       </message>
-      <message name="IDS_DOWNLOAD_LATER_ON_WIFI_TEXT" desc="The text for the radio button to trigger the download on WIFI in download later dialog.">
-        On Wi-Fi
-      </message>
-      <message name="IDS_DOWNLOAD_LATER_PICK_TIME_TEXT" desc="The text for the radio button to select the download time in download later dialog.">
-        Pick date &amp; time
-      </message>
       <message name="IDS_DOWNLOAD_LATER_PROMPT_ENABLED_TITLE" desc="A setting text to ask whether to show a dialog about when to download.">
         Ask when to save files
       </message>
-      <message name="IDS_DOWNLOAD_LATER_SLOW_NETWORK_SUBTITLE" desc="A subtitle in the download later dialog to inform the user about slow network connection.">
-        Your <ph name="CONNECTION_TYPE">%1$s<ex>2G</ex></ph> connection might slow down your download
-      </message>
-      <message name="IDS_DOWNLOAD_LATER_2G_CONNECTION" desc="2G connection type.">
-        2G
-      </message>
-      <message name="IDS_DOWNLOAD_LATER_BLUETOOTH_CONNECTION" desc="Bluetooth connection type.">
-        Bluetooth
-      </message>
-      <message name="IDS_DOWNLOAD_LATER_LARGE_FILE_SUBTITLE" desc="A subtitle in the download later dialog to inform the user about large download file size.">
-        This file is large (<ph name="FILE_SIZE">%1$s<ex>300MB</ex></ph>)
-      </message>
-      <message name="IDS_DOWNLOAD_LATER_DIALOG_POSITIVE_BUTTON_TEXT" desc="The text of positive button on the download later dialog.">
-        Done
-      </message>
 
       <!-- Downloads location -->
       <message name="IDS_DOWNLOADS_LOCATION_SELECTOR_TITLE" desc="Title of the preference that allows the user to select which of the folders they would like to make the default location to save their downloads.">
@@ -1840,8 +1838,27 @@ Your Brave account may have other forms of browsing history like searches and ac
         Allow all sites
       </message>
 
-      <message name="IDS_POWERED_BY_CHROME_MESSAGE" desc="A message indicating that the current page is running in Brave.">
-        Powered by Brave
+      <!-- Parent approval widget. TODO(crbug.com/1330900): enable translations once strings are finalized. -->
+      <message name="IDS_PARENT_WEBSITE_APPROVAL_TITLE" desc="The title text displayed in the bottom sheet asking a parent to allow or not allow a website." translateable="false">
+        <ph name="CHILD_NAME">%1$s<ex>Alice</ex></ph> wants you to approve this website:
+      </message>
+      <message name="IDS_PARENT_WEBSITE_APPROVAL_ALL_OF_DOMAIN" desc="The text which tells the parent that all of a particular domain will be allowed if they approve the request." translateable="false">
+        All pages of <ph name="DOMAIN">%1$s<ex>netflix.com</ex></ph>
+      </message>
+      <message name="IDS_PARENT_WEBSITE_APPROVAL_APPROVE_BUTTON" desc="The text displayed on the button to approve a website." translateable="false">
+        Approve
+      </message>
+      <message name="IDS_PARENT_WEBSITE_APPROVAL_DENY_BUTTON" desc="The text displayed on the button to not approve a website." translateable="false">
+        Don’t approve
+      </message>
+      <message name="IDS_PARENT_WEBSITE_APPROVAL_CONTENT_DESCRIPTION" desc="The content description for the bottom sheet allowing a parent to approve or deny a request to view a website." translateable="false">
+        Option to approve or not approve a website
+      </message>
+      <message name="IDS_PARENT_WEBSITE_APPROVAL_FULL_HEIGHT" desc="Accessibility string read when the parent website approval bottom sheet is opened at full height." translateable="false">
+        Option to approve or not approve a website opened at full height
+      </message>
+      <message name="IDS_PARENT_WEBSITE_APPROVAL_CLOSED" desc="Accessibility string read when the parent website approval bottom sheet is closed." translateable="false">
+        Option to approve or not approve a website closed
       </message>
 
       <!-- Sync strings in account management dialog -->
@@ -2242,6 +2259,16 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         Download will start at <ph name="time">%1$s<ex>8:30PM</ex></ph>.
       </message>
 
+      <message name="IDS_INCOGNITO_DOWNLOAD_MESSAGE_TITLE" desc="Download title displayed in a prompt message when the user downloads a file in Private mode.">
+        Download file?
+      </message>
+      <message name="IDS_INCOGNITO_DOWNLOAD_MESSAGE_DETAIL" desc="Download message text displayed in a prompt message when the user downloads a file in Private mode.">
+        Anyone using this device can see downloaded files
+      </message>
+      <message name="IDS_INCOGNITO_DOWNLOAD_MESSAGE_BUTTON" desc="Download primary button text displayed in a prompt message when the user downloads a file in Private mode.">
+        Download
+      </message>
+
       <message name="IDS_MENU_TRANSLATE" desc="Menu item for triggering a page translation. The word 'Translate' should match the translation in TC ID 1613971242435858090. [CHAR_LIMIT=27]">
         Translate…
       </message>
@@ -2287,6 +2314,15 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_PASSWORD_FILLING_REAUTH_PROMPT_TITLE" desc="The title of the authentication dialog displayed before the password manager fills a saved password into a website.">
         Verify it’s you
       </message>
+      <message name="IDS_PASSWORD_MANAGER_OUTDATED_GMS_DIALOG_DESCRIPTION" desc="Description text of the dialog appearing when the Google Play Services needs to be updated to use the Brave Password Manager. Dialog suggests to update the Google Play Services.">
+        To manage your passwords, update Google Play services
+      </message>
+      <message name="IDS_PASSWORD_MANAGER_OUTDATED_GMS_POSITIVE_BUTTON" desc="Label for the positive ('update') button of the dialog appearing when the Google Play Services needs to be updated to use the Brave Password Manager. Clicking on this button opens the Google Play services page in the Google Play Store.">
+        Update
+      </message>
+      <message name="IDS_PASSWORD_MANAGER_OUTDATED_GMS_NEGATIVE_BUTTON" desc="Label for the negative ('not now') button of the dialog appearing when the Google Play Services needs to be updated to use the Brave Password Manager. Clicking on this button dismisses the dialog without further actions.">
+        Not now
+      </message>
 
       <!-- Runtime permission strings -->
       <message name="IDS_MISSING_STORAGE_PERMISSION_DOWNLOAD_EDUCATION_TEXT" desc="Text shown educating the user that Brave is missing the Android storage permission, which is required to download files.">
@@ -2441,12 +2477,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_IPH_PWA_INSTALL_AVAILABLE_TEXT" desc="The in-product-help message for PWAs that can be installed to the device.">
         Install this app
       </message>
-      <message name="IDS_IPH_BUBBLE_ADD_TO_HOME_SCREEN" desc="The in-product-help text bubble message encouraging users to add a commonly visited webpage to the home screen.">
-        To get here quicker, add this page to your Home screen
-      </message>
-      <message name="IDS_IPH_BUBBLE_ADD_TO_HOME_SCREEN_ACCESSIBILITY" desc="The in-product-help text bubble message encouraging users to add a commonly visited webpage to the home screen. Used when a screen reader is turned. 'More options' should match TC ID 8110367050267853536.">
-        To get here quicker, add this page to your Home screen from the More options button
-      </message>
       <message name="IDS_IPH_MESSAGE_ADD_TO_HOME_SCREEN_TITLE" desc="The title of in-product-help message encouraging users to add a commonly visited webpage to the home screen.">
         Add to Home screen
       </message>
@@ -2753,6 +2783,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        See other tabs
      </message>
 
+     <!-- Private reauthentication promo card -->
+     <message name="IDS_INCOGNITO_REAUTH_PROMO_TITLE" desc="The title of the private re-auth promo card.">
+       Lock Private tabs when you leave Brave
+     </message>
+     <message name="IDS_INCOGNITO_REAUTH_PROMO_DESCRIPTION" desc="The description of the private re-auth promo card.">
+       Use screen lock to see open Private tabs
+     </message>
+     <message name="IDS_INCOGNITO_REAUTH_LOCK_ACTION_TEXT" desc="The label of the button which upon click would turn on the corresponding Brave level Private lock setting after a re-authentication.">
+       Turn on Private lock
+     </message>
+
       <!-- Autofill/Wallet integration prompt -->
       <message name="IDS_CARD_UNMASK_INPUT_HINT" desc="Hint text for an input field containing the user's credit card CVC (card verification code).">
         CVC
@@ -2880,10 +2921,10 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         Sign in to Brave, closed.
       </message>
       <message name="IDS_SIGNIN_ACCOUNT_PICKER_BOTTOM_SHEET_SUBTITLE" desc="The subtitle for the account picker bottom sheet that tells the user what happens if the button 'Continue as John Doe' is clicked">
-        Sign in to this site and Brave with your Brave sync chain. You can turn on sync later.
+        Sign in to this site and Brave with your Brave sync chain.
       </message>
       <message name="IDS_SIGNIN_ACCOUNT_PICKER_BOTTOM_SHEET_SUBTITLE_FOR_SEND_TAB_TO_SELF" desc="The subtitle for the account picker bottom sheet that tells the user what happens if the button 'Continue as John Doe' is clicked, when send-tab-to-self triggered the UI.">
-        You can send tabs between devices that are signed in with the same Brave sync chain
+        To send this tab to another device, sign in to Brave on both devices
       </message>
       <message name="IDS_SIGNIN_ACCOUNT_PICKER_BOTTOM_SHEET_SIGNIN_TITLE" desc="The title of the account picker bottom sheet tells that the user is in the process of signing in with their Brave sync chain">
         Signing in...
@@ -3644,7 +3685,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         Try again
       </message>
       <message name="IDS_IPH_PRICE_TRACKING_MENU_ITEM" desc="In-product-help text that describes that a user can track the price of a product in the overflow menu.">
-        Track price here
+        Track price
       </message>
       <message name="IDS_IPH_PRICE_TRACKING_MENU_ITEM_ACCESSIBILITY" is_accessibility_with_no_ui="true" desc="In-product-help accessibility text that describes that a user can track the price of a product in the overflow menu.">
         Track price from the More options button
@@ -3883,15 +3924,18 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_ACCESSIBILITY_OMNIBOX_SHOWING_SUGGESTIONS_FOR_WEBSITE" desc="Whenever the User is visiting a Website, when they click the Omnibox, we will announce this message, if we have suggestions to show.">
         Showing suggestions for <ph name="WEBSITE_TITLE">%1$s<ex>Crater Lake National Park (U.S. National Park Service)</ex></ph>
       </message>
-      <message name="IDS_ACCESSIBILITY_OMNIBOX_MOST_VISITED_TILE" desc="When the user focuses a Frequently Visited URL tile suggestion, the tile will be crome://announced according to the following pattern">
-        <ph name="WEBSITE_TITLE">%1$s<ex>Crater Lake National Park (U.S. National Park Service)</ex></ph>: <ph name="WEBSITE_URL">%2$s<ex>https://www.nps.gov/crla</ex></ph>
-      </message>
       <message name="IDS_ACCESSIBILITY_OMNIBOX_PEDAL" desc="Announce focused Brave Action Button on the Omnibox Suggestions List. List of known Action buttons is defined here: https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc">
         Brave action button: <ph name="ACTION">%s<ex>clear browsing data</ex></ph>
       </message>
       <message name="IDS_ACCESSIBILITY_OMNIBOX_SUGGESTED_ITEMS" desc="Announcement about the presence and volume of suggestions below the Omnibox.">
         <ph name="SUGGESTIONS_COUNT">%d<ex>12</ex></ph> suggested items in list below.
       </message>
+      <message name="IDS_ACCESSIBILITY_OMNIBOX_MOST_VISITED_TILE_SEARCH" desc="Announces that interacting with a Tile executes a specific search query.">
+        Search: <ph name="SEARCH_QUERY">%s<ex>Weather in San Francisco</ex></ph>
+      </message>
+      <message name="IDS_ACCESSIBILITY_OMNIBOX_MOST_VISITED_TILE_NAVIGATE" desc="Announces that interacting with a Tile takes the user to specific website.">
+        Navigate: <ph name="WEBSITE_TITLE">%1$s<ex>Crater Lake National Park (U.S. National Park Service)</ex></ph>: <ph name="WEBSITE_URL">%2$s<ex>https://www.nps.gov/crla</ex></ph>
+      </message>
 
       <message name="IDS_ACCESSIBILITY_SHARE_SELECTED_ITEMS" desc="Content description for the button to share selected items. [ICU Syntax]">
         {NUM_SELECTED, plural,
@@ -4196,6 +4240,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_TWA_RUNNING_IN_CHROME" desc="Message on a snackbar indicating that the current Activity may use Brave data (the rest of the app may not be).">
         Running in Brave
       </message>
+      <message name="IDS_TWA_RUNNING_IN_CHROME_TEMPLATE" desc="Message template that used to indicating that the current Activity may use Brave data (the rest of the app may not be). [CHAR_LIMIT=32]">
+        Running in <ph name="APP_NAME">%1$s<ex>Brave</ex></ph>
+      </message>
       <message name="IDS_TWA_RUNNING_IN_CHROME_V2" desc="Updated message on a snackbar indicating that the current Activity may use Brave data (the rest of the app may not be).">
         You'll see your <ph name="SITE_NAME">%1$s<ex>www.youtube.com</ex></ph> sign-in status, browsing data, and site data in Brave
       </message>
@@ -4588,21 +4635,15 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_SEND_TAB_TO_SELF_WHEN_SIGNED_IN_UNAVAILABLE" desc="Instructions for the user to enable the feature when it's currently unavailable.">
         You can send tabs between devices that are signed in with the same Brave sync chain
       </message>
+      <message name="IDS_SEND_TAB_TO_SELF_ANDROID_NO_TARGET_DEVICE_LABEL" desc="Text shown when a user with no available target devices attempts to use send-tab-to-self.">
+        To send this tab to another device, sign in to Brave there
+      </message>
 
 
       <!-- Sharing -->
       <message name="IDS_SHARING_SENDING_NOTIFICATION_TITLE" desc="Title text displayed in a sharing sending notification.">
         Sharing to <ph name="DEVICE_NAME">%1$s<ex>Pixel 3</ex></ph>
       </message>
-      <message name="IDS_SHARING_NO_DEVICES_AVAILABLE_TITLE" desc="Text to show when no device targets are available for sharing.">
-        Turn on sync to share across devices
-      </message>
-      <message name="IDS_SHARING_NO_DEVICES_AVAILABLE_TEXT" desc="Text to show when no device targets are available for sharing.">
-        To share something from your phone to another device, turn on sync in Brave settings on both devices
-      </message>
-      <message name="IDS_SHARING_CHROME_SETTINGS" desc="Text shown in a button when user has turned off sync.">
-        Go to Brave settings
-      </message>
 
       <!-- Sharing Hub -->
       <message name="IDS_SHARING_HUB_NO_DEVICES_AVAILABLE_TEXT" desc="Text to show when no device targets are available for sharing.">
@@ -4694,9 +4735,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_SHARED_CLIPBOARD_NOTIFICATION_TEXT" desc="Content text displayed in a shared clipboard notification.">
         Copied to your clipboard
       </message>
-      <message name="IDS_SHARED_CLIPBOARD_SHARE_ACTIVITY_TITLE" desc="Title of the Shared Clipboard Share activity that will appear in the Android share dialog.">
-        Send text to Your Devices
-      </message>
 
       <!-- Sms Fetcher -->
       <message name="IDS_SMS_FETCHER_NOTIFICATION_TITLE" desc="Title text shown when the Android Brave receives a ONE_TIME_CODE from an incoming SMS and ask users for permission to submit the code to their linked Desktop Brave">
@@ -5441,17 +5479,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       Brave Assistant provides a better voice experience for searching the web and engaging with sites you have open. Brave Assistant will receive the URL and contents of sites you use with it.
       </message>
 
-      <!-- Continuous Search Navigation strings -->
-      <message name="IDS_CSN_AD_LABEL" desc="Label for identifying an ad in search results." translateable="false">
-      Ad
-      </message>
-      <message name="IDS_CSN_PROVIDER_LABEL" desc="Label that shows the source of a list of clickalbe URLs. This should have a new line character in the middle." translateable="false">
-      Results from\n<ph name="PROVIDER">%1$s</ph>
-      </message>
-      <message name="IDS_CSN_ACCESSIBILITY_RESULTS_FROM_GOOGLE" desc="Content description for the Brave search results button.">
-        Search results from Brave.
-      </message>
-
       <!-- WebID Account Selection strings -->
       <message name="IDS_ACCOUNT_SELECTION_SHEET_TITLE_AUTO" desc="Header for sign in sheet. Sheet is shown to inform user of sign in. Sign in occurs automatically. (User can cancel)." translateable="false">
         Signing in to <ph name="SITE_ETLD_PLUS_ONE">%1$s<ex>rp.example</ex></ph> with <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE">%2$s<ex>idp.com</ex></ph>
@@ -5591,6 +5618,11 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_PASSWORD_EDIT_DIALOG_UNSYNCED_FOOTER" desc="Footer for a dialog which allows users to see and edit passwords while saving/updating a new credential. Displayed for users who are not syncing passwords.">
         Passwords are saved to Password Manager on this device
       </message>
+
+      <!-- Price tracking strings -->
+      <message name="IDS_PRICE_DROP_SPOTTED_IPH" desc="This text appears in the IPH when a user opens a new tab page and an item in any of their open tabs has a price drop.">
+        Price drop spotted
+      </message>
     </messages>
   </release>
 </grit>
diff --git a/browser/ui/android/strings/android_chrome_strings_override.grd b/browser/ui/android/strings/android_chrome_strings_override.grd
index d7ba8b348353..d22c3a58bf8d 100644
--- a/browser/ui/android/strings/android_chrome_strings_override.grd
+++ b/browser/ui/android/strings/android_chrome_strings_override.grd
@@ -178,7 +178,17 @@ Trust tokens improve privacy on the web and can’t be used to find out who you
      <message name="IDS_INCOGNITO_REAUTH_PAGE_UNLOCK_INCOGNITO_BUTTON_LABEL" desc="The label of button which upon click allows user to start the re-authentication process to view their existing Private tabs.">
        Unlock Private
      </message>
-     <message name="IDS_SIGNIN_FRE_UMA_DIALOG_FIRST_SECTION_BODY" desc="Text that describes the benefits users will get if they turn on the metrics sharing option.">
+     <message name="IDS_INCOGNITO_REAUTH_PROMO_TITLE" desc="The title of the private re-auth promo card.">
+       Lock Private tabs when you leave Brave
+     </message>
+     <message name="IDS_INCOGNITO_REAUTH_PROMO_DESCRIPTION" desc="The description of the private re-auth promo card.">
+       Use screen lock to see open Private tabs
+     </message>
+     <message name="IDS_INCOGNITO_REAUTH_LOCK_ACTION_TEXT" desc="The label of the button which upon click would turn on the corresponding Brave level Private lock setting after a re-authentication.">
+       Turn on Private lock
+     </message>
+
+      <message name="IDS_SIGNIN_FRE_UMA_DIALOG_FIRST_SECTION_BODY" desc="Text that describes the benefits users will get if they turn on the metrics sharing option.">
         Help make Brave better for profiles who use it the way you do
       </message>
       <message name="IDS_NEW_INCOGNITO_TAB_TITLE" desc="Title in tab strip when opening a new Private tab.">
diff --git a/browser/ui/color/brave_color_id.h b/browser/ui/color/brave_color_id.h
new file mode 100644
index 000000000000..c46f7898b16e
--- /dev/null
+++ b/browser/ui/color/brave_color_id.h
@@ -0,0 +1,93 @@
+/* Copyright (c) 2022 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_UI_COLOR_BRAVE_COLOR_ID_H_
+#define BRAVE_BROWSER_UI_COLOR_BRAVE_COLOR_ID_H_
+
+#include "brave/components/brave_vpn/buildflags/buildflags.h"
+#include "brave/components/sidebar/buildflags/buildflags.h"
+#include "brave/components/speedreader/common/buildflags.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
+
+// clang-format off
+
+#define BRAVE_COMMON_COLOR_IDS                  \
+    E_CPONLY(kColorForTest)                     \
+    E_CPONLY(kColorIconBase)                    \
+    E_CPONLY(kColorMenuItemSubText)             \
+    E_CPONLY(kColorBookmarkBarInstructionsText) \
+    E_CPONLY(kColorLocationBarFocusRing)
+
+#define BRAVE_SEARCH_CONVERSION_COLOR_IDS                             \
+    E_CPONLY(kColorSearchConversionBannerTypeBackgroundBorder)        \
+    E_CPONLY(kColorSearchConversionBannerTypeBackgroundBorderHovered) \
+    E_CPONLY(kColorSearchConversionBannerTypeBackgroundGradientFrom)  \
+    E_CPONLY(kColorSearchConversionBannerTypeBackgroundGradientTo)    \
+    E_CPONLY(kColorSearchConversionBannerTypeDescText)                \
+    E_CPONLY(kColorSearchConversionButtonTypeBackgroundNormal)        \
+    E_CPONLY(kColorSearchConversionButtonTypeBackgroundHovered)       \
+    E_CPONLY(kColorSearchConversionButtonTypeDescNormal)              \
+    E_CPONLY(kColorSearchConversionButtonTypeDescHovered)             \
+    E_CPONLY(kColorSearchConversionButtonTypeInputAppend)
+
+#if BUILDFLAG(ENABLE_SIDEBAR)
+#define BRAVE_SIDEBAR_COLOR_IDS                               \
+    E_CPONLY(kColorSidebarAddBubbleBackground)                \
+    E_CPONLY(kColorSidebarAddBubbleHeaderText)                \
+    E_CPONLY(kColorSidebarAddBubbleItemTextBackgroundHovered) \
+    E_CPONLY(kColorSidebarAddBubbleItemTextHovered)           \
+    E_CPONLY(kColorSidebarAddBubbleItemTextNormal)            \
+    E_CPONLY(kColorSidebarAddButtonDisabled)                  \
+    E_CPONLY(kColorSidebarArrowBackgroundHovered)             \
+    E_CPONLY(kColorSidebarArrowDisabled)                      \
+    E_CPONLY(kColorSidebarArrowNormal)                        \
+    E_CPONLY(kColorSidebarButtonBase)                         \
+    E_CPONLY(kColorSidebarItemBackgroundHovered)              \
+    E_CPONLY(kColorSidebarItemDragIndicatorColor)             \
+    E_CPONLY(kColorSidebarSeparator)
+#else
+#define BRAVE_SIDEBAR_COLOR_IDS
+#endif
+
+#if BUILDFLAG(ENABLE_SPEEDREADER)
+#define BRAVE_SPEEDREADER_COLOR_IDS      \
+  E_CPONLY(kColorSpeedreaderIcon)        \
+  E_CPONLY(kColorSpeedreaderToggleThumb) \
+  E_CPONLY(kColorSpeedreaderToggleTrack)
+#else
+#define BRAVE_SPEEDREADER_COLOR_IDS
+#endif
+
+#if BUILDFLAG(ENABLE_BRAVE_VPN)
+#define BRAVE_VPN_COLOR_IDS                        \
+    E_CPONLY(kColorBraveVpnButtonBorder)           \
+    E_CPONLY(kColorBraveVpnButtonTextConnected)    \
+    E_CPONLY(kColorBraveVpnButtonTextDisconnected)
+#else
+#define BRAVE_VPN_COLOR_IDS
+#endif
+
+#define BRAVE_COLOR_IDS               \
+    BRAVE_COMMON_COLOR_IDS            \
+    BRAVE_SEARCH_CONVERSION_COLOR_IDS \
+    BRAVE_SIDEBAR_COLOR_IDS           \
+    BRAVE_SPEEDREADER_COLOR_IDS       \
+    BRAVE_VPN_COLOR_IDS
+
+#include "ui/color/color_id_macros.inc"
+
+enum BraveColorIds : ui::ColorId {
+  kBraveColorsStart = kChromeColorsEnd,
+
+  BRAVE_COLOR_IDS
+
+  kBraveColorsEnd,
+};
+
+#include "ui/color/color_id_macros.inc"  // NOLINT
+
+// clang-format on
+
+#endif  // BRAVE_BROWSER_UI_COLOR_BRAVE_COLOR_ID_H_
diff --git a/browser/ui/color/brave_color_mixer.cc b/browser/ui/color/brave_color_mixer.cc
index d8a240e048a2..9ab285a39daf 100644
--- a/browser/ui/color/brave_color_mixer.cc
+++ b/browser/ui/color/brave_color_mixer.cc
@@ -5,83 +5,374 @@
 
 #include "brave/browser/ui/color/brave_color_mixer.h"
 
+#include "base/notreached.h"
+#include "base/numerics/safe_conversions.h"
+#include "brave/browser/themes/theme_properties.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/color/color_palette.h"
+#include "brave/components/brave_vpn/buildflags/buildflags.h"
+#include "brave/components/sidebar/buildflags/buildflags.h"
+#include "brave/components/speedreader/common/buildflags.h"
 #include "chrome/browser/ui/color/chrome_color_id.h"
 #include "ui/color/color_id.h"
 #include "ui/color/color_provider.h"
 #include "ui/color/color_recipe.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/native_theme/native_theme.h"
+
+namespace {
+
+// Location bar colors
+const SkColor kPrivateLocationBarBgBase = SkColorSetRGB(0x0B, 0x07, 0x24);
+const SkColor kDarkLocationBarBgBase = SkColorSetRGB(0x18, 0x1A, 0x21);
+const SkColor kDarkLocationBarHoverBg = SkColorSetRGB(0x23, 0x25, 0x2F);
+
+// Copied from //chrome/browser/ui/omnibox//omnibox_theme.h
+// As below values are not changed for several years, it would be safe to copy.
+// Can't include //chrome/browser/ui/omnibox in here due to circular deps.
+constexpr float kOmniboxOpacityHovered = 0.10f;
+constexpr float kOmniboxOpacitySelected = 0.16f;
+
+enum class ProfileType {
+  kNormalProfile,
+  kPrivateProfile,
+  kTorProfile,
+};
+
+struct ColorPropertiesMapEntry {
+  int property_id;
+  BraveColorIds color_id;
+};
+
+SkColor GetColorContrastingToToolbar(const ui::ColorProviderManager::Key& key,
+                                     const ui::ColorMixer& mixer,
+                                     const ColorPropertiesMapEntry& entry,
+                                     ProfileType profile_type) {
+  // Custom theme's toolbar color will be the final color.
+  auto toolbar_color = mixer.GetResultColor(kColorToolbar);
+  SkColor custom_toolbar_color;
+  if (key.custom_theme &&
+      key.custom_theme->GetColor(ThemeProperties::COLOR_TOOLBAR,
+                                 &custom_toolbar_color)) {
+    toolbar_color = custom_toolbar_color;
+  }
+  const auto base_button_color_light = MaybeGetDefaultColorForBraveUi(
+      entry.property_id, profile_type == ProfileType::kPrivateProfile,
+      profile_type == ProfileType::kTorProfile,
+      dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT);
+  const auto base_button_color_dark = MaybeGetDefaultColorForBraveUi(
+      entry.property_id, profile_type == ProfileType::kPrivateProfile,
+      profile_type == ProfileType::kTorProfile,
+      dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK);
+  DCHECK(base_button_color_light && base_button_color_dark);
+  return color_utils::PickContrastingColor(base_button_color_light.value(),
+                                           base_button_color_dark.value(),
+                                           toolbar_color);
+}
+
+SkColor GetBraveThemeColor(const ui::ColorProviderManager::Key& key,
+                           const ColorPropertiesMapEntry& entry,
+                           ProfileType profile_type) {
+  auto color = MaybeGetDefaultColorForBraveUi(
+      entry.property_id, profile_type == ProfileType::kPrivateProfile,
+      profile_type == ProfileType::kTorProfile,
+      key.color_mode == ui::ColorProviderManager::ColorMode::kLight
+          ? dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT
+          : dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK);
+  DCHECK(color);
+  return color.value();
+}
+
+void AddBraveFeaturesColors(const ui::ColorProviderManager::Key& key,
+                            ui::ColorMixer* color_mixer,
+                            ProfileType profile_type) {
+  static constexpr ColorPropertiesMapEntry kPropertiesMap[] = {
+    {BraveThemeProperties::COLOR_ICON_BASE, kColorIconBase},
+    {BraveThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT,
+     kColorBookmarkBarInstructionsText},
+    {BraveThemeProperties::COLOR_MENU_ITEM_SUB_TEXT_COLOR,
+     kColorMenuItemSubText},
+    {BraveThemeProperties::
+         COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_BORDER,
+     kColorSearchConversionBannerTypeBackgroundBorder},
+    {BraveThemeProperties::
+         COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_BORDER_HOVERED,
+     kColorSearchConversionBannerTypeBackgroundBorderHovered},
+    {BraveThemeProperties::
+         COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_GRADIENT_FROM,
+     kColorSearchConversionBannerTypeBackgroundGradientFrom},
+    {BraveThemeProperties::
+         COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_GRADIENT_TO,
+     kColorSearchConversionBannerTypeBackgroundGradientTo},
+    {BraveThemeProperties::
+         COLOR_SEARCH_CONVERSION_BUTTON_TYPE_BACKGROUND_NORMAL,
+     kColorSearchConversionButtonTypeBackgroundNormal},
+    {BraveThemeProperties::
+         COLOR_SEARCH_CONVERSION_BUTTON_TYPE_BACKGROUND_HOVERED,
+     kColorSearchConversionButtonTypeBackgroundHovered},
+    {BraveThemeProperties::COLOR_SEARCH_CONVERSION_BANNER_TYPE_DESC_TEXT,
+     kColorSearchConversionBannerTypeDescText},
+    {BraveThemeProperties::COLOR_SEARCH_CONVERSION_BUTTON_TYPE_DESC_NORMAL,
+     kColorSearchConversionButtonTypeDescNormal},
+    {BraveThemeProperties::COLOR_SEARCH_CONVERSION_BUTTON_TYPE_DESC_HOVERED,
+     kColorSearchConversionButtonTypeDescHovered},
+    {BraveThemeProperties::COLOR_SEARCH_CONVERSION_BUTTON_TYPE_INPUT_APPEND,
+     kColorSearchConversionButtonTypeInputAppend},
+#if BUILDFLAG(ENABLE_SIDEBAR)
+    {BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_BACKGROUND,
+     kColorSidebarAddBubbleBackground},
+    {BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_HEADER_TEXT,
+     kColorSidebarAddBubbleHeaderText},
+    {BraveThemeProperties::
+         COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_BACKGROUND_HOVERED,
+     kColorSidebarAddBubbleItemTextBackgroundHovered},
+    {BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_HOVERED,
+     kColorSidebarAddBubbleItemTextHovered},
+    {BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_NORMAL,
+     kColorSidebarAddBubbleItemTextNormal},
+    {BraveThemeProperties::COLOR_SIDEBAR_ADD_BUTTON_DISABLED,
+     kColorSidebarAddButtonDisabled},
+    {BraveThemeProperties::COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED,
+     kColorSidebarArrowBackgroundHovered},
+    {BraveThemeProperties::COLOR_SIDEBAR_ARROW_DISABLED,
+     kColorSidebarArrowDisabled},
+    {BraveThemeProperties::COLOR_SIDEBAR_ARROW_NORMAL,
+     kColorSidebarArrowNormal},
+    {BraveThemeProperties::COLOR_SIDEBAR_BUTTON_BASE, kColorSidebarButtonBase},
+    {BraveThemeProperties::COLOR_SIDEBAR_ITEM_BACKGROUND_HOVERED,
+     kColorSidebarItemBackgroundHovered},
+    {BraveThemeProperties::COLOR_SIDEBAR_ITEM_DRAG_INDICATOR_COLOR,
+     kColorSidebarItemDragIndicatorColor},
+    {BraveThemeProperties::COLOR_SIDEBAR_SEPARATOR, kColorSidebarSeparator},
+#endif
+#if BUILDFLAG(ENABLE_SPEEDREADER)
+    {BraveThemeProperties::COLOR_SPEEDREADER_ICON, kColorSpeedreaderIcon},
+    {BraveThemeProperties::COLOR_SPEEDREADER_TOGGLE_THUMB,
+     kColorSpeedreaderToggleThumb},
+    {BraveThemeProperties::COLOR_SPEEDREADER_TOGGLE_TRACK,
+     kColorSpeedreaderToggleTrack},
+#endif
+#if BUILDFLAG(ENABLE_BRAVE_VPN)
+    {BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_BORDER,
+     kColorBraveVpnButtonBorder},
+    {BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_TEXT_CONNECTED,
+     kColorBraveVpnButtonTextConnected},
+    {BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_TEXT_DISCONNECTED,
+     kColorBraveVpnButtonTextDisconnected},
+#endif
+  };
+
+  ui::ColorMixer& mixer = *color_mixer;
+  for (auto& entry : kPropertiesMap) {
+    switch (entry.property_id) {
+      case BraveThemeProperties::COLOR_ICON_BASE:
+      case BraveThemeProperties::COLOR_MENU_ITEM_SUB_TEXT_COLOR:
+      case BraveThemeProperties::
+          COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_BORDER:
+      case BraveThemeProperties::
+          COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_BORDER_HOVERED:
+      case BraveThemeProperties::
+          COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_GRADIENT_FROM:
+      case BraveThemeProperties::
+          COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_GRADIENT_TO:
+      case BraveThemeProperties::COLOR_SEARCH_CONVERSION_BANNER_TYPE_DESC_TEXT:
+      case BraveThemeProperties::
+          COLOR_SEARCH_CONVERSION_BUTTON_TYPE_BACKGROUND_NORMAL:
+      case BraveThemeProperties::
+          COLOR_SEARCH_CONVERSION_BUTTON_TYPE_BACKGROUND_HOVERED:
+      case BraveThemeProperties::
+          COLOR_SEARCH_CONVERSION_BUTTON_TYPE_DESC_NORMAL:
+      case BraveThemeProperties::
+          COLOR_SEARCH_CONVERSION_BUTTON_TYPE_DESC_HOVERED:
+      case BraveThemeProperties::
+          COLOR_SEARCH_CONVERSION_BUTTON_TYPE_INPUT_APPEND: {
+        mixer[entry.color_id] = {GetBraveThemeColor(key, entry, profile_type)};
+        break;
+      }
+      case BraveThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT: {
+        mixer[entry.color_id] = {
+            GetColorContrastingToToolbar(key, mixer, entry, profile_type)};
+        break;
+      }
+#if BUILDFLAG(ENABLE_SIDEBAR)
+      case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_BACKGROUND:
+      case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_HEADER_TEXT:
+      case BraveThemeProperties::
+          COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_BACKGROUND_HOVERED:
+      case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_HOVERED:
+      case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_NORMAL:
+      case BraveThemeProperties::COLOR_SIDEBAR_SEPARATOR: {
+        mixer[entry.color_id] = {GetBraveThemeColor(key, entry, profile_type)};
+        break;
+      }
+      case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUTTON_DISABLED:
+      case BraveThemeProperties::COLOR_SIDEBAR_BUTTON_BASE:
+      case BraveThemeProperties::COLOR_SIDEBAR_ARROW_DISABLED:
+      case BraveThemeProperties::COLOR_SIDEBAR_ARROW_NORMAL:
+      case BraveThemeProperties::COLOR_SIDEBAR_ITEM_DRAG_INDICATOR_COLOR: {
+        mixer[entry.color_id] = {
+            GetColorContrastingToToolbar(key, mixer, entry, profile_type)};
+        break;
+      }
+      case BraveThemeProperties::COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED:
+      case BraveThemeProperties::COLOR_SIDEBAR_ITEM_BACKGROUND_HOVERED: {
+        // Copied from
+        // chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h
+        // to use same hover background with toolbar button.
+        constexpr float kToolbarInkDropHighlightVisibleOpacity = 0.08f;
+        mixer[entry.color_id] = {
+            SkColorSetA(mixer.GetResultColor(kColorToolbarInkDrop),
+                        0xFF * kToolbarInkDropHighlightVisibleOpacity)};
+        break;
+      }
+#endif
+#if BUILDFLAG(ENABLE_SPEEDREADER)
+      case BraveThemeProperties::COLOR_SPEEDREADER_ICON:
+      case BraveThemeProperties::COLOR_SPEEDREADER_TOGGLE_THUMB:
+      case BraveThemeProperties::COLOR_SPEEDREADER_TOGGLE_TRACK: {
+        mixer[entry.color_id] = {GetBraveThemeColor(key, entry, profile_type)};
+        break;
+      }
+#endif
+#if BUILDFLAG(ENABLE_BRAVE_VPN)
+      case BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_BORDER: {
+        mixer[entry.color_id] = {GetBraveThemeColor(key, entry, profile_type)};
+        break;
+      }
+      case BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_TEXT_CONNECTED:
+      case BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_TEXT_DISCONNECTED: {
+        mixer[entry.color_id] = {
+            GetColorContrastingToToolbar(key, mixer, entry, profile_type)};
+        break;
+      }
+#endif
+      default:
+        NOTREACHED();
+    }
+  }
+}
+
+}  // namespace
+
+SkColor GetLocationBarBackground(bool dark, bool priv, bool hover) {
+  if (priv) {
+    return hover ? color_utils::HSLShift(kPrivateLocationBarBgBase,
+                                         {-1, -1, 0.54})
+                 : kPrivateLocationBarBgBase;
+  }
+
+  if (dark) {
+    return hover ? kDarkLocationBarHoverBg : kDarkLocationBarBgBase;
+  }
+
+  return hover ? color_utils::AlphaBlend(SK_ColorWHITE,
+                                         SkColorSetRGB(0xf3, 0xf3, 0xf3), 0.7f)
+               : SK_ColorWHITE;
+}
+
+// Omnibox result bg colors
+SkColor GetOmniboxResultBackground(int id, bool dark, bool priv) {
+#if !defined(USE_AURA)
+  ui::NativeTheme* native_theme = nullptr;
+#else
+  // For high contrast, selected rows use inverted colors to stand out more.
+  ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
+#endif  // !defined(USE_AURA)
+  bool high_contrast =
+      native_theme && native_theme->UserHasContrastPreference();
+  float omnibox_opacity = 0.0f;
+  if (id == kColorOmniboxResultsBackgroundHovered) {
+    omnibox_opacity = kOmniboxOpacityHovered;
+  } else if (id == kColorOmniboxResultsBackgroundSelected) {
+    omnibox_opacity = kOmniboxOpacitySelected;
+  }
+
+  SkColor color;
+  if (priv) {
+    color = high_contrast ? color_utils::HSLShift(kPrivateLocationBarBgBase,
+                                                  {-1, -1, 0.45})
+                          : kPrivateLocationBarBgBase;
+  } else if (dark) {
+    color = high_contrast ? gfx::kGoogleGrey900 : kDarkLocationBarBgBase;
+  } else {
+    color = SK_ColorWHITE;
+  }
+  return color_utils::BlendTowardMaxContrast(
+      color, base::ClampRound(omnibox_opacity * 0xff));
+}
 
 void AddBraveLightThemeColorMixer(ui::ColorProvider* provider,
                                   const ui::ColorProviderManager::Key& key) {
   ui::ColorMixer& mixer = provider->AddMixer();
 
+  mixer[kColorBookmarkBarForeground] = {kColorTabForegroundActiveFrameActive};
   mixer[kColorDownloadShelfButtonText] = {gfx::kBraveGrey800};
-
-  mixer[ui::kColorFrameActive] = {kLightFrame};
-  mixer[kColorTabBackgroundInactiveFrameActive] = {ui::kColorFrameActive};
+  mixer[kColorForTest] = {SkColorSetRGB(0xFF, 0xFF, 0xFF)};
   mixer[kColorNewTabButtonBackgroundFrameActive] = {ui::kColorFrameActive};
-  mixer[kColorToolbarContentAreaSeparator] = {ui::kColorFrameActive};
-
-  mixer[ui::kColorFrameInactive] = {
-      color_utils::HSLShift(kLightFrame, {-1, -1, 0.6})};
-  mixer[kColorTabBackgroundInactiveFrameInactive] = {ui::kColorFrameInactive};
   mixer[kColorNewTabButtonBackgroundFrameInactive] = {ui::kColorFrameInactive};
-
-  mixer[kColorToolbar] = {kLightToolbar};
-  mixer[kColorToolbarTopSeparatorFrameActive] = {kColorToolbar};
-  mixer[kColorToolbarTopSeparatorFrameInactive] = {kColorToolbar};
+  mixer[kColorNewTabPageBackground] = {kBraveNewTabBackgroundLight};
   mixer[kColorTabBackgroundActiveFrameActive] = {kColorToolbar};
   mixer[kColorTabBackgroundActiveFrameInactive] = {kColorToolbar};
-
+  mixer[kColorTabBackgroundInactiveFrameActive] = {ui::kColorFrameActive};
+  mixer[kColorTabBackgroundInactiveFrameInactive] = {ui::kColorFrameInactive};
   mixer[kColorTabForegroundActiveFrameActive] = {kLightToolbarIcon};
   mixer[kColorTabForegroundInactiveFrameActive] = {
       kColorTabForegroundActiveFrameActive};
-  mixer[kColorBookmarkBarForeground] = {kColorTabForegroundActiveFrameActive};
+  mixer[kColorToolbar] = {kLightToolbar};
   mixer[kColorToolbarButtonIcon] = {kColorTabForegroundActiveFrameActive};
-
   mixer[kColorToolbarButtonIconInactive] = {
       color_utils::AlphaBlend(kLightToolbarIcon, kLightToolbar, 0.3f)};
+  mixer[kColorToolbarContentAreaSeparator] = {ui::kColorFrameActive};
+  mixer[kColorToolbarTopSeparatorFrameActive] = {kColorToolbar};
+  mixer[kColorToolbarTopSeparatorFrameInactive] = {kColorToolbar};
+  mixer[ui::kColorFrameActive] = {kLightFrame};
+  mixer[ui::kColorFrameInactive] = {
+      color_utils::HSLShift(kLightFrame, {-1, -1, 0.6})};
+  mixer[ui::kColorToggleButtonThumbOff] = {SK_ColorWHITE};
+  mixer[ui::kColorToggleButtonThumbOn] = {SkColorSetRGB(0x4C, 0x54, 0xD2)};
+  mixer[ui::kColorToggleButtonTrackOff] = {SkColorSetRGB(0xDA, 0xDC, 0xE8)};
+  mixer[ui::kColorToggleButtonTrackOn] = {SkColorSetRGB(0xE1, 0xE2, 0xF6)};
 
-  mixer[kColorNewTabPageBackground] = {kBraveNewTabBackgroundLight};
+  AddBraveFeaturesColors(key, &mixer, ProfileType::kNormalProfile);
 }
 
 void AddBraveDarkThemeColorMixer(ui::ColorProvider* provider,
                                  const ui::ColorProviderManager::Key& key) {
   ui::ColorMixer& mixer = provider->AddMixer();
 
+  mixer[kColorBookmarkBarForeground] = {kColorTabForegroundActiveFrameActive};
   mixer[kColorDownloadShelfButtonText] = {SK_ColorWHITE};
-
-  mixer[ui::kColorFrameActive] = {kDarkFrame};
-  mixer[kColorTabBackgroundInactiveFrameActive] = {ui::kColorFrameActive};
+  mixer[kColorForTest] = {SkColorSetRGB(0x00, 0x00, 0x00)};
   mixer[kColorNewTabButtonBackgroundFrameActive] = {ui::kColorFrameActive};
-
-  mixer[ui::kColorFrameInactive] = {
-      color_utils::HSLShift(kDarkFrame, {-1, -1, 0.6})};
-  mixer[kColorTabBackgroundInactiveFrameInactive] = {ui::kColorFrameInactive};
   mixer[kColorNewTabButtonBackgroundFrameInactive] = {ui::kColorFrameInactive};
-
-  mixer[kColorToolbar] = {kDarkToolbar};
-  mixer[kColorToolbarTopSeparatorFrameActive] = {kColorToolbar};
-  mixer[kColorToolbarTopSeparatorFrameInactive] = {kColorToolbar};
-  mixer[kColorToolbarContentAreaSeparator] = {kColorToolbar};
-  mixer[kColorTabStrokeFrameActive] = {kColorToolbar};
-  mixer[kColorTabStrokeFrameInactive] = {kColorToolbar};
+  mixer[kColorNewTabPageBackground] = {kBraveNewTabBackgroundDark};
   mixer[kColorTabBackgroundActiveFrameActive] = {kColorToolbar};
   mixer[kColorTabBackgroundActiveFrameInactive] = {kColorToolbar};
-
+  mixer[kColorTabBackgroundInactiveFrameActive] = {ui::kColorFrameActive};
+  mixer[kColorTabBackgroundInactiveFrameInactive] = {ui::kColorFrameInactive};
   mixer[kColorTabForegroundActiveFrameActive] = {
       SkColorSetRGB(0xF3, 0xF3, 0xF3)};
-  mixer[kColorBookmarkBarForeground] = {kColorTabForegroundActiveFrameActive};
   mixer[kColorTabForegroundInactiveFrameActive] = {
       kColorTabForegroundActiveFrameActive};
+  mixer[kColorTabStrokeFrameActive] = {kColorToolbar};
+  mixer[kColorTabStrokeFrameInactive] = {kColorToolbar};
+  mixer[kColorToolbar] = {kDarkToolbar};
   mixer[kColorToolbarButtonIcon] = {kDarkToolbarIcon};
-
   mixer[kColorToolbarButtonIconInactive] = {
       color_utils::AlphaBlend(kDarkToolbarIcon, kDarkToolbar, 0.3f)};
+  mixer[kColorToolbarContentAreaSeparator] = {kColorToolbar};
+  mixer[kColorToolbarTopSeparatorFrameActive] = {kColorToolbar};
+  mixer[kColorToolbarTopSeparatorFrameInactive] = {kColorToolbar};
+  mixer[ui::kColorFrameActive] = {kDarkFrame};
+  mixer[ui::kColorFrameInactive] = {
+      color_utils::HSLShift(kDarkFrame, {-1, -1, 0.6})};
+  mixer[ui::kColorToggleButtonThumbOff] = {SK_ColorWHITE};
+  mixer[ui::kColorToggleButtonThumbOn] = {SkColorSetRGB(0x44, 0x36, 0xE1)};
+  mixer[ui::kColorToggleButtonTrackOff] = {SkColorSetRGB(0x5E, 0x61, 0x75)};
+  mixer[ui::kColorToggleButtonTrackOn] = {SkColorSetRGB(0x76, 0x79, 0xB1)};
 
-  mixer[kColorNewTabPageBackground] = {kBraveNewTabBackgroundDark};
+  AddBraveFeaturesColors(key, &mixer, ProfileType::kNormalProfile);
 }
 
 void AddBravePrivateThemeColorMixer(ui::ColorProvider* provider,
@@ -90,32 +381,30 @@ void AddBravePrivateThemeColorMixer(ui::ColorProvider* provider,
 
   ui::ColorMixer& mixer = provider->AddMixer();
 
-  mixer[ui::kColorFrameActive] = {kPrivateFrame};
-  mixer[kColorTabBackgroundInactiveFrameActive] = {ui::kColorFrameActive};
+  mixer[kColorBookmarkBarForeground] = {SkColorSetRGB(0xFF, 0xFF, 0xFF)};
+  mixer[kColorForTest] = {SkColorSetRGB(0xFF, 0x00, 0x00)};
+  mixer[kColorLocationBarFocusRing] = {SkColorSetRGB(0xC6, 0xB3, 0xFF)};
   mixer[kColorNewTabButtonBackgroundFrameActive] = {ui::kColorFrameActive};
-
-  mixer[ui::kColorFrameInactive] = {
-      color_utils::HSLShift(kPrivateFrame, {-1, -1, 0.55})};
-  mixer[kColorTabBackgroundInactiveFrameInactive] = {ui::kColorFrameInactive};
   mixer[kColorNewTabButtonBackgroundFrameInactive] = {ui::kColorFrameInactive};
-
-  mixer[kColorToolbar] = {kPrivateToolbar};
-  mixer[kColorToolbarContentAreaSeparator] = {kColorToolbar};
+  mixer[kColorNewTabPageBackground] = {kPrivateFrame};
   mixer[kColorTabBackgroundActiveFrameActive] = {kColorToolbar};
   mixer[kColorTabBackgroundActiveFrameInactive] = {kColorToolbar};
-
+  mixer[kColorTabBackgroundInactiveFrameActive] = {ui::kColorFrameActive};
+  mixer[kColorTabBackgroundInactiveFrameInactive] = {ui::kColorFrameInactive};
   mixer[kColorTabForegroundActiveFrameActive] = {
       SkColorSetRGB(0xF3, 0xF3, 0xF3)};
-
-  mixer[kColorBookmarkBarForeground] = {SkColorSetRGB(0xFF, 0xFF, 0xFF)};
   mixer[kColorTabForegroundInactiveFrameActive] = {
       SkColorSetRGB(0xFF, 0xFF, 0xFF)};
-
+  mixer[kColorToolbar] = {kPrivateToolbar};
   mixer[kColorToolbarButtonIcon] = {kDarkToolbarIcon};
   mixer[kColorToolbarButtonIconInactive] = {
       color_utils::AlphaBlend(kDarkToolbarIcon, kPrivateToolbar, 0.3f)};
+  mixer[kColorToolbarContentAreaSeparator] = {kColorToolbar};
+  mixer[ui::kColorFrameActive] = {kPrivateFrame};
+  mixer[ui::kColorFrameInactive] = {
+      color_utils::HSLShift(kPrivateFrame, {-1, -1, 0.55})};
 
-  mixer[kColorNewTabPageBackground] = {kPrivateFrame};
+  AddBraveFeaturesColors(key, &mixer, ProfileType::kPrivateProfile);
 }
 
 void AddBraveTorThemeColorMixer(ui::ColorProvider* provider,
@@ -124,22 +413,84 @@ void AddBraveTorThemeColorMixer(ui::ColorProvider* provider,
 
   ui::ColorMixer& mixer = provider->AddMixer();
 
-  mixer[ui::kColorFrameActive] = {kPrivateTorFrame};
-  mixer[kColorTabBackgroundInactiveFrameActive] = {ui::kColorFrameActive};
+  mixer[kColorLocationBarFocusRing] = {SkColorSetRGB(0xCF, 0xAB, 0xE2)};
   mixer[kColorNewTabButtonBackgroundFrameActive] = {ui::kColorFrameActive};
-
-  mixer[ui::kColorFrameInactive] = {
-      color_utils::HSLShift(kPrivateTorFrame, {-1, -1, 0.55})};
-  mixer[kColorTabBackgroundInactiveFrameInactive] = {ui::kColorFrameInactive};
   mixer[kColorNewTabButtonBackgroundFrameInactive] = {ui::kColorFrameInactive};
-
-  mixer[kColorToolbar] = {kPrivateTorToolbar};
-  mixer[kColorToolbarContentAreaSeparator] = {kColorToolbar};
+  mixer[kColorNewTabPageBackground] = {kPrivateTorFrame};
   mixer[kColorTabBackgroundActiveFrameActive] = {kColorToolbar};
   mixer[kColorTabBackgroundActiveFrameInactive] = {kColorToolbar};
-
+  mixer[kColorTabBackgroundInactiveFrameActive] = {ui::kColorFrameActive};
+  mixer[kColorTabBackgroundInactiveFrameInactive] = {ui::kColorFrameInactive};
+  mixer[kColorToolbar] = {kPrivateTorToolbar};
   mixer[kColorToolbarButtonIconInactive] = {
       color_utils::AlphaBlend(kDarkToolbarIcon, kPrivateTorToolbar, 0.3f)};
+  mixer[kColorToolbarContentAreaSeparator] = {kColorToolbar};
+  mixer[ui::kColorFrameActive] = {kPrivateTorFrame};
+  mixer[ui::kColorFrameInactive] = {
+      color_utils::HSLShift(kPrivateTorFrame, {-1, -1, 0.55})};
 
-  mixer[kColorNewTabPageBackground] = {kPrivateTorFrame};
+  AddBraveFeaturesColors(key, &mixer, ProfileType::kTorProfile);
+}
+
+void AddBraveOmniboxLightThemeColorMixer(
+    ui::ColorProvider* provider,
+    const ui::ColorProviderManager::Key& key) {
+  ui::ColorMixer& mixer = provider->AddMixer();
+
+  mixer[kColorOmniboxBackground] = {GetLocationBarBackground(
+      /*dark*/ false, /*private*/ false, /*hover*/ false)};
+  mixer[kColorOmniboxBackgroundHovered] = {GetLocationBarBackground(
+      /*dark*/ false, /*private*/ false, /*hover*/ true)};
+  mixer[kColorOmniboxText] = {kLightOmniboxText};
+
+  mixer[kColorOmniboxResultsBackground] = {GetOmniboxResultBackground(
+      kColorOmniboxResultsBackground, /*dark*/ false, /*incognito*/ false)};
+  mixer[kColorOmniboxResultsBackgroundHovered] = {
+      GetOmniboxResultBackground(kColorOmniboxResultsBackgroundHovered,
+                                 /*dark*/ false, /*incognito*/ false)};
+  mixer[kColorOmniboxResultsBackgroundSelected] = {
+      GetOmniboxResultBackground(kColorOmniboxResultsBackgroundSelected,
+                                 /*dark*/ false, /*incognito*/ false)};
+}
+
+void AddBraveOmniboxDarkThemeColorMixer(
+    ui::ColorProvider* provider,
+    const ui::ColorProviderManager::Key& key) {
+  ui::ColorMixer& mixer = provider->AddMixer();
+
+  mixer[kColorOmniboxBackground] = {GetLocationBarBackground(
+      /*dark*/ true, /*private*/ false, /*hover*/ false)};
+  mixer[kColorOmniboxBackgroundHovered] = {GetLocationBarBackground(
+      /*dark*/ true, /*private*/ false, /*hover*/ true)};
+  mixer[kColorOmniboxText] = {kDarkOmniboxText};
+
+  mixer[kColorOmniboxResultsBackground] = {GetOmniboxResultBackground(
+      kColorOmniboxResultsBackground, /*dark*/ true, /*incognito*/ false)};
+  mixer[kColorOmniboxResultsBackgroundHovered] = {
+      GetOmniboxResultBackground(kColorOmniboxResultsBackgroundHovered,
+                                 /*dark*/ true, /*incognito*/ false)};
+  mixer[kColorOmniboxResultsBackgroundSelected] = {
+      GetOmniboxResultBackground(kColorOmniboxResultsBackgroundSelected,
+                                 /*dark*/ true, /*incognito*/ false)};
+}
+
+void AddBraveOmniboxPrivateThemeColorMixer(
+    ui::ColorProvider* provider,
+    const ui::ColorProviderManager::Key& key) {
+  ui::ColorMixer& mixer = provider->AddMixer();
+
+  mixer[kColorOmniboxBackground] = {GetLocationBarBackground(
+      /*dark*/ false, /*private*/ true, /*hover*/ false)};
+  mixer[kColorOmniboxBackgroundHovered] = {GetLocationBarBackground(
+      /*dark*/ false, /*private*/ true, /*hover*/ true)};
+  mixer[kColorOmniboxText] = {kDarkOmniboxText};
+
+  mixer[kColorOmniboxResultsBackground] = {GetOmniboxResultBackground(
+      kColorOmniboxResultsBackground, /*dark*/ false, /*incognito*/ true)};
+  mixer[kColorOmniboxResultsBackgroundHovered] = {
+      GetOmniboxResultBackground(kColorOmniboxResultsBackgroundHovered,
+                                 /*dark*/ false, /*incognito*/ true)};
+  mixer[kColorOmniboxResultsBackgroundSelected] = {
+      GetOmniboxResultBackground(kColorOmniboxResultsBackgroundSelected,
+                                 /*dark*/ false, /*incognito*/ true)};
 }
diff --git a/browser/ui/color/brave_color_mixer.h b/browser/ui/color/brave_color_mixer.h
index d63da78fad04..e7c03d9dcd5c 100644
--- a/browser/ui/color/brave_color_mixer.h
+++ b/browser/ui/color/brave_color_mixer.h
@@ -6,12 +6,17 @@
 #ifndef BRAVE_BROWSER_UI_COLOR_BRAVE_COLOR_MIXER_H_
 #define BRAVE_BROWSER_UI_COLOR_BRAVE_COLOR_MIXER_H_
 
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/color/color_provider_manager.h"
 
 namespace ui {
 class ColorProvider;
 }  // namespace ui
 
+// Exposed for testing.
+SkColor GetLocationBarBackground(bool dark, bool priv, bool hover);
+SkColor GetOmniboxResultBackground(int id, bool dark, bool priv);
+
 void AddBraveLightThemeColorMixer(ui::ColorProvider* provider,
                                   const ui::ColorProviderManager::Key& key);
 void AddBraveDarkThemeColorMixer(ui::ColorProvider* provider,
@@ -20,5 +25,14 @@ void AddBravePrivateThemeColorMixer(ui::ColorProvider* provider,
                                     const ui::ColorProviderManager::Key& key);
 void AddBraveTorThemeColorMixer(ui::ColorProvider* provider,
                                 const ui::ColorProviderManager::Key& key);
+void AddBraveOmniboxLightThemeColorMixer(
+    ui::ColorProvider* provider,
+    const ui::ColorProviderManager::Key& key);
+void AddBraveOmniboxDarkThemeColorMixer(
+    ui::ColorProvider* provider,
+    const ui::ColorProviderManager::Key& key);
+void AddBraveOmniboxPrivateThemeColorMixer(
+    ui::ColorProvider* provider,
+    const ui::ColorProviderManager::Key& key);
 
 #endif  // BRAVE_BROWSER_UI_COLOR_BRAVE_COLOR_MIXER_H_
diff --git a/browser/ui/color/sources.gni b/browser/ui/color/sources.gni
index 271dcf59e746..efca71982cf0 100644
--- a/browser/ui/color/sources.gni
+++ b/browser/ui/color/sources.gni
@@ -3,14 +3,24 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brave_browser_ui_color_mixers_sources = [
-  "//brave/browser/ui/color/brave_color_mixer.cc",
-  "//brave/browser/ui/color/brave_color_mixer.h",
-  "//brave/browser/ui/color/color_palette.h",
-]
+brave_browser_ui_color_mixers_sources = []
+brave_browser_ui_color_mixers_deps = []
 
-brave_browser_ui_color_mixers_deps = [
-  "//skia",
-  "//ui/color",
-  "//ui/gfx",
-]
+if (!is_android) {
+  brave_browser_ui_color_mixers_sources += [
+    "//brave/browser/ui/color/brave_color_id.h",
+    "//brave/browser/ui/color/brave_color_mixer.cc",
+    "//brave/browser/ui/color/brave_color_mixer.h",
+    "//brave/browser/ui/color/color_palette.h",
+  ]
+
+  brave_browser_ui_color_mixers_deps += [
+    "//brave/components/brave_vpn/buildflags",
+    "//brave/components/sidebar/buildflags",
+    "//brave/components/speedreader/common:buildflags",
+    "//skia",
+    "//ui/color",
+    "//ui/gfx",
+    "//ui/native_theme",
+  ]
+}
diff --git a/browser/ui/content_settings/brave_autoplay_blocked_image_model.cc b/browser/ui/content_settings/brave_autoplay_blocked_image_model.cc
index b113480a9ae8..3c7fecb6d530 100644
--- a/browser/ui/content_settings/brave_autoplay_blocked_image_model.cc
+++ b/browser/ui/content_settings/brave_autoplay_blocked_image_model.cc
@@ -31,7 +31,7 @@ bool BraveAutoplayBlockedImageModel::UpdateAndGetVisibility(
 
   content_settings::PageSpecificContentSettings* content_settings =
       content_settings::PageSpecificContentSettings::GetForFrame(
-          web_contents->GetMainFrame());
+          web_contents->GetPrimaryMainFrame());
   if (!content_settings)
     return false;
   if (!content_settings->IsContentBlocked(content_type()))
diff --git a/browser/ui/content_settings/brave_autoplay_blocked_image_model_browsertest.cc b/browser/ui/content_settings/brave_autoplay_blocked_image_model_browsertest.cc
index f736b1fa04c4..493a0909bef8 100644
--- a/browser/ui/content_settings/brave_autoplay_blocked_image_model_browsertest.cc
+++ b/browser/ui/content_settings/brave_autoplay_blocked_image_model_browsertest.cc
@@ -22,7 +22,7 @@ IN_PROC_BROWSER_TEST_F(BraveAutoplayBlockedImageModelTest, CreateBubbleModel) {
       browser()->tab_strip_model()->GetActiveWebContents();
   content_settings::PageSpecificContentSettings* content_settings =
       content_settings::PageSpecificContentSettings::GetForFrame(
-          web_contents->GetMainFrame());
+          web_contents->GetPrimaryMainFrame());
   content_settings->BlockAllContentForTesting();
 
   auto model = std::make_unique<BraveAutoplayBlockedImageModel>();
diff --git a/browser/ui/content_settings/brave_autoplay_content_setting_bubble_model.cc b/browser/ui/content_settings/brave_autoplay_content_setting_bubble_model.cc
index c9440d02bdd6..fba7ac94a77a 100644
--- a/browser/ui/content_settings/brave_autoplay_content_setting_bubble_model.cc
+++ b/browser/ui/content_settings/brave_autoplay_content_setting_bubble_model.cc
@@ -69,7 +69,7 @@ void BraveAutoplayContentSettingBubbleModel::SetRadioGroup() {
 
   content_settings::PageSpecificContentSettings* content_settings =
       content_settings::PageSpecificContentSettings::GetForFrame(
-          web_contents()->GetMainFrame());
+          web_contents()->GetPrimaryMainFrame());
   bool allowed = !content_settings->IsContentBlocked(content_type());
   DCHECK(!allowed || content_settings->IsContentAllowed(content_type()));
 
diff --git a/browser/ui/sidebar/BUILD.gn b/browser/ui/sidebar/BUILD.gn
index baa7183ebea4..69b9580f394f 100644
--- a/browser/ui/sidebar/BUILD.gn
+++ b/browser/ui/sidebar/BUILD.gn
@@ -47,14 +47,16 @@ source_set("sidebar") {
   # see check_includes comment above
   deps += [
     "//chrome/browser/cart:mojo_bindings",
-    "//chrome/browser/new_tab_page/modules/drive:mojo_bindings",
-    "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings",
-    "//chrome/browser/ui/webui/realbox:mojo_bindings",
     "//ui/webui/resources/js/browser_command:mojo_bindings",
   ]
 
   if (!is_android) {
-    deps += [ "//chrome/browser/ui/webui/new_tab_page:mojo_bindings" ]
+    deps += [
+      "//chrome/browser/new_tab_page/modules/drive:mojo_bindings",
+      "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings",
+      "//chrome/browser/ui/webui/new_tab_page:mojo_bindings",
+      "//chrome/browser/ui/webui/realbox:mojo_bindings",
+    ]
   }
 }
 
diff --git a/browser/ui/tabs/brave_tab_strip_model.cc b/browser/ui/tabs/brave_tab_strip_model.cc
index de47b85f361d..8680c3a3e6cd 100644
--- a/browser/ui/tabs/brave_tab_strip_model.cc
+++ b/browser/ui/tabs/brave_tab_strip_model.cc
@@ -25,7 +25,7 @@ BraveTabStripModel::BraveTabStripModel(
 BraveTabStripModel::~BraveTabStripModel() = default;
 
 void BraveTabStripModel::SelectRelativeTab(TabRelativeDirection direction,
-                                           UserGestureDetails detail) {
+                                           TabStripUserGestureDetails detail) {
   if (contents_data_.empty())
     return;
 
@@ -39,7 +39,7 @@ void BraveTabStripModel::SelectRelativeTab(TabRelativeDirection direction,
 }
 
 void BraveTabStripModel::SelectMRUTab(TabRelativeDirection direction,
-                                      UserGestureDetails detail) {
+                                      TabStripUserGestureDetails detail) {
   if (mru_cycle_list_.empty()) {
     // Start cycling
 
diff --git a/browser/ui/tabs/brave_tab_strip_model.h b/browser/ui/tabs/brave_tab_strip_model.h
index 905433605700..d3a9594f4deb 100644
--- a/browser/ui/tabs/brave_tab_strip_model.h
+++ b/browser/ui/tabs/brave_tab_strip_model.h
@@ -22,12 +22,13 @@ class BraveTabStripModel : public TabStripModel {
   BraveTabStripModel operator=(const BraveTabStripModel&) = delete;
 
   void SelectRelativeTab(TabRelativeDirection direction,
-                         UserGestureDetails detail) override;
+                         TabStripUserGestureDetails detail) override;
 
   // Set the next tab when doing a MRU cycling with Ctrl-tab
   void SelectMRUTab(
       TabRelativeDirection direction,
-      UserGestureDetails detail = UserGestureDetails(GestureType::kOther));
+      TabStripUserGestureDetails detail = TabStripUserGestureDetails(
+          TabStripUserGestureDetails::GestureType::kOther));
 
   // Stop MRU cycling, called when releasing the Ctrl key
   void StopMRUCycling();
diff --git a/browser/ui/toolbar/brave_app_menu_model.cc b/browser/ui/toolbar/brave_app_menu_model.cc
index 8928fb36e151..dcc45d7365e9 100644
--- a/browser/ui/toolbar/brave_app_menu_model.cc
+++ b/browser/ui/toolbar/brave_app_menu_model.cc
@@ -164,15 +164,14 @@ void BraveAppMenuModel::InsertBraveMenuItems() {
 
   // Step 1. Configure tab & windows section.
   if (IsCommandIdEnabled(IDC_NEW_TOR_CONNECTION_FOR_SITE)) {
-    InsertItemWithStringIdAt(
-        GetIndexOfCommandId(IDC_NEW_WINDOW),
-        IDC_NEW_TOR_CONNECTION_FOR_SITE,
-        IDS_NEW_TOR_CONNECTION_FOR_SITE);
+    InsertItemWithStringIdAt(GetIndexOfCommandId(IDC_NEW_WINDOW).value(),
+                             IDC_NEW_TOR_CONNECTION_FOR_SITE,
+                             IDS_NEW_TOR_CONNECTION_FOR_SITE);
   }
   if (IsCommandIdEnabled(IDC_NEW_OFFTHERECORD_WINDOW_TOR)) {
-    InsertItemWithStringIdAt(GetIndexOfCommandId(IDC_NEW_INCOGNITO_WINDOW) + 1,
-                             IDC_NEW_OFFTHERECORD_WINDOW_TOR,
-                             IDS_NEW_OFFTHERECORD_WINDOW_TOR);
+    InsertItemWithStringIdAt(
+        GetIndexOfCommandId(IDC_NEW_INCOGNITO_WINDOW).value() + 1,
+        IDC_NEW_OFFTHERECORD_WINDOW_TOR, IDS_NEW_OFFTHERECORD_WINDOW_TOR);
   }
 
   // Step 2. Configure second section that includes history, downloads and
@@ -180,47 +179,46 @@ void BraveAppMenuModel::InsertBraveMenuItems() {
 
   // First, reorder original menus We want to move them in order of bookmark,
   // download and extensions.
-  const int bookmark_item_index = GetIndexOfCommandId(IDC_BOOKMARKS_MENU);
+  absl::optional<size_t> bookmark_item_index =
+      GetIndexOfCommandId(IDC_BOOKMARKS_MENU);
   // If bookmark is not used, we don't need to adjust download item.
-  if (bookmark_item_index != -1) {
+  if (bookmark_item_index.has_value()) {
     // Place download menu under bookmark.
     DCHECK(IsCommandIdEnabled(IDC_SHOW_DOWNLOADS));
-    RemoveItemAt(GetIndexOfCommandId(IDC_SHOW_DOWNLOADS));
-    InsertItemWithStringIdAt(bookmark_item_index,
-                             IDC_SHOW_DOWNLOADS,
+    RemoveItemAt(GetIndexOfCommandId(IDC_SHOW_DOWNLOADS).value());
+    InsertItemWithStringIdAt(bookmark_item_index.value(), IDC_SHOW_DOWNLOADS,
                              IDS_SHOW_DOWNLOADS);
   }
   // Move extensions menu under download.
   ui::SimpleMenuModel* model = static_cast<ui::SimpleMenuModel*>(
-      GetSubmenuModelAt(GetIndexOfCommandId(IDC_MORE_TOOLS_MENU)));
+      GetSubmenuModelAt(GetIndexOfCommandId(IDC_MORE_TOOLS_MENU).value()));
   DCHECK(model);
   // More tools menu adds extensions item always.
-  DCHECK_NE(-1, model->GetIndexOfCommandId(IDC_MANAGE_EXTENSIONS));
-  model->RemoveItemAt(model->GetIndexOfCommandId(IDC_MANAGE_EXTENSIONS));
+  DCHECK(model->GetIndexOfCommandId(IDC_MANAGE_EXTENSIONS).has_value());
+  model->RemoveItemAt(
+      model->GetIndexOfCommandId(IDC_MANAGE_EXTENSIONS).value());
 
   if (IsCommandIdEnabled(IDC_MANAGE_EXTENSIONS)) {
-    InsertItemWithStringIdAt(GetIndexOfCommandId(IDC_SHOW_DOWNLOADS) + 1,
-                             IDC_MANAGE_EXTENSIONS,
-                             IDS_SHOW_EXTENSIONS);
+    InsertItemWithStringIdAt(
+        GetIndexOfCommandId(IDC_SHOW_DOWNLOADS).value() + 1,
+        IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
   }
 
   if (IsCommandIdEnabled(IDC_SHOW_BRAVE_REWARDS)) {
     InsertItemWithStringIdAt(GetIndexOfBraveRewardsItem(),
-                             IDC_SHOW_BRAVE_REWARDS,
-                             IDS_SHOW_BRAVE_REWARDS);
+                             IDC_SHOW_BRAVE_REWARDS, IDS_SHOW_BRAVE_REWARDS);
   }
 
   // Insert wallet menu after download menu.
   if (IsCommandIdEnabled(IDC_SHOW_BRAVE_WALLET)) {
-    InsertItemWithStringIdAt(GetIndexOfCommandId(IDC_SHOW_DOWNLOADS) + 1,
-                             IDC_SHOW_BRAVE_WALLET,
-                             IDS_SHOW_BRAVE_WALLET);
+    InsertItemWithStringIdAt(
+        GetIndexOfCommandId(IDC_SHOW_DOWNLOADS).value() + 1,
+        IDC_SHOW_BRAVE_WALLET, IDS_SHOW_BRAVE_WALLET);
   }
 
   // Insert sync menu
   if (IsCommandIdEnabled(IDC_SHOW_BRAVE_SYNC)) {
-    InsertItemWithStringIdAt(GetIndexOfBraveSyncItem(),
-                             IDC_SHOW_BRAVE_SYNC,
+    InsertItemWithStringIdAt(GetIndexOfBraveSyncItem(), IDC_SHOW_BRAVE_SYNC,
                              IDS_SHOW_BRAVE_SYNC);
   }
 
@@ -248,7 +246,7 @@ void BraveAppMenuModel::InsertBraveMenuItems() {
 #endif
 
   // Insert webcompat reporter item.
-  InsertItemWithStringIdAt(GetIndexOfCommandId(IDC_ABOUT),
+  InsertItemWithStringIdAt(GetIndexOfCommandId(IDC_ABOUT).value(),
                            IDC_SHOW_BRAVE_WEBCOMPAT_REPORTER,
                            IDS_SHOW_BRAVE_WEBCOMPAT_REPORTER);
 
@@ -296,11 +294,11 @@ void BraveAppMenuModel::ExecuteCommand(int id, int event_flags) {
     if (ipfs_command == -1)
       return;
     auto* submenu = ipns_keys_submenu_models_[ipfs_command].get();
-    auto command_index = submenu->GetIndexOfCommandId(id);
-    if (command_index == -1)
+    absl::optional<size_t> command_index = submenu->GetIndexOfCommandId(id);
+    if (!command_index.has_value())
       return;
-    auto label = base::UTF16ToUTF8(submenu->GetLabelAt(command_index));
-    auto key_name = (command_index > 0) ? label : std::string();
+    auto label = base::UTF16ToUTF8(submenu->GetLabelAt(command_index.value()));
+    auto key_name = (command_index.value() > 0) ? label : std::string();
     ExecuteIPFSCommand(ipfs_command, key_name);
     return;
   }
@@ -360,16 +358,6 @@ int BraveAppMenuModel::AddIpnsKeysToSubMenu(ui::SimpleMenuModel* submenu,
   return command_id - key_command_id;
 }
 
-int BraveAppMenuModel::FindCommandIndex(int command_id) const {
-  for (const auto& it : ipns_keys_submenu_models_) {
-    int index = it.second->GetIndexOfCommandId(command_id);
-    if (index == -1)
-      continue;
-    return index;
-  }
-  return -1;
-}
-
 void BraveAppMenuModel::ExecuteIPFSCommand(int id, const std::string& key) {
   auto* active_content = browser()->tab_strip_model()->GetActiveWebContents();
   ipfs::IPFSTabHelper* helper =
@@ -391,8 +379,8 @@ void BraveAppMenuModel::ExecuteIPFSCommand(int id, const std::string& key) {
 
 int BraveAppMenuModel::GetSelectedIPFSCommandId(int id) const {
   for (const auto& it : ipns_keys_submenu_models_) {
-    auto index = it.second->GetIndexOfCommandId(id);
-    if (index == -1)
+    absl::optional<size_t> index = it.second->GetIndexOfCommandId(id);
+    if (!index.has_value())
       continue;
     return it.first;
   }
@@ -423,8 +411,9 @@ void BraveAppMenuModel::InsertAlternateProfileItems() {
   // Insert Open Guest Window and Create New Profile items just above
   // the zoom item unless these items are disabled.
 
-  const int zoom_index = GetIndexOfCommandId(IDC_ZOOM_MENU);
-  const int index = zoom_index - 1;
+  const size_t zoom_index = GetIndexOfCommandId(IDC_ZOOM_MENU).value();
+  DCHECK_GT(zoom_index, 0u);
+  const size_t index = zoom_index - 1;
 
   // Open Guest Window
   if (IsCommandIdEnabled(IDC_OPEN_GUEST_PROFILE)) {
@@ -437,11 +426,11 @@ void BraveAppMenuModel::InsertAlternateProfileItems() {
     InsertItemWithStringIdAt(index, IDC_ADD_NEW_PROFILE, IDS_ADD_NEW_PROFILE);
   }
 
-  if (zoom_index != GetIndexOfCommandId(IDC_ZOOM_MENU))
+  if (zoom_index != GetIndexOfCommandId(IDC_ZOOM_MENU).value())
     InsertSeparatorAt(index, ui::NORMAL_SEPARATOR);
 }
 
-int BraveAppMenuModel::GetLastIndexOfSecondSection() const {
+size_t BraveAppMenuModel::GetLastIndexOfSecondSection() const {
   // Insert as a last item in second section.
   std::vector<int> commands_to_check = {IDC_SHOW_BRAVE_VPN_PANEL,
                                         IDC_BRAVE_VPN_MENU,
@@ -451,60 +440,59 @@ int BraveAppMenuModel::GetLastIndexOfSecondSection() const {
                                         IDC_SHOW_BRAVE_WALLET,
                                         IDC_SHOW_DOWNLOADS};
 
-  return GetProperItemIndex(commands_to_check, true);
+  return GetProperItemIndex(commands_to_check, true).value();
 }
 
-int BraveAppMenuModel::GetIndexOfBraveRewardsItem() const {
+size_t BraveAppMenuModel::GetIndexOfBraveRewardsItem() const {
   // Insert rewards menu at first of this section. If history menu is not
   // available, check below items.
   std::vector<int> commands_to_check = {IDC_RECENT_TABS_MENU,
                                         IDC_BOOKMARKS_MENU, IDC_SHOW_DOWNLOADS};
 
-  return GetProperItemIndex(commands_to_check, false);
+  return GetProperItemIndex(commands_to_check, false).value();
 }
 
-int BraveAppMenuModel::GetIndexOfBraveSyncItem() const {
+size_t BraveAppMenuModel::GetIndexOfBraveSyncItem() const {
   // Insert sync menu under extensions menu. If extensions menu is not
   // available, check above items.
   std::vector<int> commands_to_check = {
       IDC_MANAGE_EXTENSIONS, IDC_SHOW_BRAVE_WALLET, IDC_SHOW_DOWNLOADS};
 
-  return GetProperItemIndex(commands_to_check, true);
+  return GetProperItemIndex(commands_to_check, true).value();
 }
 
 #if BUILDFLAG(ENABLE_SIDEBAR)
-int BraveAppMenuModel::GetIndexOfBraveSidebarItem() const {
+size_t BraveAppMenuModel::GetIndexOfBraveSidebarItem() const {
   std::vector<int> commands_to_check = {
       IDC_SHOW_BRAVE_SYNC, IDC_MANAGE_EXTENSIONS, IDC_SHOW_BRAVE_WALLET,
       IDC_SHOW_DOWNLOADS};
 
-  return GetProperItemIndex(commands_to_check, true);
+  return GetProperItemIndex(commands_to_check, true).value();
 }
 #endif
 
-int BraveAppMenuModel::GetIndexOfBraveVPNItem() const {
 #if BUILDFLAG(ENABLE_BRAVE_VPN)
+size_t BraveAppMenuModel::GetIndexOfBraveVPNItem() const {
   std::vector<int> commands_to_check = {
       IDC_SIDEBAR_SHOW_OPTION_MENU, IDC_SHOW_BRAVE_SYNC, IDC_MANAGE_EXTENSIONS,
       IDC_SHOW_BRAVE_WALLET, IDC_SHOW_DOWNLOADS};
 
-  return GetProperItemIndex(commands_to_check, true);
-#else
-  return -1;
-#endif
+  return GetProperItemIndex(commands_to_check, true).value();
 }
+#endif
 
-int BraveAppMenuModel::GetProperItemIndex(std::vector<int> commands_to_check,
-                                          bool insert_next) const {
-  int item_index = -1;
+absl::optional<size_t> BraveAppMenuModel::GetProperItemIndex(
+    std::vector<int> commands_to_check,
+    bool insert_next) const {
   const size_t commands_size = commands_to_check.size();
   for (size_t i = 0; i < commands_size; i++) {
-    item_index = GetIndexOfCommandId(commands_to_check[i]);
-    if (item_index != -1)
-      return insert_next ? item_index + 1 : item_index;
+    absl::optional<size_t> item_index =
+        GetIndexOfCommandId(commands_to_check[i]);
+    if (item_index.has_value())
+      return insert_next ? item_index.value() + 1 : item_index;
   }
 
-  NOTREACHED() << "At least, item for this command should be existed: "
+  NOTREACHED() << "At least, a menu item for this command should exist: "
                << commands_to_check[commands_size - 1];
-  return 0;
+  return absl::nullopt;
 }
diff --git a/browser/ui/toolbar/brave_app_menu_model.h b/browser/ui/toolbar/brave_app_menu_model.h
index 75d12c62a2b9..787ab242b491 100644
--- a/browser/ui/toolbar/brave_app_menu_model.h
+++ b/browser/ui/toolbar/brave_app_menu_model.h
@@ -15,6 +15,7 @@
 #include "brave/components/ipfs/buildflags/buildflags.h"
 #include "brave/components/sidebar/buildflags/buildflags.h"
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/base/models/simple_menu_model.h"
 
 #if BUILDFLAG(ENABLE_IPFS_LOCAL_NODE)
@@ -41,20 +42,21 @@ class BraveAppMenuModel : public AppMenuModel {
   void ExecuteCommand(int id, int event_flags) override;
   bool IsCommandIdEnabled(int id) const override;
 
-  int GetProperItemIndex(std::vector<int> commands_to_check,
-                         bool insert_next) const;
+  absl::optional<size_t> GetProperItemIndex(std::vector<int> commands_to_check,
+                                            bool insert_next) const;
 
   void InsertBraveMenuItems();
   void InsertAlternateProfileItems();
-  int GetIndexOfBraveRewardsItem() const;
-  int GetLastIndexOfSecondSection() const;
-  int GetIndexOfBraveSyncItem() const;
-  int GetIndexOfBraveVPNItem() const;
+  size_t GetIndexOfBraveRewardsItem() const;
+  size_t GetLastIndexOfSecondSection() const;
+  size_t GetIndexOfBraveSyncItem() const;
+#if BUILDFLAG(ENABLE_BRAVE_VPN)
+  size_t GetIndexOfBraveVPNItem() const;
+#endif
 #if BUILDFLAG(ENABLE_SIDEBAR)
-  int GetIndexOfBraveSidebarItem() const;
+  size_t GetIndexOfBraveSidebarItem() const;
 #endif
 #if BUILDFLAG(ENABLE_IPFS_LOCAL_NODE)
-  int FindCommandIndex(int command_id) const;
   int AddIpnsKeysToSubMenu(ui::SimpleMenuModel* submenu,
                            ipfs::IpnsKeysManager* manager,
                            int key_command_id);
diff --git a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc
index 7ef754af6fdb..55c555d2b8a4 100644
--- a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc
+++ b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc
@@ -31,6 +31,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 #if BUILDFLAG(ENABLE_BRAVE_VPN)
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
@@ -93,7 +94,7 @@ void CheckCommandsAreDisabledInMenuModel(
     ui::SimpleMenuModel* model,
     const std::vector<int>& disabled_commands) {
   for (int id : disabled_commands)
-    EXPECT_EQ(-1, model->GetIndexOfCommandId(id));
+    EXPECT_FALSE(model->GetIndexOfCommandId(id).has_value());
 }
 
 void CheckCommandsAreDisabledInMenuModel(
@@ -117,11 +118,11 @@ void CheckIpfsCommandsAreDisabledForMode(Browser* browser,
 void CheckCommandsAreInOrderInMenuModel(
     ui::SimpleMenuModel* model,
     const std::vector<int>& commands_in_order) {
-  std::vector<int> commands_index;
+  std::vector<size_t> commands_index;
   for (int id : commands_in_order) {
-    int index = model->GetIndexOfCommandId(id);
-    EXPECT_NE(-1, index);
-    commands_index.push_back(index);
+    absl::optional<size_t> index = model->GetIndexOfCommandId(id);
+    EXPECT_TRUE(index.has_value());
+    commands_index.push_back(index.value());
   }
   EXPECT_TRUE(
       std::is_sorted(std::begin(commands_index), std::end(commands_index)));
diff --git a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc
index 4d8c96130897..bf35a54fc0f4 100644
--- a/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc
+++ b/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc
@@ -8,8 +8,8 @@
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
-#include "brave/browser/themes/theme_properties.h"
 #include "brave/browser/ui/brave_view_ids.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/color/color_palette.h"
 #include "brave/components/l10n/common/locale_util.h"
 #include "brave/grit/brave_generated_resources.h"
@@ -20,7 +20,6 @@
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/color/chrome_color_id.h"
 #include "ui/accessibility/ax_node_data.h"
-#include "ui/base/theme_provider.h"
 #include "ui/color/color_id.h"
 #include "ui/color/color_provider.h"
 #include "ui/events/event.h"
@@ -120,24 +119,10 @@ void BookmarkBarInstructionsView::ShowContextMenuForViewImpl(
 }
 
 SkColor BookmarkBarInstructionsView::GetInstructionsTextColor() {
-  // TODO(simonhong): Move this logic to color mixer when we finish
-  // our color migration to color pipeline.
-  SkColor text_color = gfx::kPlaceholderColor;
-  const ui::ColorProvider* cp = GetColorProvider();
-  const ui::ThemeProvider* tp = GetThemeProvider();
-  if (!cp || !tp)
-    return text_color;
-
-  if (browser_->profile()->IsIncognitoProfile()) {
-    text_color = tp->GetColor(
-        BraveThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT);
-  } else {
-    const SkColor toolbar_color = cp->GetColor(kColorToolbar);
-    text_color = color_utils::PickContrastingColor(
-        kLightToolbarIcon, SK_ColorWHITE, toolbar_color);
-  }
+  if (const ui::ColorProvider* color_provider = GetColorProvider())
+    return color_provider->GetColor(kColorBookmarkBarInstructionsText);
 
-  return text_color;
+  return gfx::kPlaceholderColor;
 }
 
 void BookmarkBarInstructionsView::UpdateColors() {
diff --git a/browser/ui/views/crash_report_permission_ask_dialog_view.cc b/browser/ui/views/crash_report_permission_ask_dialog_view.cc
index 7df8cc8ef805..0f8b9f68abf8 100644
--- a/browser/ui/views/crash_report_permission_ask_dialog_view.cc
+++ b/browser/ui/views/crash_report_permission_ask_dialog_view.cc
@@ -10,7 +10,7 @@
 #include "base/bind.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "brave/app/vector_icons/vector_icons.h"
-#include "brave/browser/themes/theme_properties.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/components/constants/pref_names.h"
 #include "brave/components/l10n/common/locale_util.h"
 #include "brave/grit/brave_generated_resources.h"
@@ -27,7 +27,6 @@
 #include "components/prefs/pref_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/image_model.h"
-#include "ui/base/theme_provider.h"
 #include "ui/color/color_id.h"
 #include "ui/color/color_provider.h"
 #include "ui/views/background.h"
@@ -123,9 +122,8 @@ void CrashReportPermissionAskDialogView::CreateChildViews(
       header->AddChildView(std::make_unique<views::ImageView>());
   header_image->SetImageSize(gfx::Size(kIconSize, kIconSize));
   SkColor header_image_color = kDefaultSadImageColor;
-  if (parent && parent->GetThemeProvider()) {
-    header_image_color = parent->GetThemeProvider()->GetColor(
-        BraveThemeProperties::COLOR_ICON_BASE);
+  if (parent && parent->GetColorProvider()) {
+    header_image_color = parent->GetColorProvider()->GetColor(kColorIconBase);
   }
   header_image->SetImage(ui::ImageModel::FromVectorIcon(
       kBraveSadIcon, header_image_color, kIconSize));
diff --git a/browser/ui/views/download/brave_download_item_view.cc b/browser/ui/views/download/brave_download_item_view.cc
index fdf42775de26..fbec9349fdd8 100644
--- a/browser/ui/views/download/brave_download_item_view.cc
+++ b/browser/ui/views/download/brave_download_item_view.cc
@@ -19,7 +19,7 @@
 #include "content/public/common/origin_util.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/theme_provider.h"
+#include "ui/color/color_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
@@ -193,7 +193,7 @@ void BraveDownloadItemView::DrawOriginURL(gfx::Canvas* canvas) {
   int mirrored_x = GetMirroredXWithWidthInView(x, text_width);
 
   SkColor dimmed_text_color = SkColorSetA(
-      GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT), 0xC7);
+      GetColorProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT), 0xC7);
   canvas->DrawStringRect(
       originURL, origin_url_font_list_, dimmed_text_color,
       gfx::Rect(mirrored_x, GetYForOriginURLText(), text_width,
diff --git a/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc b/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc
index 8c0327ad22bf..b3054c974cc0 100644
--- a/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc
+++ b/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc
@@ -10,7 +10,6 @@
 #include <utility>
 
 #include "brave/app/vector_icons/vector_icons.h"
-#include "brave/browser/themes/theme_properties.h"
 #include "brave/browser/ui/views/infobars/brave_wayback_machine_infobar_button_container.h"
 #include "brave/components/brave_wayback_machine/brave_wayback_machine_infobar_delegate.h"
 #include "brave/components/brave_wayback_machine/pref_names.h"
@@ -18,7 +17,7 @@
 #include "brave/components/l10n/common/locale_util.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "brave/grit/brave_theme_resources.h"
-#include "chrome/browser/themes/theme_properties.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/chrome_typography.h"
 #include "components/grit/components_scaled_resources.h"
@@ -45,8 +44,8 @@
 
 namespace {
 // IDs of the colors to use for infobar elements.
-constexpr int kInfoBarLabelBackgroundColor = ThemeProperties::COLOR_INFOBAR;
-constexpr int kInfoBarLabelTextColor = ThemeProperties::COLOR_BOOKMARK_TEXT;
+constexpr int kInfoBarLabelBackgroundColor = kColorInfoBarBackground;
+constexpr int kInfoBarLabelTextColor = kColorBookmarkBarForeground;
 }  // namespace
 
 BraveWaybackMachineInfoBarContentsView::BraveWaybackMachineInfoBarContentsView(
@@ -244,9 +243,8 @@ void BraveWaybackMachineInfoBarContentsView::UpdateChildrenVisibility(
 }
 
 SkColor BraveWaybackMachineInfoBarContentsView::GetColor(int id) const {
-  const auto* theme_provider = GetThemeProvider();
-  return theme_provider ? theme_provider->GetColor(id)
-                        : gfx::kPlaceholderColor;
+  const auto* color_provider = GetColorProvider();
+  return color_provider ? color_provider->GetColor(id) : gfx::kPlaceholderColor;
 }
 
 void BraveWaybackMachineInfoBarContentsView::FetchWaybackURL() {
diff --git a/browser/ui/views/location_bar/brave_location_bar_view.cc b/browser/ui/views/location_bar/brave_location_bar_view.cc
index c9f25de9c15a..010c12ed3226 100644
--- a/browser/ui/views/location_bar/brave_location_bar_view.cc
+++ b/browser/ui/views/location_bar/brave_location_bar_view.cc
@@ -11,6 +11,7 @@
 #include "brave/app/vector_icons/vector_icons.h"
 #include "brave/browser/profiles/profile_util.h"
 #include "brave/browser/themes/brave_theme_service.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/views/brave_actions/brave_actions_container.h"
 #include "brave/browser/ui/views/toolbar/brave_toolbar_view.h"
 #include "brave/components/l10n/common/locale_util.h"
@@ -62,18 +63,13 @@ class BraveLocationBarViewFocusRingHighlightPathGenerator
   }
 };
 
-absl::optional<SkColor> GetFocusRingColor(Profile* profile) {
-  constexpr SkColor kPrivateFocusRingColor = SkColorSetRGB(0xC6, 0xB3, 0xFF);
-  constexpr SkColor kTorPrivateFocusRingColor = SkColorSetRGB(0xCF, 0xAB, 0xE2);
+absl::optional<BraveColorIds> GetFocusRingColor(Profile* profile) {
   if (brave::IsRegularProfile(profile) || profile->IsGuestSession()) {
     // Don't update color.
     return absl::nullopt;
   }
-  if (profile->IsTor())
-    return kTorPrivateFocusRingColor;
-
-  // Private window.
-  return kPrivateFocusRingColor;
+  // Private or Tor window - use color mixer.
+  return kColorLocationBarFocusRing;
 }
 
 }  // namespace
@@ -87,8 +83,8 @@ void BraveLocationBarView::Init() {
     focus_ring->SetPathGenerator(
         std::make_unique<
             BraveLocationBarViewFocusRingHighlightPathGenerator>());
-    if (const auto color = GetFocusRingColor(profile()))
-      focus_ring->SetColor(color.value());
+    if (const auto color_id = GetFocusRingColor(profile()))
+      focus_ring->SetColorId(color_id.value());
   }
 #if BUILDFLAG(ENABLE_TOR)
   onion_location_view_ = new OnionLocationView(browser_->profile());
diff --git a/browser/ui/views/omnibox/brave_search_conversion_promotion_view.cc b/browser/ui/views/omnibox/brave_search_conversion_promotion_view.cc
index 056b3098ae3d..f104bdc4f34f 100644
--- a/browser/ui/views/omnibox/brave_search_conversion_promotion_view.cc
+++ b/browser/ui/views/omnibox/brave_search_conversion_promotion_view.cc
@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "base/logging.h"
-#include "brave/browser/themes/theme_properties.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/views/omnibox/brave_omnibox_result_view.h"
 #include "brave/components/brave_search_conversion/p3a.h"
 #include "brave/components/l10n/common/locale_util.h"
@@ -28,7 +28,6 @@
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/models/image_model.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/skia_conversions.h"
@@ -74,25 +73,24 @@ class HorizontalGradientBackground : public views::Background {
 
   void Paint(gfx::Canvas* canvas, views::View* view) const override {
     // Fill with base color first.
-    canvas->DrawColor(GetOmniboxColor(view->GetThemeProvider(),
-                                      OmniboxPart::RESULTS_BACKGROUND));
+    canvas->DrawColor(
+        view->GetColorProvider()->GetColor(kColorOmniboxResultsBackground));
 
     SkColor from_color = gfx::kPlaceholderColor;
     SkColor to_color = gfx::kPlaceholderColor;
-    if (auto* tp = view->GetThemeProvider()) {
-      from_color = tp->GetColor(
-          BraveThemeProperties::
-              COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_GRADIENT_FROM);
-      to_color = tp->GetColor(
-          BraveThemeProperties::
-              COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_GRADIENT_TO);
+    if (const ui::ColorProvider* color_provider = view->GetColorProvider()) {
+      from_color = color_provider->GetColor(
+          kColorSearchConversionBannerTypeBackgroundGradientFrom);
+      to_color = color_provider->GetColor(
+          kColorSearchConversionBannerTypeBackgroundGradientTo);
     }
 
     // Gradient background from design.
     //  - linear-gradient(90deg, from_color, 19.6%, to_color, 100%).
     cc::PaintFlags flags;
     SkPoint points[2] = {SkPoint::Make(0, 0), SkPoint::Make(view->width(), 0)};
-    SkColor colors[2] = {from_color, to_color};
+    SkColor4f colors[2] = {SkColor4f::FromColor(from_color),
+                           SkColor4f::FromColor(to_color)};
     SkScalar positions[2] = {0.196f, 1.f};
     flags.setShader(cc::PaintShader::MakeLinearGradient(
         points, colors, positions, 2, SkTileMode::kClamp));
@@ -322,17 +320,15 @@ void BraveSearchConversionPromotionView::UpdateButtonTypeState() {
   button_type_container_->SetVisible(true);
   button_type_selection_indicator_->SetVisible(selected_);
   button_type_contents_input_->SetText(input_);
-  if (auto* tp = GetThemeProvider()) {
-    auto desc_color_id =
-        BraveThemeProperties::COLOR_SEARCH_CONVERSION_BUTTON_TYPE_DESC_NORMAL;
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
+    auto desc_color_id = kColorSearchConversionButtonTypeDescNormal;
     if (IsMouseHovered() || selected_) {
-      desc_color_id = BraveThemeProperties::
-          COLOR_SEARCH_CONVERSION_BUTTON_TYPE_DESC_HOVERED;
+      desc_color_id = kColorSearchConversionButtonTypeDescHovered;
     }
-    button_type_description_->SetEnabledColor(tp->GetColor(desc_color_id));
+    button_type_description_->SetEnabledColor(
+        color_provider->GetColor(desc_color_id));
     append_for_input_->SetEnabledColor(
-        tp->GetColor(BraveThemeProperties::
-                         COLOR_SEARCH_CONVERSION_BUTTON_TYPE_INPUT_APPEND));
+        color_provider->GetColor(kColorSearchConversionButtonTypeInputAppend));
   }
 
   SetBackground(GetButtonTypeBackground());
@@ -346,16 +342,14 @@ void BraveSearchConversionPromotionView::UpdateBannerTypeState() {
   SkColor desc_color = gfx::kPlaceholderColor;
   SkColor border_color = gfx::kPlaceholderColor;
   const bool is_selected_or_hovered = selected_ || IsMouseHovered();
-  if (auto* tp = GetThemeProvider()) {
-    desc_color = tp->GetColor(
-        BraveThemeProperties::COLOR_SEARCH_CONVERSION_BANNER_TYPE_DESC_TEXT);
-    const int border_id =
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
+    desc_color =
+        color_provider->GetColor(kColorSearchConversionBannerTypeDescText);
+    const auto border_id =
         is_selected_or_hovered
-            ? BraveThemeProperties::
-                  COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_BORDER_HOVERED
-            : BraveThemeProperties::
-                  COLOR_SEARCH_CONVERSION_BANNER_TYPE_BACKGROUND_BORDER_HOVERED;
-    border_color = tp->GetColor(border_id);
+            ? kColorSearchConversionBannerTypeBackgroundBorderHovered
+            : kColorSearchConversionBannerTypeBackgroundBorder;
+    border_color = color_provider->GetColor(border_id);
   }
   const int border_thickness = is_selected_or_hovered ? 2 : 1;
   banner_type_container_->SetBorder(views::CreateRoundedRectBorder(
@@ -372,7 +366,7 @@ void BraveSearchConversionPromotionView::UpdateBannerTypeState() {
   banner_type_container_->SetProperty(views::kMarginsKey, container_margin);
 
   SetBackground(views::CreateSolidBackground(
-      GetOmniboxColor(GetThemeProvider(), OmniboxPart::RESULTS_BACKGROUND)));
+      GetColorProvider()->GetColor(kColorOmniboxResultsBackground)));
   banner_type_container_->SetBackground(
       std::make_unique<HorizontalGradientBackground>());
 }
@@ -579,14 +573,12 @@ void BraveSearchConversionPromotionView::ConfigureForBannerType() {
 std::unique_ptr<views::Background>
 BraveSearchConversionPromotionView::GetButtonTypeBackground() {
   SkColor bg = gfx::kPlaceholderColor;
-  if (auto* tp = GetThemeProvider()) {
-    auto bg_color_id = BraveThemeProperties::
-        COLOR_SEARCH_CONVERSION_BUTTON_TYPE_BACKGROUND_NORMAL;
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
+    auto bg_color_id = kColorSearchConversionButtonTypeBackgroundNormal;
     if (IsMouseHovered() || selected_) {
-      bg_color_id = BraveThemeProperties::
-          COLOR_SEARCH_CONVERSION_BUTTON_TYPE_BACKGROUND_HOVERED;
+      bg_color_id = kColorSearchConversionButtonTypeBackgroundHovered;
     }
-    bg = tp->GetColor(bg_color_id);
+    bg = color_provider->GetColor(bg_color_id);
   }
 
   return views::CreateSolidBackground(bg);
diff --git a/browser/ui/views/side_panel/brave_side_panel.cc b/browser/ui/views/side_panel/brave_side_panel.cc
index 15a0f4aaa5db..cbab460e783b 100644
--- a/browser/ui/views/side_panel/brave_side_panel.cc
+++ b/browser/ui/views/side_panel/brave_side_panel.cc
@@ -8,13 +8,14 @@
 #include <memory>
 
 #include "base/ranges/algorithm.h"
-#include "chrome/browser/themes/theme_properties.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/base/theme_provider.h"
+#include "ui/color/color_provider.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/fill_layout.h"
 
-BraveSidePanel::BraveSidePanel(BrowserView* browser_view) {
+BraveSidePanel::BraveSidePanel(BrowserView* browser_view,
+                               HorizontalAlignment horizontal_alignment) {
   SetVisible(false);
   SetLayoutManager(std::make_unique<views::FillLayout>());
 
@@ -29,6 +30,16 @@ BraveSidePanel::~BraveSidePanel() {
   RemoveObserver(this);
 }
 
+void BraveSidePanel::SetHorizontalAlignment(HorizontalAlignment alignment) {}
+
+BraveSidePanel::HorizontalAlignment BraveSidePanel::GetHorizontalAlignment() {
+  return kAlignLeft;
+}
+
+bool BraveSidePanel::IsRightAligned() {
+  return false;
+}
+
 void BraveSidePanel::UpdateVisibility() {
   const bool any_child_visible = base::ranges::any_of(
       children(), [](const auto* view) { return view->GetVisible(); });
@@ -36,13 +47,12 @@ void BraveSidePanel::UpdateVisibility() {
 }
 
 void BraveSidePanel::UpdateBorder() {
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
     constexpr int kBorderThickness = 1;
     // Negative top border so panel is flush with main tab content
     SetBorder(views::CreateSolidSidedBorder(
         gfx::Insets::TLBR(-1, 0, 0, kBorderThickness),
-        theme_provider->GetColor(
-            ThemeProperties::COLOR_TOOLBAR_CONTENT_AREA_SEPARATOR)));
+        color_provider->GetColor(kColorToolbarContentAreaSeparator)));
   }
 }
 
diff --git a/browser/ui/views/side_panel/brave_side_panel.h b/browser/ui/views/side_panel/brave_side_panel.h
index ed4a1659066e..a20222ec91d3 100644
--- a/browser/ui/views/side_panel/brave_side_panel.h
+++ b/browser/ui/views/side_panel/brave_side_panel.h
@@ -16,13 +16,25 @@ class BrowserView;
 // unique inset and border style compared to Brave
 class BraveSidePanel : public views::View, public views::ViewObserver {
  public:
+  // Determines the side from which the side panel will appear.
+  // LTR / RTL conversions are handled in
+  // BrowserViewLayout::LayoutSidePanelView. As such, left will always be on the
+  // left side of the browser regardless of LTR / RTL mode.
+  enum HorizontalAlignment { kAlignLeft = 0, kAlignRight };
+
   METADATA_HEADER(BraveSidePanel);
   // Same signature as chromium SidePanel
-  explicit BraveSidePanel(BrowserView* browser_view);
+  explicit BraveSidePanel(BrowserView* browser_view,
+                          HorizontalAlignment horizontal_alignment =
+                              HorizontalAlignment::kAlignLeft);
   BraveSidePanel(const BraveSidePanel&) = delete;
   BraveSidePanel& operator=(const BraveSidePanel&) = delete;
   ~BraveSidePanel() override;
 
+  void SetHorizontalAlignment(HorizontalAlignment alignment);
+  HorizontalAlignment GetHorizontalAlignment();
+  bool IsRightAligned();
+
  private:
   void UpdateVisibility();
   void UpdateBorder();
diff --git a/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc b/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc
index 039d4071bec6..f2ae7fcdbc78 100644
--- a/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc
+++ b/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc
@@ -8,8 +8,8 @@
 #include <utility>
 
 #include "base/strings/utf_string_conversions.h"
-#include "brave/browser/themes/theme_properties.h"
 #include "brave/browser/ui/brave_browser.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/sidebar/sidebar_controller.h"
 #include "brave/browser/ui/sidebar/sidebar_service_factory.h"
 #include "brave/browser/ui/sidebar/sidebar_utils.h"
@@ -23,7 +23,7 @@
 #include "content/public/browser/web_contents.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/theme_provider.h"
+#include "ui/color/color_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
@@ -45,23 +45,20 @@ class SidebarAddItemButton : public views::LabelButton {
  public:
   METADATA_HEADER(SidebarAddItemButton);
   // Get theme provider to use browser's theme color in this dialog.
-  SidebarAddItemButton(bool bold, const ui::ThemeProvider* theme_provider)
-      : theme_provider_(theme_provider) {
+  SidebarAddItemButton(bool bold, const ui::ColorProvider* color_provider)
+      : color_provider_(color_provider) {
     constexpr auto kDefaultAddItemInsets = gfx::Insets::TLBR(10, 34, 4, 8);
     SetBorder(views::CreateEmptyBorder(kDefaultAddItemInsets));
-    if (theme_provider_) {
+    if (color_provider_) {
       SetTextColor(
           views::Button::STATE_NORMAL,
-          theme_provider->GetColor(
-              BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_NORMAL));
-      SetTextColor(views::Button::STATE_HOVERED,
-                   theme_provider->GetColor(
-                       BraveThemeProperties::
-                           COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_HOVERED));
-      SetTextColor(views::Button::STATE_PRESSED,
-                   theme_provider->GetColor(
-                       BraveThemeProperties::
-                           COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_HOVERED));
+          color_provider_->GetColor(kColorSidebarAddBubbleItemTextNormal));
+      SetTextColor(
+          views::Button::STATE_HOVERED,
+          color_provider_->GetColor(kColorSidebarAddBubbleItemTextHovered));
+      SetTextColor(
+          views::Button::STATE_PRESSED,
+          color_provider_->GetColor(kColorSidebarAddBubbleItemTextHovered));
     }
 
     const int size_diff = 13 - views::Label::GetDefaultFontList().GetFontSize();
@@ -81,10 +78,9 @@ class SidebarAddItemButton : public views::LabelButton {
       cc::PaintFlags flags;
       flags.setAntiAlias(true);
       flags.setStyle(cc::PaintFlags::kFill_Style);
-      if (theme_provider_) {
-        flags.setColor(theme_provider_->GetColor(
-            BraveThemeProperties::
-                COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_BACKGROUND_HOVERED));
+      if (color_provider_) {
+        flags.setColor(color_provider_->GetColor(
+            kColorSidebarAddBubbleItemTextBackgroundHovered));
       }
 
       constexpr int kItemRadius = 6;
@@ -94,7 +90,7 @@ class SidebarAddItemButton : public views::LabelButton {
   }
 
  private:
-  const ui::ThemeProvider* theme_provider_;
+  const ui::ColorProvider* color_provider_;
 };
 
 BEGIN_METADATA(SidebarAddItemButton, views::LabelButton)
@@ -114,10 +110,9 @@ SidebarAddItemBubbleDelegateView::SidebarAddItemBubbleDelegateView(
   set_title_margins(gfx::Insets());
   SetButtons(ui::DIALOG_BUTTON_NONE);
 
-  if (auto* theme_provider =
-          BrowserView::GetBrowserViewForBrowser(browser_)->GetThemeProvider()) {
-    set_color(theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_BACKGROUND));
+  if (const ui::ColorProvider* color_provider =
+          BrowserView::GetBrowserViewForBrowser(browser_)->GetColorProvider()) {
+    set_color(color_provider->GetColor(kColorSidebarAddBubbleBackground));
   }
   AddChildViews();
 }
@@ -159,11 +154,11 @@ void SidebarAddItemBubbleDelegateView::AddChildViews() {
       brave_l10n::GetLocalizedResourceUTF16String(
           IDS_SIDEBAR_ADD_ITEM_BUBBLE_TITLE),
       font));
-  auto* theme_provider =
-      BrowserView::GetBrowserViewForBrowser(browser_)->GetThemeProvider();
-  if (theme_provider) {
-    header->SetEnabledColor(theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_HEADER_TEXT));
+  const ui::ColorProvider* color_provider =
+      BrowserView::GetBrowserViewForBrowser(browser_)->GetColorProvider();
+  if (color_provider) {
+    header->SetEnabledColor(
+        color_provider->GetColor(kColorSidebarAddBubbleHeaderText));
   }
   header->SetAutoColorReadabilityEnabled(false);
   constexpr auto kHeaderInsets = gfx::Insets::TLBR(10, 34, 4, 8);
@@ -172,7 +167,7 @@ void SidebarAddItemBubbleDelegateView::AddChildViews() {
 
   if (sidebar::CanAddCurrentActiveTabToSidebar(browser_)) {
     auto* button = site_part->AddChildView(
-        std::make_unique<SidebarAddItemButton>(true, theme_provider));
+        std::make_unique<SidebarAddItemButton>(true, color_provider));
     const GURL active_tab_url =
         browser_->tab_strip_model()->GetActiveWebContents()->GetVisibleURL();
     button->SetText(base::UTF8ToUTF16(active_tab_url.host()));
@@ -187,9 +182,8 @@ void SidebarAddItemBubbleDelegateView::AddChildViews() {
     return;
 
   auto* separator = AddChildView(std::make_unique<views::Separator>());
-  if (theme_provider) {
-    separator->SetColor(theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SIDEBAR_SEPARATOR));
+  if (color_provider) {
+    separator->SetColorId(kColorSidebarSeparator);
   }
 
   // |default_part| includes hidden default items.
@@ -200,7 +194,7 @@ void SidebarAddItemBubbleDelegateView::AddChildViews() {
 
   for (const auto& item : hidden_default_items) {
     auto* button = default_part->AddChildView(
-        std::make_unique<SidebarAddItemButton>(false, theme_provider));
+        std::make_unique<SidebarAddItemButton>(false, color_provider));
     button->SetText(item.title);
     button->SetCallback(base::BindRepeating(
         &SidebarAddItemBubbleDelegateView::OnDefaultItemsButtonPressed,
diff --git a/browser/ui/views/sidebar/sidebar_button_view.cc b/browser/ui/views/sidebar/sidebar_button_view.cc
index c2d9028f1d62..6d1d0ff26891 100644
--- a/browser/ui/views/sidebar/sidebar_button_view.cc
+++ b/browser/ui/views/sidebar/sidebar_button_view.cc
@@ -15,7 +15,7 @@ SidebarButtonView::SidebarButtonView(Delegate* delegate,
   SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER);
   SetImageVerticalAlignment(views::ImageButton::ALIGN_MIDDLE);
   DCHECK(GetInstallFocusRingOnFocus());
-  views::FocusRing::Get(this)->SetColor(gfx::kBraveBlurple300);
+  views::FocusRing::Get(this)->SetColorId(gfx::kBraveBlurple300);
 
   // Views resulting in focusable nodes later on in the accessibility tree need
   // to have an accessible name for screen readers to see what they are about.
diff --git a/browser/ui/views/sidebar/sidebar_container_view.cc b/browser/ui/views/sidebar/sidebar_container_view.cc
index 16678f1ee021..a43c4c88a0e1 100644
--- a/browser/ui/views/sidebar/sidebar_container_view.cc
+++ b/browser/ui/views/sidebar/sidebar_container_view.cc
@@ -9,8 +9,8 @@
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
-#include "brave/browser/themes/theme_properties.h"
 #include "brave/browser/ui/brave_browser.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/sidebar/sidebar_controller.h"
 #include "brave/browser/ui/sidebar/sidebar_model.h"
 #include "brave/browser/ui/sidebar/sidebar_service_factory.h"
@@ -20,8 +20,8 @@
 #include "brave/browser/ui/views/sidebar/sidebar_side_panel_utils.h"
 #include "brave/components/sidebar/sidebar_item.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/side_panel/side_panel_entry.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
@@ -29,7 +29,6 @@
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/base/theme_provider.h"
 #include "ui/events/event_observer.h"
 #include "ui/events/types/event_type.h"
 #include "ui/gfx/geometry/point.h"
@@ -133,10 +132,10 @@ void SidebarContainerView::MenuClosed() {
 }
 
 void SidebarContainerView::UpdateBackground() {
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
     // Fill background because panel's color uses alpha value.
-    SetBackground(views::CreateSolidBackground(
-        theme_provider->GetColor(ThemeProperties::COLOR_TOOLBAR)));
+    SetBackground(
+        views::CreateSolidBackground(color_provider->GetColor(kColorToolbar)));
   }
 }
 
diff --git a/browser/ui/views/sidebar/sidebar_control_view.cc b/browser/ui/views/sidebar/sidebar_control_view.cc
index b3bb0fda1d11..343e08a2c95a 100644
--- a/browser/ui/views/sidebar/sidebar_control_view.cc
+++ b/browser/ui/views/sidebar/sidebar_control_view.cc
@@ -6,8 +6,8 @@
 #include "brave/browser/ui/views/sidebar/sidebar_control_view.h"
 
 #include "brave/app/vector_icons/vector_icons.h"
-#include "brave/browser/themes/theme_properties.h"
 #include "brave/browser/ui/brave_browser.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/sidebar/sidebar_controller.h"
 #include "brave/browser/ui/sidebar/sidebar_service_factory.h"
 #include "brave/browser/ui/sidebar/sidebar_utils.h"
@@ -17,11 +17,10 @@
 #include "brave/components/sidebar/sidebar_service.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "brave/grit/brave_theme_resources.h"
-#include "chrome/browser/themes/theme_properties.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/theme_provider.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
@@ -40,7 +39,7 @@ class ControlViewMenuModel : public ui::SimpleMenuModel {
   ControlViewMenuModel& operator=(const ControlViewMenuModel&) = delete;
 
   // ui::SimpleMenuModel overrides:
-  const gfx::FontList* GetLabelFontListAt(int index) const override {
+  const gfx::FontList* GetLabelFontListAt(size_t index) const override {
     if (index == 0) {
       return &ui::ResourceBundle::GetSharedInstance().GetFontList(
           ui::ResourceBundle::BoldFont);
@@ -116,14 +115,13 @@ void SidebarControlView::OnThemeChanged() {
 }
 
 void SidebarControlView::UpdateBackgroundAndBorder() {
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
     constexpr int kBorderThickness = 1;
-    SetBackground(views::CreateSolidBackground(
-        theme_provider->GetColor(ThemeProperties::COLOR_TOOLBAR)));
+    SetBackground(
+        views::CreateSolidBackground(color_provider->GetColor(kColorToolbar)));
     SetBorder(views::CreateSolidSidedBorder(
         gfx::Insets::TLBR(0, 0, 0, kBorderThickness),
-        theme_provider->GetColor(
-            ThemeProperties::COLOR_TOOLBAR_CONTENT_AREA_SEPARATOR)));
+        color_provider->GetColor(kColorToolbarContentAreaSeparator)));
   }
 }
 
@@ -238,13 +236,12 @@ void SidebarControlView::UpdateItemAddButtonState() {
 
 void SidebarControlView::UpdateSettingsButtonState() {
   DCHECK(sidebar_settings_view_);
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
     sidebar_settings_view_->SetImage(
         views::Button::STATE_NORMAL,
         gfx::CreateVectorIcon(
             kSidebarSettingsIcon,
-            theme_provider->GetColor(
-                BraveThemeProperties::COLOR_SIDEBAR_BUTTON_BASE)));
+            color_provider->GetColor(kColorSidebarButtonBase)));
     auto& bundle = ui::ResourceBundle::GetSharedInstance();
     sidebar_settings_view_->SetImage(
         views::Button::STATE_HOVERED,
diff --git a/browser/ui/views/sidebar/sidebar_item_add_button.cc b/browser/ui/views/sidebar/sidebar_item_add_button.cc
index c809dd67b44f..359897162f90 100644
--- a/browser/ui/views/sidebar/sidebar_item_add_button.cc
+++ b/browser/ui/views/sidebar/sidebar_item_add_button.cc
@@ -8,12 +8,11 @@
 #include "base/bind.h"
 #include "base/time/time.h"
 #include "brave/app/vector_icons/vector_icons.h"
-#include "brave/browser/themes/theme_properties.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.h"
 #include "brave/grit/brave_theme_resources.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/theme_provider.h"
 #include "ui/gfx/paint_vector_icon.h"
 
 SidebarItemAddButton::SidebarItemAddButton(
@@ -101,11 +100,10 @@ bool SidebarItemAddButton::IsBubbleVisible() const {
 void SidebarItemAddButton::UpdateButtonImages() {
   SkColor button_base_color = SK_ColorWHITE;
   SkColor button_disabled_color = SK_ColorWHITE;
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
-    button_base_color = theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SIDEBAR_BUTTON_BASE);
-    button_disabled_color = theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SIDEBAR_ADD_BUTTON_DISABLED);
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
+    button_base_color = color_provider->GetColor(kColorSidebarButtonBase);
+    button_disabled_color =
+        color_provider->GetColor(kColorSidebarAddButtonDisabled);
   }
 
   // Update add button image based on enabled state.
diff --git a/browser/ui/views/sidebar/sidebar_item_view.cc b/browser/ui/views/sidebar/sidebar_item_view.cc
index f8f69cc1bee3..665ba73509c0 100644
--- a/browser/ui/views/sidebar/sidebar_item_view.cc
+++ b/browser/ui/views/sidebar/sidebar_item_view.cc
@@ -5,12 +5,12 @@
 
 #include "brave/browser/ui/views/sidebar/sidebar_item_view.h"
 
-#include "brave/browser/themes/theme_properties.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/grit/brave_theme_resources.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/theme_provider.h"
+#include "ui/color/color_provider.h"
 #include "ui/gfx/canvas.h"
 
 SidebarItemView::SidebarItemView(Delegate* delegate,
@@ -45,8 +45,8 @@ void SidebarItemView::OnPaintBorder(gfx::Canvas* canvas) {
                          0, 0);
   }
 
-  const ui::ThemeProvider* theme_provider = GetThemeProvider();
-  if (draw_horizontal_border_ && theme_provider) {
+  const ui::ColorProvider* color_provider = GetColorProvider();
+  if (draw_horizontal_border_ && color_provider) {
     constexpr float kHorizontalBorderWidth = 2;
     gfx::Rect border_rect(GetLocalBounds());
 
@@ -55,10 +55,8 @@ void SidebarItemView::OnPaintBorder(gfx::Canvas* canvas) {
 
     border_rect.set_height(kHorizontalBorderWidth);
 
-    canvas->FillRect(
-        border_rect,
-        theme_provider->GetColor(
-            BraveThemeProperties::COLOR_SIDEBAR_ITEM_DRAG_INDICATOR_COLOR));
+    canvas->FillRect(border_rect, color_provider->GetColor(
+                                      kColorSidebarItemDragIndicatorColor));
   }
 }
 
@@ -71,12 +69,11 @@ bool SidebarItemView::IsTriggerableEvent(const ui::Event& e) {
 void SidebarItemView::OnPaintBackground(gfx::Canvas* canvas) {
   SidebarButtonView::OnPaintBackground(canvas);
 
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
     if (paint_background_on_hovered_ && GetState() == STATE_HOVERED) {
       canvas->FillRect(
           GetLocalBounds(),
-          theme_provider->GetColor(
-              BraveThemeProperties::COLOR_SIDEBAR_ITEM_BACKGROUND_HOVERED));
+          color_provider->GetColor(kColorSidebarItemBackgroundHovered));
     }
   }
 }
diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.cc b/browser/ui/views/sidebar/sidebar_items_contents_view.cc
index d7adcc066826..98200bbcda7f 100644
--- a/browser/ui/views/sidebar/sidebar_items_contents_view.cc
+++ b/browser/ui/views/sidebar/sidebar_items_contents_view.cc
@@ -12,8 +12,8 @@
 #include "base/notreached.h"
 #include "base/strings/utf_string_conversions.h"
 #include "brave/app/vector_icons/vector_icons.h"
-#include "brave/browser/themes/theme_properties.h"
 #include "brave/browser/ui/brave_browser.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/sidebar/sidebar_controller.h"
 #include "brave/browser/ui/sidebar/sidebar_service_factory.h"
 #include "brave/browser/ui/views/sidebar/sidebar_item_added_feedback_bubble.h"
@@ -31,7 +31,6 @@
 #include "ui/base/default_style.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/compositor/compositor.h"
 #include "ui/events/event.h"
@@ -158,9 +157,8 @@ void SidebarItemsContentsView::ShowContextMenuForViewImpl(
   view_for_context_menu_ = source;
   context_menu_model_ = std::make_unique<ui::SimpleMenuModel>(this);
   SkColor icon_color = SK_ColorWHITE;
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
-    icon_color = theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SIDEBAR_BUTTON_BASE);
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
+    icon_color = color_provider->GetColor(kColorSidebarButtonBase);
   }
   context_menu_model_->AddItemWithIcon(
       kItemRemove,
@@ -245,9 +243,8 @@ void SidebarItemsContentsView::SetDefaultImageAt(
     int index,
     const sidebar::SidebarItem& item) {
   SkColor text_color = SK_ColorWHITE;
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
-    text_color = theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SIDEBAR_BUTTON_BASE);
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
+    text_color = color_provider->GetColor(kColorSidebarButtonBase);
   }
 
   const int scale = GetWidget()->GetCompositor()->device_scale_factor();
@@ -412,9 +409,8 @@ gfx::ImageSkia SidebarItemsContentsView::GetImageForBuiltInItems(
     sidebar::SidebarItem::BuiltInItemType type,
     bool focused) const {
   SkColor base_button_color = SK_ColorWHITE;
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
-    base_button_color = theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SIDEBAR_BUTTON_BASE);
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
+    base_button_color = color_provider->GetColor(kColorSidebarButtonBase);
   }
   constexpr int kBuiltInIconSize = 16;
   int focused_image_resource = -1;
diff --git a/browser/ui/views/sidebar/sidebar_items_scroll_view.cc b/browser/ui/views/sidebar/sidebar_items_scroll_view.cc
index f96d47448bfd..8d5610198c57 100644
--- a/browser/ui/views/sidebar/sidebar_items_scroll_view.cc
+++ b/browser/ui/views/sidebar/sidebar_items_scroll_view.cc
@@ -11,8 +11,8 @@
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/time/time.h"
 #include "brave/app/vector_icons/vector_icons.h"
-#include "brave/browser/themes/theme_properties.h"
 #include "brave/browser/ui/brave_browser.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/sidebar/sidebar_controller.h"
 #include "brave/browser/ui/sidebar/sidebar_service_factory.h"
 #include "brave/browser/ui/views/sidebar/sidebar_item_drag_context.h"
@@ -22,14 +22,13 @@
 #include "brave/components/sidebar/sidebar_service.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "cc/paint/paint_flags.h"
-#include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/clipboard_format_type.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/mojom/drag_drop_types.mojom.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/base/theme_provider.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
@@ -49,7 +48,7 @@ class SidebarItemsArrowView : public views::ImageButton {
     SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER);
     SetImageVerticalAlignment(views::ImageButton::ALIGN_MIDDLE);
     DCHECK(GetInstallFocusRingOnFocus());
-    views::FocusRing::Get(this)->SetColor(gfx::kBraveBlurple300);
+    views::FocusRing::Get(this)->SetColorId(gfx::kBraveBlurple300);
     SetAccessibleName(accessible_name);
   }
 
@@ -61,16 +60,15 @@ class SidebarItemsArrowView : public views::ImageButton {
   gfx::Size CalculatePreferredSize() const override { return {42, 24}; }
 
   void OnPaintBackground(gfx::Canvas* canvas) override {
-    if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
-      const SkColor background_color =
-          theme_provider->GetColor(ThemeProperties::COLOR_TOOLBAR);
+    if (const ui::ColorProvider* color_provider = GetColorProvider()) {
+      const SkColor background_color = color_provider->GetColor(kColorToolbar);
       gfx::Rect bounds = GetContentsBounds();
       canvas->FillRect(bounds, background_color);
 
       // Draw additional rounded rect over background for hover effect.
       if (GetState() == STATE_HOVERED) {
-        const SkColor hovered_bg_color = theme_provider->GetColor(
-            BraveThemeProperties::COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED);
+        const SkColor hovered_bg_color =
+            color_provider->GetColor(kColorSidebarArrowBackgroundHovered);
         cc::PaintFlags flags;
         flags.setColor(hovered_bg_color);
         flags.setStyle(cc::PaintFlags::kFill_Style);
@@ -239,11 +237,11 @@ void SidebarItemsScrollView::OnFaviconUpdatedForItem(
 }
 
 void SidebarItemsScrollView::UpdateArrowViewsTheme() {
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
-    const SkColor arrow_normal = theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SIDEBAR_ARROW_NORMAL);
-    const SkColor arrow_disabled = theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SIDEBAR_ARROW_DISABLED);
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
+    const SkColor arrow_normal =
+        color_provider->GetColor(kColorSidebarArrowNormal);
+    const SkColor arrow_disabled =
+        color_provider->GetColor(kColorSidebarArrowDisabled);
 
     up_arrow_->SetImage(
         views::Button::STATE_NORMAL,
diff --git a/browser/ui/views/speedreader/speedreader_icon_view.cc b/browser/ui/views/speedreader/speedreader_icon_view.cc
index 9289e46d5304..0d7f856f667c 100644
--- a/browser/ui/views/speedreader/speedreader_icon_view.cc
+++ b/browser/ui/views/speedreader/speedreader_icon_view.cc
@@ -13,7 +13,7 @@
 #include "brave/app/brave_command_ids.h"
 #include "brave/app/vector_icons/vector_icons.h"
 #include "brave/browser/speedreader/speedreader_tab_helper.h"
-#include "brave/browser/themes/theme_properties.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/components/l10n/common/locale_util.h"
 #include "brave/components/speedreader/common/features.h"
 #include "brave/grit/brave_generated_resources.h"
@@ -57,15 +57,15 @@ void SpeedreaderIconView::UpdateImpl() {
                                               nullptr);
   }
 
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
     if (speedreader::PageStateIsDistilled(state)) {
-      const SkColor icon_color_active = theme_provider->GetColor(
-          BraveThemeProperties::COLOR_SPEEDREADER_ICON);
+      const SkColor icon_color_active =
+          color_provider->GetColor(kColorSpeedreaderIcon);
       SetIconColor(icon_color_active);
     } else if (speedreader::PageSupportsDistillation(state)) {
       // Reset the icon color
       const SkColor icon_color_default =
-          GetOmniboxColor(theme_provider, OmniboxPart::RESULTS_ICON);
+          color_provider->GetColor(kColorOmniboxResultsIcon);
       SetIconColor(icon_color_default);
     }
   }
diff --git a/browser/ui/views/speedreader/speedreader_mode_bubble.cc b/browser/ui/views/speedreader/speedreader_mode_bubble.cc
index 77ad73de4128..47d316cee2d6 100644
--- a/browser/ui/views/speedreader/speedreader_mode_bubble.cc
+++ b/browser/ui/views/speedreader/speedreader_mode_bubble.cc
@@ -13,7 +13,7 @@
 #include "base/notreached.h"
 #include "base/strings/utf_string_conversions.h"
 #include "brave/browser/speedreader/speedreader_tab_helper.h"
-#include "brave/browser/themes/theme_properties.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/views/speedreader/speedreader_bubble_util.h"
 #include "brave/browser/ui/views/speedreader/speedreader_dancing_books.h"
 #include "brave/components/constants/url_constants.h"
@@ -29,7 +29,6 @@
 #include "content/public/common/referrer.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/insets.h"
@@ -154,13 +153,13 @@ void SpeedreaderModeBubble::Init() {
 }
 
 void SpeedreaderModeBubble::UpdateColors() {
-  if (const ui::ThemeProvider* theme_provider = GetThemeProvider()) {
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
     // TODO(keur): We shoud be able to remove these once brave overrides
     // views::ToggleButton globally with our own theme
-    site_toggle_button_->SetThumbOnColor(theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SPEEDREADER_TOGGLE_THUMB));
-    site_toggle_button_->SetTrackOnColor(theme_provider->GetColor(
-        BraveThemeProperties::COLOR_SPEEDREADER_TOGGLE_TRACK));
+    site_toggle_button_->SetThumbOnColor(
+        color_provider->GetColor(kColorSpeedreaderToggleThumb));
+    site_toggle_button_->SetTrackOnColor(
+        color_provider->GetColor(kColorSpeedreaderToggleTrack));
   }
 }
 
diff --git a/browser/ui/views/toolbar/bookmark_button.cc b/browser/ui/views/toolbar/bookmark_button.cc
index efc9905ab72a..d2c355073571 100644
--- a/browser/ui/views/toolbar/bookmark_button.cc
+++ b/browser/ui/views/toolbar/bookmark_button.cc
@@ -10,13 +10,12 @@
 #include "base/strings/utf_string_conversions.h"
 #include "brave/components/l10n/common/locale_util.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/themes/theme_properties.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/browser/vector_icons.h"
 #include "components/strings/grit/components_strings.h"
-#include "ui/base/theme_provider.h"
 #include "ui/gfx/paint_vector_icon.h"
 
 BookmarkButton::BookmarkButton(PressedCallback callback)
@@ -37,9 +36,8 @@ void BookmarkButton::SetToggled(bool on) {
 }
 
 void BookmarkButton::UpdateImageAndText() {
-  const ui::ThemeProvider* tp = GetThemeProvider();
-
-  SkColor icon_color = tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
+  const ui::ColorProvider* color_provider = GetColorProvider();
+  SkColor icon_color = color_provider->GetColor(kColorToolbarButtonIcon);
   const gfx::VectorIcon& icon =
       active_ ? omnibox::kStarActiveIcon : omnibox::kStarIcon;
   SetImage(views::Button::STATE_NORMAL,
diff --git a/browser/ui/views/toolbar/brave_app_menu.cc b/browser/ui/views/toolbar/brave_app_menu.cc
index ed64400835cf..831ff3bf00f1 100644
--- a/browser/ui/views/toolbar/brave_app_menu.cc
+++ b/browser/ui/views/toolbar/brave_app_menu.cc
@@ -22,9 +22,9 @@ using views::MenuItemView;
 BraveAppMenu::~BraveAppMenu() = default;
 
 MenuItemView* BraveAppMenu::AddMenuItem(views::MenuItemView* parent,
-                                        int menu_index,
+                                        size_t menu_index,
                                         ui::MenuModel* model,
-                                        int model_index,
+                                        size_t model_index,
                                         ui::MenuModel::ItemType menu_type) {
   MenuItemView* menu_item =
       AppMenu::AddMenuItem(parent, menu_index, model, model_index, menu_type);
diff --git a/browser/ui/views/toolbar/brave_app_menu.h b/browser/ui/views/toolbar/brave_app_menu.h
index c5fb8d6105ca..7fd18a9896c8 100644
--- a/browser/ui/views/toolbar/brave_app_menu.h
+++ b/browser/ui/views/toolbar/brave_app_menu.h
@@ -19,9 +19,9 @@ class BraveAppMenu : public AppMenu {
  private:
   // AppMenu overrides:
   views::MenuItemView* AddMenuItem(views::MenuItemView* parent,
-                                   int menu_index,
+                                   size_t menu_index,
                                    ui::MenuModel* model,
-                                   int model_index,
+                                   size_t model_index,
                                    ui::MenuModel::ItemType menu_type) override;
 };
 
diff --git a/browser/ui/views/toolbar/brave_vpn_button.cc b/browser/ui/views/toolbar/brave_vpn_button.cc
index 07da89220a33..ccb544853308 100644
--- a/browser/ui/views/toolbar/brave_vpn_button.cc
+++ b/browser/ui/views/toolbar/brave_vpn_button.cc
@@ -13,13 +13,13 @@
 #include "brave/app/brave_command_ids.h"
 #include "brave/app/vector_icons/vector_icons.h"
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
-#include "brave/browser/themes/theme_properties.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/components/brave_vpn/brave_vpn_service.h"
 #include "brave/components/l10n/common/locale_util.h"
 #include "brave/grit/brave_generated_resources.h"
-#include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
@@ -163,22 +163,21 @@ void BraveVPNButton::OnConnectionStateChanged(ConnectionState state) {
 }
 
 void BraveVPNButton::UpdateColorsAndInsets() {
-  if (const auto* tp = GetThemeProvider()) {
+  if (const ui::ColorProvider* color_provider = GetColorProvider()) {
     const gfx::Insets paint_insets =
         gfx::Insets((height() - GetLayoutConstant(LOCATION_BAR_HEIGHT)) / 2);
     SetBackground(views::CreateBackgroundFromPainter(
         views::Painter::CreateSolidRoundRectPainter(
-            tp->GetColor(ThemeProperties::COLOR_TOOLBAR), kButtonRadius,
+            color_provider->GetColor(kColorToolbar), kButtonRadius,
             paint_insets)));
 
-    SetEnabledTextColors(tp->GetColor(
-        IsConnected()
-            ? BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_TEXT_CONNECTED
-            : BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_TEXT_DISCONNECTED));
+    SetEnabledTextColors(color_provider->GetColor(
+        IsConnected() ? kColorBraveVpnButtonTextConnected
+                      : kColorBraveVpnButtonTextDisconnected));
 
     std::unique_ptr<views::Border> border = views::CreateRoundedRectBorder(
         1, kButtonRadius, gfx::Insets(),
-        tp->GetColor(BraveThemeProperties::COLOR_BRAVE_VPN_BUTTON_BORDER));
+        color_provider->GetColor(kColorBraveVpnButtonBorder));
     constexpr auto kTargetInsets = gfx::Insets::VH(3, 7);
     const gfx::Insets extra_insets = kTargetInsets - border->GetInsets();
     SetBorder(views::CreatePaddedBorder(std::move(border), extra_insets));
diff --git a/browser/ui/views/toolbar/brave_vpn_status_label.cc b/browser/ui/views/toolbar/brave_vpn_status_label.cc
index 0b59d78b66b0..eaa633b66baf 100644
--- a/browser/ui/views/toolbar/brave_vpn_status_label.cc
+++ b/browser/ui/views/toolbar/brave_vpn_status_label.cc
@@ -8,13 +8,12 @@
 #include <utility>
 
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
-#include "brave/browser/themes/theme_properties.h"
+#include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/components/brave_vpn/brave_vpn_service.h"
 #include "brave/components/l10n/common/locale_util.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "ui/base/theme_provider.h"
 
 using ConnectionState = brave_vpn::mojom::ConnectionState;
 using PurchasedState = brave_vpn::mojom::PurchasedState;
@@ -66,10 +65,9 @@ BraveVPNStatusLabel::BraveVPNStatusLabel(Browser* browser)
   SetAutoColorReadabilityEnabled(false);
   UpdateState();
 
-  if (auto* provider =
-          BrowserView::GetBrowserViewForBrowser(browser_)->GetThemeProvider()) {
-    SetEnabledColor(provider->GetColor(
-        BraveThemeProperties::COLOR_MENU_ITEM_SUB_TEXT_COLOR));
+  if (const ui::ColorProvider* provider =
+          BrowserView::GetBrowserViewForBrowser(browser_)->GetColorProvider()) {
+    SetEnabledColor(provider->GetColor(kColorMenuItemSubText));
   }
   longest_state_string_id_ = GetLongestStringIdForConnectionState();
 }
diff --git a/browser/ui/views/toolbar/brave_vpn_toggle_button.cc b/browser/ui/views/toolbar/brave_vpn_toggle_button.cc
index 467d093849d0..9e9909a72fc9 100644
--- a/browser/ui/views/toolbar/brave_vpn_toggle_button.cc
+++ b/browser/ui/views/toolbar/brave_vpn_toggle_button.cc
@@ -9,13 +9,12 @@
 
 #include "base/bind.h"
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
-#include "brave/browser/themes/theme_properties.h"
 #include "brave/components/brave_vpn/brave_vpn_service.h"
 #include "brave/components/l10n/common/locale_util.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "ui/base/theme_provider.h"
+#include "ui/color/color_id.h"
 
 using ConnectionState = brave_vpn::mojom::ConnectionState;
 using PurchasedState = brave_vpn::mojom::PurchasedState;
@@ -32,16 +31,12 @@ BraveVPNToggleButton::BraveVPNToggleButton(Browser* browser)
                                   base::Unretained(this)));
   UpdateState();
 
-  if (auto* provider =
-          BrowserView::GetBrowserViewForBrowser(browser_)->GetThemeProvider()) {
-    SetThumbOnColor(provider->GetColor(
-        BraveThemeProperties::COLOR_TOGGLE_BUTTON_THUMB_ON_COLOR));
-    SetThumbOffColor(provider->GetColor(
-        BraveThemeProperties::COLOR_TOGGLE_BUTTON_THUMB_OFF_COLOR));
-    SetTrackOnColor(provider->GetColor(
-        BraveThemeProperties::COLOR_TOGGLE_BUTTON_TRACK_ON_COLOR));
-    SetTrackOffColor(provider->GetColor(
-        BraveThemeProperties::COLOR_TOGGLE_BUTTON_TRACK_OFF_COLOR));
+  if (const ui::ColorProvider* provider =
+          BrowserView::GetBrowserViewForBrowser(browser_)->GetColorProvider()) {
+    SetThumbOnColor(provider->GetColor(ui::kColorToggleButtonThumbOn));
+    SetThumbOffColor(provider->GetColor(ui::kColorToggleButtonThumbOff));
+    SetTrackOnColor(provider->GetColor(ui::kColorToggleButtonTrackOn));
+    SetTrackOffColor(provider->GetColor(ui::kColorToggleButtonTrackOff));
   }
 
   // TODO(simonhong): Re-visit this name.
diff --git a/browser/ui/views/toolbar/wallet_button.cc b/browser/ui/views/toolbar/wallet_button.cc
index 3b326ac594b4..0caf3cd895d2 100644
--- a/browser/ui/views/toolbar/wallet_button.cc
+++ b/browser/ui/views/toolbar/wallet_button.cc
@@ -15,10 +15,10 @@
 #include "brave/components/constants/webui_url_constants.h"
 #include "brave/components/l10n/common/locale_util.h"
 #include "brave/grit/brave_generated_resources.h"
-#include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "components/grit/brave_components_strings.h"
 #include "components/prefs/pref_service.h"
@@ -109,8 +109,8 @@ void WalletButton::OnWalletPressed(const ui::Event& event) {
 }
 
 void WalletButton::UpdateImageAndText() {
-  const ui::ThemeProvider* tp = GetThemeProvider();
-  SkColor icon_color = tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
+  const ui::ColorProvider* color_provider = GetColorProvider();
+  SkColor icon_color = color_provider->GetColor(kColorToolbarButtonIcon);
   SetImage(views::Button::STATE_NORMAL,
            gfx::CreateVectorIcon(kWalletToolbarButtonIcon, icon_color));
   SetTooltipText(
diff --git a/browser/ui/webui/new_tab_page/brave_new_tab_ui_browsertest.cc b/browser/ui/webui/new_tab_page/brave_new_tab_ui_browsertest.cc
index bb41634081ee..bfc1247f2107 100644
--- a/browser/ui/webui/new_tab_page/brave_new_tab_ui_browsertest.cc
+++ b/browser/ui/webui/new_tab_page/brave_new_tab_ui_browsertest.cc
@@ -56,7 +56,7 @@ class BraveNewTabUIBrowserTest : public extensions::ExtensionFunctionalTest {
 // Test that properties are set on the correct RenderViewHost.
 IN_PROC_BROWSER_TEST_F(BraveNewTabUIBrowserTest, StartupURLTest) {
   auto* contents = browser()->tab_strip_model()->GetActiveWebContents();
-  RenderProcessHost* host = contents->GetMainFrame()->GetProcess();
+  RenderProcessHost* host = contents->GetPrimaryMainFrame()->GetProcess();
   ObserverLogger observer_logger(host);
 
   GURL new_tab_url(chrome::kChromeUINewTabURL);
diff --git a/browser/ui/webui/settings/brave_search_engines_handler.cc b/browser/ui/webui/settings/brave_search_engines_handler.cc
index d754d8f10761..443b5b2fd5ad 100644
--- a/browser/ui/webui/settings/brave_search_engines_handler.cc
+++ b/browser/ui/webui/settings/brave_search_engines_handler.cc
@@ -79,19 +79,16 @@ base::Value BraveSearchEnginesHandler::GetPrivateSearchEnginesList() {
   return base::Value(std::move(defaults));
 }
 
-std::unique_ptr<base::DictionaryValue>
-BraveSearchEnginesHandler::GetSearchEnginesList() {
+base::Value::Dict BraveSearchEnginesHandler::GetSearchEnginesList() {
   auto search_engines_info = SearchEnginesHandler::GetSearchEnginesList();
   // Don't show two brave search entries from settings to prevent confusion.
   // Hide brave search for tor entry from settings UI. User doesn't need to
   // select brave search tor entry for normal profile.
-  constexpr char kDefaultsKey[] = "defaults";
-  auto* defaults = search_engines_info->FindListKey(kDefaultsKey);
+  auto* defaults = search_engines_info.FindList("defaults");
   DCHECK(defaults);
-  defaults->EraseListValueIf([](const auto& val) {
-    DCHECK(val.is_dict());
-    constexpr char kKeywordKey[] = "keyword";
-    const std::string* keyword = val.FindStringKey(kKeywordKey);
+  defaults->EraseIf([](const auto& val) {
+    const auto& dict = val.GetDict();
+    const std::string* keyword = dict.FindString("keyword");
     DCHECK(keyword);
     return *keyword == kBraveSearchForTorKeyword;
   });
diff --git a/browser/ui/webui/settings/brave_search_engines_handler.h b/browser/ui/webui/settings/brave_search_engines_handler.h
index bd19f1aa7aee..6a8b736448f4 100644
--- a/browser/ui/webui/settings/brave_search_engines_handler.h
+++ b/browser/ui/webui/settings/brave_search_engines_handler.h
@@ -25,7 +25,7 @@ class BraveSearchEnginesHandler : public SearchEnginesHandler {
   // SearchEnginesHandler overrides:
   void RegisterMessages() override;
   void OnModelChanged() override;
-  std::unique_ptr<base::DictionaryValue> GetSearchEnginesList() override;
+  base::Value::Dict GetSearchEnginesList() override;
 
   base::Value GetPrivateSearchEnginesList();
   void HandleGetPrivateSearchEnginesList(const base::Value::List& args);
diff --git a/browser/ui/webui/settings/brave_wallet_handler_unittest.cc b/browser/ui/webui/settings/brave_wallet_handler_unittest.cc
index 2cdf6eeaf1c6..1ee55bb90335 100644
--- a/browser/ui/webui/settings/brave_wallet_handler_unittest.cc
+++ b/browser/ui/webui/settings/brave_wallet_handler_unittest.cc
@@ -210,7 +210,7 @@ TEST(TestBraveWalletHandler, AddEthereumChain) {
   EXPECT_EQ(handler.GetAllEthCustomChains()[0], chain1.Clone());
 
   const base::Value::Dict& assets_pref =
-      *handler.prefs()->GetValueDict(kBraveWalletUserAssets);
+      handler.prefs()->GetValueDict(kBraveWalletUserAssets);
   const base::Value::List& list =
       *assets_pref.FindListByDottedPath("ethereum.0x999");
   ASSERT_EQ(list.size(), 1u);
diff --git a/browser/widevine/widevine_utils.cc b/browser/widevine/widevine_utils.cc
index 17cbde41b78c..f0f23a493a8f 100644
--- a/browser/widevine/widevine_utils.cc
+++ b/browser/widevine/widevine_utils.cc
@@ -105,7 +105,7 @@ int GetWidevinePermissionRequestTextFrangmentResourceId(bool for_restart) {
 void RequestWidevinePermission(content::WebContents* web_contents,
                                bool for_restart) {
   permissions::PermissionRequestManager::FromWebContents(web_contents)
-      ->AddRequest(web_contents->GetMainFrame(),
+      ->AddRequest(web_contents->GetPrimaryMainFrame(),
                    new WidevinePermissionRequest(web_contents, for_restart));
 }
 
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java
index 4ffcd2d1c316..cab914d14854 100644
--- a/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java
+++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java
@@ -9,7 +9,7 @@
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 import static org.objectweb.asm.Opcodes.ACC_PROTECTED;
 import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ASM5;
+import static org.objectweb.asm.Opcodes.ASM7;
 import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
 import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
 import static org.objectweb.asm.Opcodes.NEW;
@@ -63,7 +63,7 @@ class BraveMethodVisitor extends MethodVisitor {
         private Method mMethod;
 
         public BraveMethodVisitor(Method method, MethodVisitor mv) {
-            super(ASM5, mv);
+            super(ASM7, mv);
             this.mMethod = method;
         }
 
@@ -132,7 +132,7 @@ public void visitTypeInsn(int opcode, String type) {
     private ArrayList<String> mMakeNonFinalClasses = new ArrayList<String>();
 
     public BraveClassVisitor(ClassVisitor visitor) {
-        super(ASM5, null);
+        super(ASM7, null);
         mTarget = visitor;
     }
 
diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js
index 8d819d9d1232..fd995372f1eb 100755
--- a/build/commands/lib/config.js
+++ b/build/commands/lib/config.js
@@ -453,6 +453,13 @@ Config.prototype.buildArgs = function () {
     // We want it to be enabled for all configurations
     args.disable_android_lint = false
 
+    if (this.targetArch === 'arm64') {
+      // TODO: Ideally we should properly compile our rust libraries in order to
+      // be able to use default 'standard' flow integrity. For now just revert
+      // it to 'pac'.
+      args.arm_control_flow_integrity = 'pac'
+    }
+
     // These do not exist on android
     // TODO - recheck
     delete args.enable_nacl
diff --git a/build/ios/mojom/public/base/base_values.mm b/build/ios/mojom/public/base/base_values.mm
index d4d41a3bc48c..cbd5c79b0084 100644
--- a/build/ios/mojom/public/base/base_values.mm
+++ b/build/ios/mojom/public/base/base_values.mm
@@ -268,11 +268,9 @@ @implementation MojoBaseValue (JSON)
 
 - (nullable instancetype)initWithJSONString:(NSString*)json {
   auto string = base::SysNSStringToUTF8(json);
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          string, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                      base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& response = value_with_error.value;
+  absl::optional<base::Value> response = base::JSONReader::Read(
+      string, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                  base::JSONParserOptions::JSON_PARSE_RFC);
   if (response) {
     return [self initWithValue:response->Clone()];
   }
diff --git a/chromium_src/base/notreached.cc b/chromium_src/base/notreached.cc
deleted file mode 100644
index 2ac4e4ced4cf..000000000000
--- a/chromium_src/base/notreached.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "base/notreached.h"
-
-// Xcode's clang doesn't know about #pragma clang max_tokens_here
-#if !defined(ANDROID) && defined(__APPLE__)
-#include <TargetConditionals.h>
-#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-#define NACL_TC_REV 1
-#endif
-#endif
-#include "src/base/notreached.cc"
diff --git a/chromium_src/chrome/app/chrome_main_delegate.cc b/chromium_src/chrome/app/chrome_main_delegate.cc
index fe070b108cd3..146a1e93995b 100644
--- a/chromium_src/chrome/app/chrome_main_delegate.cc
+++ b/chromium_src/chrome/app/chrome_main_delegate.cc
@@ -58,7 +58,7 @@ void AdjustSyncServiceUrlForAndroid(std::string* brave_sync_service_url) {
 // gets called from AdsTabHelper::RunIsolatedJavaScript() (called via the
 // WebContentsObserver machinery), since the JS World ID won't be set yet when
 // dom_distiller::RunIsolatedJavaScript() gets called.
-bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
+absl::optional<int> ChromeMainDelegate::BasicStartupComplete() {
   BraveCommandLineHelper command_line(base::CommandLine::ForCurrentProcess());
   command_line.AppendSwitch(switches::kDisableDomainReliability);
   command_line.AppendSwitch(switches::kEnableDomDistiller);
@@ -112,5 +112,5 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
 
   command_line.AppendFeatures(enabled_features, disabled_features);
 
-  return ChromeMainDelegate::BasicStartupComplete_ChromiumImpl(exit_code);
+  return ChromeMainDelegate::BasicStartupComplete_ChromiumImpl();
 }
diff --git a/chromium_src/chrome/app/chrome_main_delegate.h b/chromium_src/chrome/app/chrome_main_delegate.h
index 21e0a86d5a7d..e1e00616c961 100644
--- a/chromium_src/chrome/app/chrome_main_delegate.h
+++ b/chromium_src/chrome/app/chrome_main_delegate.h
@@ -12,9 +12,9 @@
 
 #define ChromeContentClient BraveContentClient
 
-#define BasicStartupComplete                         \
-  BasicStartupComplete_ChromiumImpl(int* exit_code); \
-  bool BasicStartupComplete
+#define BasicStartupComplete           \
+  BasicStartupComplete_ChromiumImpl(); \
+  absl::optional<int> BasicStartupComplete
 
 #include "src/chrome/app/chrome_main_delegate.h"
 
diff --git a/chromium_src/chrome/browser/browser_features.cc b/chromium_src/chrome/browser/browser_features.cc
index 113b926f4630..70a5d241107c 100644
--- a/chromium_src/chrome/browser/browser_features.cc
+++ b/chromium_src/chrome/browser/browser_features.cc
@@ -10,6 +10,9 @@
 namespace features {
 
 OVERRIDE_FEATURE_DEFAULT_STATES({{
+#if BUILDFLAG(IS_WIN)
+    {kAppBoundEncryptionMetrics, base::FEATURE_DISABLED_BY_DEFAULT},
+#endif
 #if !BUILDFLAG(IS_ANDROID)
     {kCopyLinkToText, base::FEATURE_DISABLED_BY_DEFAULT},
 #endif
diff --git a/chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc b/chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
index bad03c249f61..d0274208be0b 100644
--- a/chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
+++ b/chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "src/chrome/browser/extensions/component_extensions_allowlist/allowlist.h"
+#include "chrome/browser/extensions/component_extensions_allowlist/allowlist.h"
 
 #define IsComponentExtensionAllowlisted IsComponentExtensionAllowlisted_ChromiumImpl  // NOLINT
 #include "src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc"
diff --git a/chromium_src/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_features.cc b/chromium_src/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_features.cc
new file mode 100644
index 000000000000..4c3560233969
--- /dev/null
+++ b/chromium_src/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_features.cc
@@ -0,0 +1,16 @@
+/* Copyright (c) 2022 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#include "src/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_features.cc"
+
+#include "base/feature_override.h"
+
+namespace features {
+
+OVERRIDE_FEATURE_DEFAULT_STATES({{
+    {kIsolatePrerenders, base::FEATURE_DISABLED_BY_DEFAULT},
+}});
+
+}  // namespace features
diff --git a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_service_unittest.cc b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_service_unittest.cc
index 1093980c6aae..ff0ddc3896e5 100644
--- a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_service_unittest.cc
+++ b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_service_unittest.cc
@@ -82,8 +82,7 @@ class PrivacySandboxServiceTest : public testing::Test {
     privacy_sandbox_service_ = std::make_unique<PrivacySandboxService>(
         PrivacySandboxSettingsFactory::GetForProfile(profile()),
         CookieSettingsFactory::GetForProfile(profile()).get(),
-        profile()->GetPrefs(), policy_service(), sync_service(),
-        identity_test_env()->identity_manager(), test_interest_group_manager(),
+        profile()->GetPrefs(), test_interest_group_manager(),
         profile_metrics::BrowserProfileType::kRegular, browsing_data_remover(),
 #if !BUILDFLAG(IS_ANDROID)
         mock_sentiment_service(),
diff --git a/chromium_src/chrome/browser/profiles/profile_avatar_icon_util.cc b/chromium_src/chrome/browser/profiles/profile_avatar_icon_util.cc
index a232f3450f12..69b0d54700cc 100644
--- a/chromium_src/chrome/browser/profiles/profile_avatar_icon_util.cc
+++ b/chromium_src/chrome/browser/profiles/profile_avatar_icon_util.cc
@@ -187,10 +187,9 @@ gfx::Image GetPlaceholderAvatarIconWithColors(SkColor fill_color,
 // GetPlaceholderAvatarIconWithColors function above which is used in this
 // function. Also, changes the label from "Default Avatar" to our placeholder
 // avatar name.
-base::flat_map<std::string, base::Value> GetDefaultProfileAvatarIconAndLabel(
-    SkColor fill_color,
-    SkColor stroke_color,
-    bool selected) {
+base::Value::Dict GetDefaultProfileAvatarIconAndLabel(SkColor fill_color,
+                                                      SkColor stroke_color,
+                                                      bool selected) {
   gfx::Image icon = profiles::GetPlaceholderAvatarIconWithColors(
       fill_color, stroke_color, kAvatarIconSize);
   size_t index = profiles::GetPlaceholderAvatarIndex();
diff --git a/chromium_src/chrome/browser/profiles/profile_avatar_icon_util_unittest.cc b/chromium_src/chrome/browser/profiles/profile_avatar_icon_util_unittest.cc
index b3e7da40da90..0be5ac568a6e 100644
--- a/chromium_src/chrome/browser/profiles/profile_avatar_icon_util_unittest.cc
+++ b/chromium_src/chrome/browser/profiles/profile_avatar_icon_util_unittest.cc
@@ -23,8 +23,7 @@ TEST(ProfileUtilTest, KeepChromiumChoice) {
 
 TEST(ProfileUtilTest, BraveAvatarIconChoices) {
   // Test that the avatar icon choices presented to the user are brave's.
-  std::vector<base::Value> avatars(
-      profiles::GetCustomProfileAvatarIconsAndLabels(0));
+  base::Value::List avatars = profiles::GetCustomProfileAvatarIconsAndLabels(0);
 
   const size_t expected_selectable_avatar_count =
       profiles::kBraveDefaultAvatarIconsCount;
diff --git a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 1e07ab743cf5..a5ae080652da 100644
--- a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -314,19 +314,19 @@ void BraveRenderViewContextMenu::SeIpfsIconAt(int index) {
 void BraveRenderViewContextMenu::BuildIPFSMenu() {
   if (!ipfs::IsIpfsMenuEnabled(GetProfile()->GetPrefs()))
     return;
-  int index =
+  absl::optional<size_t> index =
       menu_model_.GetIndexOfCommandId(IDC_CONTENT_CONTEXT_INSPECTELEMENT);
-  if (index == -1)
+  if (!index.has_value())
     return;
   if (!params_.selection_text.empty() &&
       params_.media_type == ContextMenuDataMediaType::kNone) {
-    menu_model_.InsertSeparatorAt(index,
+    menu_model_.InsertSeparatorAt(index.value(),
                                   ui::MenuSeparatorType::NORMAL_SEPARATOR);
 
     menu_model_.InsertItemWithStringIdAt(
-        index, IDC_CONTENT_CONTEXT_IMPORT_SELECTED_TEXT_IPFS,
+        index.value(), IDC_CONTENT_CONTEXT_IMPORT_SELECTED_TEXT_IPFS,
         IDS_CONTENT_CONTEXT_IMPORT_IPFS_SELECTED_TEXT);
-    SeIpfsIconAt(index);
+    SeIpfsIconAt(index.value());
     return;
   }
 
@@ -362,23 +362,22 @@ void BraveRenderViewContextMenu::BuildIPFSMenu() {
   }
   if (!ipfs_submenu_model_.GetItemCount())
     return;
-  menu_model_.InsertSeparatorAt(index, ui::MenuSeparatorType::NORMAL_SEPARATOR);
+  menu_model_.InsertSeparatorAt(index.value(),
+                                ui::MenuSeparatorType::NORMAL_SEPARATOR);
   menu_model_.InsertSubMenuWithStringIdAt(
-      index, IDC_CONTENT_CONTEXT_IMPORT_IPFS, IDS_CONTENT_CONTEXT_IMPORT_IPFS,
-      &ipfs_submenu_model_);
-  SeIpfsIconAt(index);
+      index.value(), IDC_CONTENT_CONTEXT_IMPORT_IPFS,
+      IDS_CONTENT_CONTEXT_IMPORT_IPFS, &ipfs_submenu_model_);
+  SeIpfsIconAt(index.value());
 }
 #endif
 
 void BraveRenderViewContextMenu::InitMenu() {
   RenderViewContextMenu_Chromium::InitMenu();
 
-  int index = -1;
-
-  index = menu_model_.GetIndexOfCommandId(
+  absl::optional<size_t> index = menu_model_.GetIndexOfCommandId(
       IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE);
-  if (index != -1) {
-    menu_model_.InsertItemWithStringIdAt(index + 1,
+  if (index.has_value()) {
+    menu_model_.InsertItemWithStringIdAt(index.value() + 1,
                                          IDC_CONTENT_CONTEXT_FORCE_PASTE,
                                          IDS_CONTENT_CONTEXT_FORCE_PASTE);
   }
@@ -393,11 +392,10 @@ void BraveRenderViewContextMenu::InitMenu() {
 
     index = menu_model_.GetIndexOfCommandId(
         IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD);
-    DCHECK_NE(index, -1);
+    DCHECK(index.has_value());
 
     menu_model_.InsertItemWithStringIdAt(
-        index + 1,
-        IDC_CONTENT_CONTEXT_OPENLINKTOR,
+        index.value() + 1, IDC_CONTENT_CONTEXT_OPENLINKTOR,
         is_app ? IDS_CONTENT_CONTEXT_OPENLINKTOR_INAPP
                : IDS_CONTENT_CONTEXT_OPENLINKTOR);
   }
@@ -419,7 +417,7 @@ void BraveRenderViewContextMenu::InitMenu() {
   // separator is removed in |BraveRenderViewContextMenuViews::Show|
   if (remove_translate) {
     index = menu_model_.GetIndexOfCommandId(IDC_CONTENT_CONTEXT_TRANSLATE);
-    if (index != -1)
-      menu_model_.RemoveItemAt(index);
+    if (index.has_value())
+      menu_model_.RemoveItemAt(index.value());
   }
 }
diff --git a/chromium_src/chrome/browser/themes/theme_helper.h b/chromium_src/chrome/browser/themes/theme_helper.h
deleted file mode 100644
index 3328edcad37c..000000000000
--- a/chromium_src/chrome/browser/themes/theme_helper.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_THEMES_THEME_HELPER_H_
-#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_THEMES_THEME_HELPER_H_
-
-#define BRAVE_THEME_HELPER_H_    \
- private:                        \
-  friend class BraveThemeHelper; \
-                                 \
- public:
-#define GetOmniboxColor virtual GetOmniboxColor
-#include "src/chrome/browser/themes/theme_helper.h"
-#undef GetOmniboxColor
-#undef BRAVE_THEME_HELPER_H_
-
-#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_THEMES_THEME_HELPER_H_
diff --git a/chromium_src/chrome/browser/themes/theme_helper_win.h b/chromium_src/chrome/browser/themes/theme_helper_win.h
deleted file mode 100644
index f7e9fdd4960a..000000000000
--- a/chromium_src/chrome/browser/themes/theme_helper_win.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_THEMES_THEME_HELPER_WIN_H_
-#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_THEMES_THEME_HELPER_WIN_H_
-
-#include "brave/browser/themes/brave_theme_helper.h"
-
-#undef ThemeHelper
-#define ThemeHelper BraveThemeHelper
-
-#define BRAVE_THEME_HELPER_WIN_H_   \
- private:                           \
-  friend class BraveThemeHelperWin; \
-                                    \
- public:
-#include "src/chrome/browser/themes/theme_helper_win.h"
-
-#undef BRAVE_THEME_HELPER_WIN_H_
-#undef ThemeHelper
-#define ThemeHelper ThemeHelper
-
-#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_THEMES_THEME_HELPER_WIN_H_
diff --git a/chromium_src/chrome/browser/ui/bookmarks/brave_bookmark_context_menu_controller_unittest.cc b/chromium_src/chrome/browser/ui/bookmarks/brave_bookmark_context_menu_controller_unittest.cc
index 6a47376964ae..09c0318fba08 100644
--- a/chromium_src/chrome/browser/ui/bookmarks/brave_bookmark_context_menu_controller_unittest.cc
+++ b/chromium_src/chrome/browser/ui/bookmarks/brave_bookmark_context_menu_controller_unittest.cc
@@ -67,29 +67,29 @@ TEST_F(BraveBookmarkContextMenuControllerTest,
       profile_->GetTestingPrefService();
   EXPECT_FALSE(prefs->IsManagedPreference(
       bookmarks::prefs::kShowAppsShortcutInBookmarkBar));
-  EXPECT_EQ(controller.menu_model()->GetIndexOfCommandId(
-                IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT),
-            -1);
+  EXPECT_FALSE(controller.menu_model()
+                   ->GetIndexOfCommandId(IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT)
+                   .has_value());
 
   // Disabling the shorcut by policy doesn't cause the command to be added.
   prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
                         std::make_unique<base::Value>(false));
-  EXPECT_EQ(controller.menu_model()->GetIndexOfCommandId(
-                IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT),
-            -1);
+  EXPECT_FALSE(controller.menu_model()
+                   ->GetIndexOfCommandId(IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT)
+                   .has_value());
 
   // And enabling the shortcut by policy doesn't cause the command to be added.
   prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
                         std::make_unique<base::Value>(true));
-  EXPECT_EQ(controller.menu_model()->GetIndexOfCommandId(
-                IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT),
-            -1);
+  EXPECT_FALSE(controller.menu_model()
+                   ->GetIndexOfCommandId(IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT)
+                   .has_value());
 
   // And enabling the shortcut by user doesn't cause the command to be added.
   prefs->RemoveManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar);
   prefs->SetUserPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
                  std::make_unique<base::Value>(true));
-  EXPECT_EQ(controller.menu_model()->GetIndexOfCommandId(
-                IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT),
-            -1);
+  EXPECT_FALSE(controller.menu_model()
+                   ->GetIndexOfCommandId(IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT)
+                   .has_value());
 }
diff --git a/chromium_src/chrome/browser/ui/color/chrome_color_mixer.cc b/chromium_src/chrome/browser/ui/color/chrome_color_mixer.cc
index 1a2101064486..13a57a61feea 100644
--- a/chromium_src/chrome/browser/ui/color/chrome_color_mixer.cc
+++ b/chromium_src/chrome/browser/ui/color/chrome_color_mixer.cc
@@ -15,13 +15,11 @@ namespace {
 
 void AddBraveColorMixer(ui::ColorProvider* provider,
                         const ui::ColorProviderManager::Key& key) {
-  // Apply brave theme when there is no custom theme.
-  if (key.custom_theme)
-    return;
-
+#if !BUILDFLAG(IS_ANDROID)
   key.color_mode == ui::ColorProviderManager::ColorMode::kDark
       ? AddBraveDarkThemeColorMixer(provider, key)
       : AddBraveLightThemeColorMixer(provider, key);
+#endif  // #if !BUILDFLAG(IS_ANDROID)
 }
 
 }  // namespace
diff --git a/chromium_src/chrome/browser/ui/color/omnibox_color_mixer.cc b/chromium_src/chrome/browser/ui/color/omnibox_color_mixer.cc
new file mode 100644
index 000000000000..606f2d6e3bf9
--- /dev/null
+++ b/chromium_src/chrome/browser/ui/color/omnibox_color_mixer.cc
@@ -0,0 +1,34 @@
+/* Copyright (c) 2022 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "chrome/browser/ui/color/omnibox_color_mixer.h"
+
+#include "brave/browser/ui/color/brave_color_mixer.h"
+
+#define AddOmniboxColorMixer AddOmniboxColorMixer_ChromiumImpl
+#include "src/chrome/browser/ui/color/omnibox_color_mixer.cc"
+#undef AddOmniboxColorMixer
+
+namespace {
+
+void AddBraveOmniboxColorMixer(ui::ColorProvider* provider,
+                               const ui::ColorProviderManager::Key& key) {
+  // Apply brave theme when there is no custom theme.
+  if (key.custom_theme)
+    return;
+#if !BUILDFLAG(IS_ANDROID)
+  key.color_mode == ui::ColorProviderManager::ColorMode::kDark
+      ? AddBraveOmniboxDarkThemeColorMixer(provider, key)
+      : AddBraveOmniboxLightThemeColorMixer(provider, key);
+#endif  // #if !BUILDFLAG(IS_ANDROID)
+}
+
+}  // namespace
+
+void AddOmniboxColorMixer(ui::ColorProvider* provider,
+                          const ui::ColorProviderManager::Key& key) {
+  AddOmniboxColorMixer_ChromiumImpl(provider, key);
+  AddBraveOmniboxColorMixer(provider, key);
+}
diff --git a/chromium_src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chromium_src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
index e11b7e56326f..bdc47da2717f 100644
--- a/chromium_src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
+++ b/chromium_src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
@@ -19,7 +19,7 @@
 // Need to expect more items at that place, because Brave has additional item
 // `More...` which redirects to brave://history/syncedTabs
 #define BRAVE_MAX_TABS_PER_SESSION_AND_RECENCY \
-  EXPECT_EQ(10, model.GetItemCount());
+  EXPECT_EQ(10u, model.GetItemCount());
 
 // The case when number of tabs on other device is <=4 so we do not add
 // `More...` item is tested by RecentTabsSubMenuModelTest.MaxSessionsAndRecency
diff --git a/chromium_src/chrome/browser/ui/views/frame/browser_view.cc b/chromium_src/chrome/browser/ui/views/frame/browser_view.cc
index f41e3fc16bb5..99cdfb5e69c4 100644
--- a/chromium_src/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chromium_src/chrome/browser/ui/views/frame/browser_view.cc
@@ -12,6 +12,7 @@
 #include "brave/browser/ui/views/tabs/brave_browser_tab_strip_controller.h"
 #include "brave/browser/ui/views/tabs/brave_tab_strip.h"
 #include "brave/browser/ui/views/toolbar/brave_toolbar_view.h"
+#include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/frame/tab_strip_region_view.h"
 #include "chrome/browser/ui/views/side_panel/side_panel.h"
 
diff --git a/chromium_src/chrome/browser/ui/views/frame/browser_view_layout.cc b/chromium_src/chrome/browser/ui/views/frame/browser_view_layout.cc
new file mode 100644
index 000000000000..63983fe5787c
--- /dev/null
+++ b/chromium_src/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -0,0 +1,15 @@
+// Copyright (c) 2022 The Brave Authors. All rights reserved.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// you can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include "chrome/browser/ui/views/frame/browser_view_layout.h"
+
+#include "brave/browser/ui/views/side_panel/brave_side_panel.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/side_panel/side_panel.h"
+#include "chrome/browser/ui/views/side_search/side_search_browser_controller.h"
+
+#define SidePanel BraveSidePanel
+#include "src/chrome/browser/ui/views/frame/browser_view_layout.cc"
+#undef SidePanel
diff --git a/chromium_src/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc b/chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc
similarity index 97%
rename from chromium_src/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc
rename to chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc
index 044bea24089f..ab7b1a9a0e9a 100644
--- a/chromium_src/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc
+++ b/chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc
@@ -81,7 +81,7 @@ Browser* FindBrowserAndAdjustBubbleForBraveWalletPanel(
       browser->tab_strip_model()->GetActiveWebContents
 
 #define BubbleDialogDelegateView BraveBubbleDialogDelegateView
-#include "src/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc"
+#include "src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc"
 #undef BubbleDialogDelegateView
 #undef GetActiveWebContents
 #undef FindBrowserWithWebContents
diff --git a/chromium_src/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc b/chromium_src/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc
similarity index 97%
rename from chromium_src/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
rename to chromium_src/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc
index 9f810e97aa0d..a74e609a329c 100644
--- a/chromium_src/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
+++ b/chromium_src/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc
@@ -186,15 +186,16 @@ class PermissionLifetimeCombobox : public views::Combobox,
       delete;
 
   // ui::ComboboxModel:
-  int GetItemCount() const override { return lifetime_options_.size(); }
+  size_t GetItemCount() const override { return lifetime_options_.size(); }
 
-  std::u16string GetItemAt(int index) const override {
+  std::u16string GetItemAt(size_t index) const override {
     return lifetime_options_[index].label;
   }
 
  private:
   void OnItemSelected() {
-    SetRequestsLifetime(lifetime_options_, GetSelectedIndex(), delegate_);
+    SetRequestsLifetime(lifetime_options_, GetSelectedIndex().value(),
+                        delegate_);
   }
 
   permissions::PermissionPrompt::Delegate* const delegate_;
@@ -282,6 +283,6 @@ void AddFootnoteViewIfNeeded(
 // undef upstream one first then define it with our one.
 #undef IDS_PERMISSIONS_BUBBLE_PROMPT
 #define IDS_PERMISSIONS_BUBBLE_PROMPT IDS_BRAVE_PERMISSIONS_BUBBLE_PROMPT
-#include "src/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc"
+#include "src/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc"
 #undef BRAVE_PERMISSION_PROMPT_BUBBLE_VIEW
 #undef IDS_PERMISSIONS_BUBBLE_PROMPT
diff --git a/chromium_src/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc b/chromium_src/chrome/browser/ui/views/permissions/permission_prompt_factory.cc
similarity index 86%
rename from chromium_src/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
rename to chromium_src/chrome/browser/ui/views/permissions/permission_prompt_factory.cc
index f0b65c3e4bf2..3e6b50bb6428 100644
--- a/chromium_src/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
+++ b/chromium_src/chrome/browser/ui/views/permissions/permission_prompt_factory.cc
@@ -1,10 +1,8 @@
-/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+/* Copyright (c) 2022 The Brave Authors. All rights reserved.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "chrome/browser/ui/views/permission_bubble/permission_prompt_impl.h"
-
 #include "chrome/browser/ui/permission_bubble/permission_prompt.h"
 #include "components/permissions/request_type.h"
 
@@ -13,7 +11,7 @@
 #endif
 
 #define CreatePermissionPrompt CreatePermissionPrompt_ChromiumImpl
-#include "src/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc"
+#include "src/chrome/browser/ui/views/permissions/permission_prompt_factory.cc"
 #undef CreatePermissionPrompt
 
 std::unique_ptr<permissions::PermissionPrompt> CreatePermissionPrompt(
diff --git a/chromium_src/chrome/browser/ui/views/side_panel/side_panel_coordinator_unittest.cc b/chromium_src/chrome/browser/ui/views/side_panel/side_panel_coordinator_unittest.cc
new file mode 100644
index 000000000000..ebc81b3e8da7
--- /dev/null
+++ b/chromium_src/chrome/browser/ui/views/side_panel/side_panel_coordinator_unittest.cc
@@ -0,0 +1,15 @@
+// Copyright (c) 2022 The Brave Authors. All rights reserved.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// you can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include "chrome/browser/ui/views/side_panel/side_panel_coordinator.h"
+
+#include "brave/browser/ui/views/side_panel/brave_side_panel.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/side_panel/side_panel.h"
+#include "chrome/browser/ui/views/side_search/side_search_browser_controller.h"
+
+#define SidePanel BraveSidePanel
+#include "src/chrome/browser/ui/views/side_panel/side_panel_coordinator_unittest.cc"
+#undef SidePanel
diff --git a/chromium_src/chrome/browser/ui/webui/settings/search_engines_handler.h b/chromium_src/chrome/browser/ui/webui/settings/search_engines_handler.h
index fc1f1ea14a09..872bd050c2d7 100644
--- a/chromium_src/chrome/browser/ui/webui/settings/search_engines_handler.h
+++ b/chromium_src/chrome/browser/ui/webui/settings/search_engines_handler.h
@@ -8,10 +8,10 @@
 
 #include <memory>
 
-#define GetSearchEnginesList                         \
-  GetSearchEnginesList_NotUsed() { return nullptr; } \
-  friend class BraveSearchEnginesHandler;            \
-  virtual std::unique_ptr<base::DictionaryValue> GetSearchEnginesList
+#define GetSearchEnginesList                    \
+  GetSearchEnginesList_NotUsed() { return {}; } \
+  friend class BraveSearchEnginesHandler;       \
+  virtual base::Value::Dict GetSearchEnginesList
 
 #include "src/chrome/browser/ui/webui/settings/search_engines_handler.h"
 
diff --git a/chromium_src/chrome/common/chrome_features.cc b/chromium_src/chrome/common/chrome_features.cc
index f7753740e4a5..6e8247decad6 100644
--- a/chromium_src/chrome/common/chrome_features.cc
+++ b/chromium_src/chrome/common/chrome_features.cc
@@ -15,7 +15,6 @@ namespace features {
 
 OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kOmniboxTriggerForNoStatePrefetch, base::FEATURE_DISABLED_BY_DEFAULT},
-    {kPrivacyGuide, base::FEATURE_DISABLED_BY_DEFAULT},
     {kPrivacyGuide2, base::FEATURE_DISABLED_BY_DEFAULT},
     {kSCTAuditing, base::FEATURE_DISABLED_BY_DEFAULT},
 #if !BUILDFLAG(IS_ANDROID)
diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc
index a085f08ece37..8326fde56bad 100644
--- a/chromium_src/chrome/common/url_constants.cc
+++ b/chromium_src/chrome/common/url_constants.cc
@@ -56,6 +56,8 @@ const char kChromeHelpViaMenuURL[] =
 const char kChromeHelpViaWebUIURL[] =
     "https://support.brave.com/";
 
+const char kIsolatedAppScheme[] = "isolated-app";
+
 const char kChromeNativeScheme[] = "chrome-native";
 
 const char kChromeSearchLocalNtpHost[] = "local-ntp";
@@ -202,6 +204,9 @@ const char kSyncGoogleDashboardURL[] =
 const char kSyncLearnMoreURL[] =
     "https://support.brave.com/";
 
+const char kSigninInterceptManagedDisclaimerLearnMoreURL[] =
+    "https://support.brave.com/";
+
 #if !BUILDFLAG(IS_ANDROID)
 const char kSyncTrustedVaultOptInURL[] = "https://support.brave.com/";
 #endif
@@ -255,4 +260,11 @@ const char kChromeAppsDeprecationLearnMoreURL[] =
     "https://support.google.com/chrome/?p=chrome_app_deprecation";
 #endif
 
+#if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED)
+// TODO(b/1339340): add help center link when help center link is created.
+const char kChromeRootStoreSettingsHelpCenterURL[] =
+    "https://chromium.googlesource.com/chromium/src/+/main/net/data/ssl/"
+    "chrome_root_store/root_store.md";
+#endif
+
 }  // namespace chrome
diff --git a/chromium_src/chrome/install_static/chromium_install_modes.cc b/chromium_src/chrome/install_static/chromium_install_modes.cc
index 45ca84bb37e1..f9f11bd648d0 100644
--- a/chromium_src/chrome/install_static/chromium_install_modes.cc
+++ b/chromium_src/chrome/install_static/chromium_install_modes.cc
@@ -7,8 +7,8 @@
 
 #include <stdlib.h>
 
-#include "chrome/common/chrome_icon_resources_win.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/common/chrome_icon_resources_win.h"
 #include "chrome/install_static/install_modes.h"
 
 namespace install_static {
@@ -25,199 +25,247 @@ const size_t kProductPathNameLength = _countof(kProductPathName) - 1;
 
 const char kSafeBrowsingName[] = "chromium";
 
-const char kDeviceManagementServerHostName[] = "";
-
 #if defined(OFFICIAL_BUILD)
 // Regarding to install switch, use same value in
 // chrome/installer/mini_installer/configuration.cc
 const InstallConstants kInstallModes[] = {
     // The primary install mode for stable Brave.
     {
-        sizeof(kInstallModes[0]),
-        STABLE_INDEX,  // The first mode is for stable/beta/dev.
-        "",            // No install switch for the primary install mode.
-        L"",           // Empty install_suffix for the primary install mode.
-        L"",           // No logo suffix for the primary install mode.
-        L"{AFE6A462-C574-4B8A-AF43-4CC60DF4563B}",
-        L"Brave",                                   // A distinct base_app_name.
-        L"Brave",                                   // A distinct base_app_id.
-        L"BraveHTML",                               // ProgID prefix.
-        L"Brave HTML Document",                     // ProgID description.
-        L"{AFE6A462-C574-4B8A-AF43-4CC60DF4563B}",  // Active Setup GUID.
-        L"{B1C5AAC5-2B7C-4C9D-9E96-774C53151B20}",  // CommandExecuteImpl CLSID.
-        {0x6c9646d,
-         0x2807,
-         0x44c0,
-         {0x97, 0xd2, 0x6d, 0xa0, 0xdb, 0x62, 0x3d,
-          0xb4}},  // Toast activator CLSID.
-        {0x576b31af,
-         0x6369,
-         0x4b6b,
-         {0x85, 0x60, 0xe4, 0xb2, 0x3, 0xa9, 0x7a, 0x8b}},  // Elevator CLSID.
-        {0xb7965c30,
-         0x7d58,
-         0x4d86,
-         {0x9e, 0x18, 0x47, 0x94, 0x25, 0x64, 0x9, 0xee}},
-        L"",  // The empty string means "stable".
-        ChannelStrategy::FLOATING,
-        true,  // Supports system-level installs.
-        true,  // Supports in-product set as default browser UX.
-        true,  // Supports retention experiments.
-        icon_resources::kApplicationIndex,  // App icon resource index.
-        IDR_MAINFRAME,                      // App icon resource id.
-        L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
-        L"934012149-",  // App container sid prefix for sandbox.
+        .size = sizeof(kInstallModes[0]),
+        .index = STABLE_INDEX,  // The first mode is for stable/beta/dev.
+        .install_switch =
+            "",  // No install switch for the primary install mode.
+        .install_suffix =
+            L"",  // Empty install_suffix for the primary install mode.
+        .logo_suffix = L"",  // No logo suffix for the primary install mode.
+        .app_guid = L"{AFE6A462-C574-4B8A-AF43-4CC60DF4563B}",
+        .base_app_name = L"Brave",       // A distinct base_app_name.
+        .base_app_id = L"Brave",         // A distinct base_app_id.
+        .prog_id_prefix = L"BraveHTML",  // ProgID prefix.
+        .prog_id_description = L"Brave HTML Document",  // ProgID description.
+        .active_setup_guid =
+            L"{AFE6A462-C574-4B8A-AF43-4CC60DF4563B}",  // Active Setup GUID.
+        .legacy_command_execute_clsid =
+            L"{B1C5AAC5-2B7C-4C9D-9E96-774C53151B20}",  // CommandExecuteImpl
+                                                        // CLSID.
+        .toast_activator_clsid = {0x6c9646d,
+                                  0x2807,
+                                  0x44c0,
+                                  {0x97, 0xd2, 0x6d, 0xa0, 0xdb, 0x62, 0x3d,
+                                   0xb4}},  // Toast activator CLSID.
+        .elevator_clsid = {0x576b31af,
+                           0x6369,
+                           0x4b6b,
+                           {0x85, 0x60, 0xe4, 0xb2, 0x3, 0xa9, 0x7a,
+                            0x8b}},  // Elevator CLSID.
+        .elevator_iid = {0xb7965c30,
+                         0x7d58,
+                         0x4d86,
+                         {0x9e, 0x18, 0x47, 0x94, 0x25, 0x64, 0x9, 0xee}},
+        .default_channel_name = L"",  // The empty string means "stable".
+        .channel_strategy = ChannelStrategy::FLOATING,
+        .supports_system_level = true,  // Supports system-level installs.
+        .supports_set_as_default_browser =
+            true,  // Supports in-product set as default browser UX.
+        .supports_retention_experiments =
+            true,  // Supports retention experiments.
+        .app_icon_resource_index =
+            icon_resources::kApplicationIndex,  // App icon resource index.
+        .app_icon_resource_id = IDR_MAINFRAME,  // App icon resource id.
+        .sandbox_sid_prefix =
+            L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
+            L"934012149-",  // App container sid prefix for sandbox.
     },
     // A secondary install mode for Brave Beta
     {
-        sizeof(kInstallModes[0]),
-        BETA_INDEX,     // The mode for the side-by-side beta channel.
-        "chrome-beta",  // Install switch.
-        L"-Beta",       // Install suffix.
-        L"Beta",        // Logo suffix.
-        L"{103BD053-949B-43A8-9120-2E424887DE11}",  // A distinct app GUID.
-        L"Brave Beta",                              // A distinct base_app_name.
-        L"BraveBeta",                               // A distinct base_app_id.
-        L"BraveBHTML",                              // ProgID prefix.
-        L"Brave Beta HTML Document",                // ProgID description.
-        L"{103BD053-949B-43A8-9120-2E424887DE11}",  // Active Setup GUID.
-        L"",                                        // CommandExecuteImpl CLSID.
-        {0x9560028d,
-         0xcca,
-         0x49f0,
-         {0x8d, 0x47, 0xef, 0x22, 0xbb, 0xc4, 0xb,
-          0xa7}},  // Toast activator CLSID.
-        {0x2313f1cd,
-         0x41f3,
-         0x4347,
-         {0xbe, 0xc0, 0xd7, 0x22, 0xca, 0x41, 0x2c, 0x75}},  // Elevator CLSID.
-        {0xd9d7b102,
-         0xfc8a,
-         0x4843,
-         {0xac, 0x35, 0x1e, 0xbc, 0xc7, 0xed, 0x12, 0x3d}},
-        L"beta",  // Forced channel name.
-        ChannelStrategy::FIXED,
-        true,  // Supports system-level installs.
-        true,  // Supports in-product set as default browser UX.
-        true,  // Supports retention experiments.
-        icon_resources::kBetaApplicationIndex,  // App icon resource index.
-        IDR_X005_BETA,                          // App icon resource id.
-        L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
-        L"934012150-",  // App container sid prefix for sandbox.
+        .size = sizeof(kInstallModes[0]),
+        .index = BETA_INDEX,  // The mode for the side-by-side beta channel.
+        .install_switch = "chrome-beta",  // Install switch.
+        .install_suffix = L"-Beta",       // Install suffix.
+        .logo_suffix = L"Beta",           // Logo suffix.
+        .app_guid =
+            L"{103BD053-949B-43A8-9120-2E424887DE11}",  // A distinct app GUID.
+        .base_app_name = L"Brave Beta",   // A distinct base_app_name.
+        .base_app_id = L"BraveBeta",      // A distinct base_app_id.
+        .prog_id_prefix = L"BraveBHTML",  // ProgID prefix.
+        .prog_id_description =
+            L"Brave Beta HTML Document",  // ProgID description.
+        .active_setup_guid =
+            L"{103BD053-949B-43A8-9120-2E424887DE11}",  // Active Setup GUID.
+        .legacy_command_execute_clsid = L"",  // CommandExecuteImpl CLSID.
+        .toast_activator_clsid = {0x9560028d,
+                                  0xcca,
+                                  0x49f0,
+                                  {0x8d, 0x47, 0xef, 0x22, 0xbb, 0xc4, 0xb,
+                                   0xa7}},  // Toast activator CLSID.
+        .elevator_clsid = {0x2313f1cd,
+                           0x41f3,
+                           0x4347,
+                           {0xbe, 0xc0, 0xd7, 0x22, 0xca, 0x41, 0x2c,
+                            0x75}},  // Elevator CLSID.
+        .elevator_iid = {0xd9d7b102,
+                         0xfc8a,
+                         0x4843,
+                         {0xac, 0x35, 0x1e, 0xbc, 0xc7, 0xed, 0x12, 0x3d}},
+        .default_channel_name = L"beta",  // Forced channel name.
+        .channel_strategy = ChannelStrategy::FIXED,
+        .supports_system_level = true,  // Supports system-level installs.
+        .supports_set_as_default_browser =
+            true,  // Supports in-product set as default browser UX.
+        .supports_retention_experiments =
+            true,  // Supports retention experiments.
+        .app_icon_resource_index =
+            icon_resources::kBetaApplicationIndex,  // App icon resource index.
+        .app_icon_resource_id = IDR_X005_BETA,      // App icon resource id.
+        .sandbox_sid_prefix =
+            L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
+            L"934012150-",  // App container sid prefix for sandbox.
     },
     // A secondary install mode for Brave Dev
     {
-        sizeof(kInstallModes[0]),
-        DEV_INDEX,     // The mode for the side-by-side dev channel.
-        "chrome-dev",  // Install switch.
-        L"-Dev",       // Install suffix.
-        L"Dev",        // Logo suffix.
-        L"{CB2150F2-595F-4633-891A-E39720CE0531}",  // A distinct app GUID.
-        L"Brave Dev",                               // A distinct base_app_name.
-        L"BraveDev",                                // A distinct base_app_id.
-        L"BraveDHTML",                              // ProgID prefix.
-        L"Brave Dev HTML Document",                 // ProgID description.
-        L"{CB2150F2-595F-4633-891A-E39720CE0531}",  // Active Setup GUID.
-        L"",                                        // CommandExecuteImpl CLSID.
-        {0x20b22981,
-         0xf63a,
-         0x47a6,
-         {0xa5, 0x47, 0x69, 0x1c, 0xc9, 0x4c, 0xae,
-          0xe0}},  // Toast activator CLSID.
-        {0x9129ed6a,
-         0x11d3,
-         0x43b7,
-         {0xb7, 0x18, 0x8f, 0x82, 0x61, 0x45, 0x97, 0xa3}},  // Elevator CLSID.
-        {0x9cf6868c,
-         0x8c9f,
-         0x4220,
-         {0x95, 0xbe, 0x13, 0x99, 0x9d, 0xd9, 0x9b, 0x48}},
-        L"dev",  // Forced channel name.
-        ChannelStrategy::FIXED,
-        true,  // Supports system-level installs.
-        true,  // Supports in-product set as default browser UX.
-        true,  // Supports retention experiments.
-        icon_resources::kDevApplicationIndex,  // App icon resource index.
-        IDR_X004_DEV,                          // App icon resource id.
-        L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
-        L"934012151-",  // App container sid prefix for sandbox.
+        .size = sizeof(kInstallModes[0]),
+        .index = DEV_INDEX,  // The mode for the side-by-side dev channel.
+        .install_switch = "chrome-dev",  // Install switch.
+        .install_suffix = L"-Dev",       // Install suffix.
+        .logo_suffix = L"Dev",           // Logo suffix.
+        .app_guid =
+            L"{CB2150F2-595F-4633-891A-E39720CE0531}",  // A distinct app GUID.
+        .base_app_name = L"Brave Dev",    // A distinct base_app_name.
+        .base_app_id = L"BraveDev",       // A distinct base_app_id.
+        .prog_id_prefix = L"BraveDHTML",  // ProgID prefix.
+        .prog_id_description =
+            L"Brave Dev HTML Document",  // ProgID description.
+        .active_setup_guid =
+            L"{CB2150F2-595F-4633-891A-E39720CE0531}",  // Active Setup GUID.
+        .legacy_command_execute_clsid = L"",  // CommandExecuteImpl CLSID.
+        .toast_activator_clsid = {0x20b22981,
+                                  0xf63a,
+                                  0x47a6,
+                                  {0xa5, 0x47, 0x69, 0x1c, 0xc9, 0x4c, 0xae,
+                                   0xe0}},  // Toast activator CLSID.
+        .elevator_clsid = {0x9129ed6a,
+                           0x11d3,
+                           0x43b7,
+                           {0xb7, 0x18, 0x8f, 0x82, 0x61, 0x45, 0x97,
+                            0xa3}},  // Elevator CLSID.
+        .elevator_iid = {0x9cf6868c,
+                         0x8c9f,
+                         0x4220,
+                         {0x95, 0xbe, 0x13, 0x99, 0x9d, 0xd9, 0x9b, 0x48}},
+        .default_channel_name = L"dev",  // Forced channel name.
+        .channel_strategy = ChannelStrategy::FIXED,
+        .supports_system_level = true,  // Supports system-level installs.
+        .supports_set_as_default_browser =
+            true,  // Supports in-product set as default browser UX.
+        .supports_retention_experiments =
+            true,  // Supports retention experiments.
+        .app_icon_resource_index =
+            icon_resources::kDevApplicationIndex,  // App icon resource index.
+        .app_icon_resource_id = IDR_X004_DEV,      // App icon resource id.
+        .sandbox_sid_prefix =
+            L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
+            L"934012151-",  // App container sid prefix for sandbox.
     },
     // A secondary install mode for Brave SxS (canary).
     {
-        sizeof(kInstallModes[0]),
-        NIGHTLY_INDEX,  // The mode for the side-by-side nightly channel.
-        "chrome-sxs",   // Install switch.
-        L"-Nightly",    // Install suffix.
-        L"Canary",      // Logo suffix.
-        L"{C6CB981E-DB30-4876-8639-109F8933582C}",  // A distinct app GUID.
-        L"Brave Nightly",                           // A distinct base_app_name.
-        L"BraveNightly",                            // A distinct base_app_id.
-        L"BraveSSHTM",                              // ProgID prefix.
-        L"Brave Nightly HTML Document",             // ProgID description.
-        L"{C6CB981E-DB30-4876-8639-109F8933582C}",  // Active Setup GUID.
-        L"{312ABB99-A176-4939-A39F-E8D34EA4D393}",  // CommandExecuteImpl CLSID.
-        {0xf2edbc59,
-         0x7217,
-         0x4da5,
-         {0xa2, 0x59, 0x3, 0x2, 0xda, 0x6a, 0x0,
-          0xe1}},  // Toast activator CLSID.
-        {0x1ce2f84f,
-         0x70cb,
-         0x4389,
-         {0x87, 0xdb, 0xd0, 0x99, 0x48, 0x30, 0xbb, 0x17}},  // Elevator CLSID.
-        {0x648b3c2b,
-         0xe53,
-         0x4085,
-         {0xa9, 0x75, 0x11, 0x18, 0x1, 0x75, 0x8f, 0xe7}},
-        L"nightly",  // Forced channel name.
-        ChannelStrategy::FIXED,
-        true,  // Support system-level installs.
-        true,  // Support in-product set as default browser UX.
-        true,  // Supports retention experiments.
-        icon_resources::kSxSApplicationIndex,  // App icon resource index.
-        IDR_SXS,                               // App icon resource id.
-        L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
-        L"934012152-",  // App container sid prefix for sandbox.
+        .size = sizeof(kInstallModes[0]),
+        .index =
+            NIGHTLY_INDEX,  // The mode for the side-by-side nightly channel.
+        .install_switch = "chrome-sxs",  // Install switch.
+        .install_suffix = L"-Nightly",   // Install suffix.
+        .logo_suffix = L"Canary",        // Logo suffix.
+        .app_guid =
+            L"{C6CB981E-DB30-4876-8639-109F8933582C}",  // A distinct app GUID.
+        .base_app_name = L"Brave Nightly",  // A distinct base_app_name.
+        .base_app_id = L"BraveNightly",     // A distinct base_app_id.
+        .prog_id_prefix = L"BraveSSHTM",    // ProgID prefix.
+        .prog_id_description =
+            L"Brave Nightly HTML Document",  // ProgID description.
+        .active_setup_guid =
+            L"{C6CB981E-DB30-4876-8639-109F8933582C}",  // Active Setup GUID.
+        .legacy_command_execute_clsid =
+            L"{312ABB99-A176-4939-A39F-E8D34EA4D393}",  // CommandExecuteImpl
+                                                        // CLSID.
+        .toast_activator_clsid = {0xf2edbc59,
+                                  0x7217,
+                                  0x4da5,
+                                  {0xa2, 0x59, 0x3, 0x2, 0xda, 0x6a, 0x0,
+                                   0xe1}},  // Toast activator CLSID.
+        .elevator_clsid = {0x1ce2f84f,
+                           0x70cb,
+                           0x4389,
+                           {0x87, 0xdb, 0xd0, 0x99, 0x48, 0x30, 0xbb,
+                            0x17}},  // Elevator CLSID.
+        .elevator_iid = {0x648b3c2b,
+                         0xe53,
+                         0x4085,
+                         {0xa9, 0x75, 0x11, 0x18, 0x1, 0x75, 0x8f, 0xe7}},
+        .default_channel_name = L"nightly",  // Forced channel name.
+        .channel_strategy = ChannelStrategy::FIXED,
+        .supports_system_level = true,  // Support system-level installs.
+        .supports_set_as_default_browser =
+            true,  // Support in-product set as default browser UX.
+        .supports_retention_experiments =
+            true,  // Supports retention experiments.
+        .app_icon_resource_index =
+            icon_resources::kSxSApplicationIndex,  // App icon resource index.
+        .app_icon_resource_id = IDR_SXS,           // App icon resource id.
+        .sandbox_sid_prefix =
+            L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
+            L"934012152-",  // App container sid prefix for sandbox.
     },
 };
 #else
 const InstallConstants kInstallModes[] = {
     // The primary (and only) install mode for Brave developer build.
     {
-        sizeof(kInstallModes[0]),
-        DEVELOPER_INDEX,  // The one and only mode for developer mode.
-        "",               // No install switch for the primary install mode.
-        L"",              // Empty install_suffix for the primary install mode.
-        L"",              // No logo suffix for the primary install mode.
-        L"",            // Empty app_guid since no integraion with Brave Update.
-        L"Brave Development",  // A distinct base_app_name.
-        L"BraveDevelopment",   // A distinct base_app_id.
-        L"BraveDevHTM",                             // ProgID prefix.
-        L"Brave Development HTML Document",           // ProgID description.
-        L"{D6527C63-5CDD-4EF3-9299-1504E17CBD18}",  // Active Setup GUID.
-        L"{B2863926-AF5D-43A2-99CC-29EC43790C89}",  // CommandExecuteImpl CLSID.
-        { 0xeb41c6e8,
-          0xba35,
-          0x4c06,
-          { 0x96, 0xe8, 0x6f, 0x30, 0xf1, 0x8c, 0xa5,
-            0x5c } },  // Toast activator CLSID.
-        { 0x5693e62d,
-          0xd6,
-          0x4421,
-          { 0xaf, 0xe8, 0x58, 0xf3, 0xc9, 0x47, 0x43,
-            0x6a } },  // Elevator CLSID.
-        { 0xedf6b466, 0x4efc, 0x4c88,
-          { 0x83, 0x8c, 0x96, 0xb4, 0x39, 0x1c, 0x6a,
-            0xe } },
-        L"",    // Empty default channel name since no update integration.
-        ChannelStrategy::UNSUPPORTED,
-        true,   // Supports system-level installs.
-        true,   // Supports in-product set as default browser UX.
-        false,  // Does not support retention experiments.
-        icon_resources::kApplicationIndex,  // App icon resource index.
-        IDR_MAINFRAME,                      // App icon resource id.
-        L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
-        L"934012148-",  // App container sid prefix for sandbox.
+        .size = sizeof(kInstallModes[0]),
+        .index = DEVELOPER_INDEX,  // The one and only mode for developer mode.
+        .install_switch =
+            "",  // No install switch for the primary install mode.
+        .install_suffix =
+            L"",  // Empty install_suffix for the primary install mode.
+        .logo_suffix = L"",  // No logo suffix for the primary install mode.
+        .app_guid =
+            L"",  // Empty app_guid since no integraion with Brave Update.
+        .base_app_name = L"Brave Development",  // A distinct base_app_name.
+        .base_app_id = L"BraveDevelopment",     // A distinct base_app_id.
+        .prog_id_prefix = L"BraveDevHTM",       // ProgID prefix.
+        .prog_id_description =
+            L"Brave Development HTML Document",  // ProgID description.
+        .active_setup_guid =
+            L"{D6527C63-5CDD-4EF3-9299-1504E17CBD18}",  // Active Setup GUID.
+        .legacy_command_execute_clsid =
+            L"{B2863926-AF5D-43A2-99CC-29EC43790C89}",  // CommandExecuteImpl
+                                                        // CLSID.
+        .toast_activator_clsid = {0xeb41c6e8,
+                                  0xba35,
+                                  0x4c06,
+                                  {0x96, 0xe8, 0x6f, 0x30, 0xf1, 0x8c, 0xa5,
+                                   0x5c}},  // Toast activator CLSID.
+        .elevator_clsid = {0x5693e62d,
+                           0xd6,
+                           0x4421,
+                           {0xaf, 0xe8, 0x58, 0xf3, 0xc9, 0x47, 0x43,
+                            0x6a}},  // Elevator CLSID.
+        .elevator_iid = {0xedf6b466,
+                         0x4efc,
+                         0x4c88,
+                         {0x83, 0x8c, 0x96, 0xb4, 0x39, 0x1c, 0x6a, 0xe}},
+        .default_channel_name =
+            L"",  // Empty default channel name since no update integration.
+        .channel_strategy = ChannelStrategy::UNSUPPORTED,
+        .supports_system_level = true,  // Supports system-level installs.
+        .supports_set_as_default_browser =
+            true,  // Supports in-product set as default browser UX.
+        .supports_retention_experiments =
+            false,  // Does not support retention experiments.
+        .app_icon_resource_index =
+            icon_resources::kApplicationIndex,  // App icon resource index.
+        .app_icon_resource_id = IDR_MAINFRAME,  // App icon resource id.
+        .sandbox_sid_prefix =
+            L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
+            L"934012148-",  // App container sid prefix for sandbox.
     },
 };
 #endif
diff --git a/chromium_src/components/autofill/core/common/autofill_payments_features.cc b/chromium_src/components/autofill/core/common/autofill_payments_features.cc
index e82d6fd5fc8a..f0d368c119b2 100644
--- a/chromium_src/components/autofill/core/common/autofill_payments_features.cc
+++ b/chromium_src/components/autofill/core/common/autofill_payments_features.cc
@@ -13,6 +13,7 @@ namespace features {
 OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kAutofillEnableOfferNotificationForPromoCodes,
      base::FEATURE_DISABLED_BY_DEFAULT},
+    {kAutofillEnableRemadeDownstreamMetrics, base::FEATURE_DISABLED_BY_DEFAULT},
     {kAutofillSaveCardUiExperiment, base::FEATURE_DISABLED_BY_DEFAULT},
     {kAutofillUpstreamAllowAdditionalEmailDomains,
      base::FEATURE_DISABLED_BY_DEFAULT},
diff --git a/chromium_src/components/omnibox/browser/autocomplete_controller.cc b/chromium_src/components/omnibox/browser/autocomplete_controller.cc
index 2a33d28a5446..8082134ac882 100644
--- a/chromium_src/components/omnibox/browser/autocomplete_controller.cc
+++ b/chromium_src/components/omnibox/browser/autocomplete_controller.cc
@@ -14,6 +14,8 @@
 #include "brave/components/omnibox/browser/suggested_sites_provider.h"
 #include "brave/components/omnibox/browser/topsites_provider.h"
 #include "components/omnibox/browser/clipboard_provider.h"
+#include "components/omnibox/browser/history_cluster_provider.h"
+#include "components/omnibox/browser/history_fuzzy_provider.h"
 
 using brave_search_conversion::IsBraveSearchConversionFetureEnabled;
 
diff --git a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc
index 21b9cf2b3d43..be7b46e39deb 100644
--- a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc
+++ b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc
@@ -28,13 +28,8 @@ class MockPrivacySandboxDelegate : public PrivacySandboxSettings::Delegate {
     ON_CALL(*this, IsPrivacySandboxRestricted).WillByDefault([]() {
       return false;
     });
-    ON_CALL(*this, IsPrivacySandboxConfirmed).WillByDefault([]() {
-      // Return true to mock as if privacy sandbox is allowed to run.
-      return true;
-    });
   }
   MOCK_METHOD(bool, IsPrivacySandboxRestricted, (), (override));
-  MOCK_METHOD(bool, IsPrivacySandboxConfirmed, (), (override));
 };
 
 class PrivacySandboxSettingsTest : public testing::Test {
@@ -520,18 +515,14 @@ TEST_F(PrivacySandboxSettingsTest, IsTopicsAllowed) {
       /*managed_cookie_setting=*/privacy_sandbox_test_util::kNoSetting,
       /*managed_cookie_exceptions=*/{});
 
-  // FLoC should be disabled since the privacy sandbox APIs can't be enabled.
-  prefs()->SetBoolean(prefs::kPrivacySandboxFlocEnabled, true);
   EXPECT_FALSE(privacy_sandbox_settings()->IsTopicsAllowed());
 
-  // Check that even bypassing PrivacySandboxSettings::SetFlocPrefEnabled,
-  // and manually updating the preferences, we still don't get this enabled.
+  // Check that even manually updating the preferences, we still don't get this
+  // enabled.
   profile()->GetTestingPrefService()->SetBoolean(
       prefs::kPrivacySandboxApisEnabled, true);
   profile()->GetTestingPrefService()->SetBoolean(
       prefs::kPrivacySandboxApisEnabledV2, true);
-  profile()->GetTestingPrefService()->SetBoolean(
-      prefs::kPrivacySandboxFlocEnabled, true);
   EXPECT_FALSE(privacy_sandbox_settings()->IsTopicsAllowed());
 
   privacy_sandbox_test_util::SetupTestState(
@@ -542,7 +533,10 @@ TEST_F(PrivacySandboxSettingsTest, IsTopicsAllowed) {
       /*user_cookie_exceptions=*/{},
       /*managed_cookie_setting=*/privacy_sandbox_test_util::kNoSetting,
       /*managed_cookie_exceptions=*/{});
-  prefs()->SetBoolean(prefs::kPrivacySandboxFlocEnabled, true);
+  profile()->GetTestingPrefService()->SetBoolean(
+      prefs::kPrivacySandboxApisEnabled, true);
+  profile()->GetTestingPrefService()->SetBoolean(
+      prefs::kPrivacySandboxApisEnabledV2, true);
   EXPECT_FALSE(privacy_sandbox_settings()->IsTopicsAllowed());
 
   privacy_sandbox_test_util::SetupTestState(
@@ -553,7 +547,10 @@ TEST_F(PrivacySandboxSettingsTest, IsTopicsAllowed) {
       /*user_cookie_exceptions=*/{},
       /*managed_cookie_setting=*/privacy_sandbox_test_util::kNoSetting,
       /*managed_cookie_exceptions=*/{});
-  prefs()->SetBoolean(prefs::kPrivacySandboxFlocEnabled, true);
+  profile()->GetTestingPrefService()->SetBoolean(
+      prefs::kPrivacySandboxApisEnabled, true);
+  profile()->GetTestingPrefService()->SetBoolean(
+      prefs::kPrivacySandboxApisEnabledV2, true);
   EXPECT_FALSE(privacy_sandbox_settings()->IsTopicsAllowed());
 
   privacy_sandbox_test_util::SetupTestState(
@@ -564,7 +561,10 @@ TEST_F(PrivacySandboxSettingsTest, IsTopicsAllowed) {
       /*user_cookie_exceptions=*/{},
       /*managed_cookie_setting=*/privacy_sandbox_test_util::kNoSetting,
       /*managed_cookie_exceptions=*/{});
-  prefs()->SetBoolean(prefs::kPrivacySandboxFlocEnabled, true);
+  profile()->GetTestingPrefService()->SetBoolean(
+      prefs::kPrivacySandboxApisEnabled, true);
+  profile()->GetTestingPrefService()->SetBoolean(
+      prefs::kPrivacySandboxApisEnabledV2, true);
   EXPECT_FALSE(privacy_sandbox_settings()->IsTopicsAllowed());
 }
 class PrivacySandboxSettingsTestCookiesClearOnExitTurnedOff
diff --git a/chromium_src/components/sync/base/model_type_unittest.cc b/chromium_src/components/sync/base/model_type_unittest.cc
index 9f6a119face2..109a0e5b0f05 100644
--- a/chromium_src/components/sync/base/model_type_unittest.cc
+++ b/chromium_src/components/sync/base/model_type_unittest.cc
@@ -14,7 +14,7 @@ TEST_F(ModelTypeTest, EncryptableUserTypes) {
 
 // This test is supposed to fail when sync types are increased/decreased
 TEST_F(ModelTypeTest, ModelTypeCounts) {
-  EXPECT_EQ(static_cast<int>(ModelTypeForHistograms::kMaxValue), 51);
+  EXPECT_EQ(static_cast<int>(ModelTypeForHistograms::kMaxValue), 52);
 }
 
 }  // namespace
diff --git a/chromium_src/content/browser/private_aggregation/private_aggregation_features.cc b/chromium_src/content/browser/private_aggregation/private_aggregation_features.cc
new file mode 100644
index 000000000000..1dacd0e1fb24
--- /dev/null
+++ b/chromium_src/content/browser/private_aggregation/private_aggregation_features.cc
@@ -0,0 +1,16 @@
+/* Copyright (c) 2022 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#include "src/content/browser/private_aggregation/private_aggregation_features.cc"
+
+#include "base/feature_override.h"
+
+namespace content {
+
+OVERRIDE_FEATURE_DEFAULT_STATES({{
+    {kPrivateAggregationApi, base::FEATURE_DISABLED_BY_DEFAULT},
+}});
+
+}  // namespace content
diff --git a/chromium_src/content/public/browser/content_browser_client.cc b/chromium_src/content/public/browser/content_browser_client.cc
index 03f908c453e7..810fb5818770 100644
--- a/chromium_src/content/public/browser/content_browser_client.cc
+++ b/chromium_src/content/public/browser/content_browser_client.cc
@@ -3,8 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "content/public/browser/content_browser_client.h"
-
 #include "src/content/public/browser/content_browser_client.cc"
 
 namespace content {
diff --git a/chromium_src/ios/chrome/browser/application_context_impl.mm b/chromium_src/ios/chrome/browser/application_context_impl.mm
index 8c0b13444ec0..022d52957255 100644
--- a/chromium_src/ios/chrome/browser/application_context_impl.mm
+++ b/chromium_src/ios/chrome/browser/application_context_impl.mm
@@ -43,6 +43,7 @@
 #include "ios/chrome/browser/pref_names.h"
 #include "ios/chrome/browser/prefs/browser_prefs.h"
 #include "ios/chrome/browser/prefs/ios_chrome_pref_service_factory.h"
+#include "ios/chrome/browser/segmentation_platform/otr_web_state_observer.h"
 #import "ios/components/security_interstitials/safe_browsing/safe_browsing_service.h"
 #include "ios/public/provider/chrome/browser/app_distribution/app_distribution_api.h"
 #include "ios/public/provider/chrome/browser/signin/signin_sso_api.h"
@@ -102,6 +103,11 @@ void BindNetworkChangeManagerReceiver(
 
 void ApplicationContextImpl::StartTearDown() {
   DCHECK(thread_checker_.CalledOnValidThread());
+
+  // Destroy the segmentation OTR observer before
+  // `chrome_browser_state_manager_`.
+  segmentation_otr_web_state_observer_.reset();
+
   // We need to destroy the NetworkTimeTracker before the IO thread gets
   // destroyed, since the destructor can call the URLFetcher destructor,
   // which does a PostDelayedTask operation on the IO thread. (The IO thread
@@ -315,6 +321,16 @@ void BindNetworkChangeManagerReceiver(
   return single_sign_on_service_;
 }
 
+segmentation_platform::OTRWebStateObserver*
+ApplicationContextImpl::GetSegmentationOTRWebStateObserver() {
+  if (!segmentation_otr_web_state_observer_) {
+    segmentation_otr_web_state_observer_ =
+        std::make_unique<segmentation_platform::OTRWebStateObserver>(
+            GetChromeBrowserStateManager());
+  }
+  return segmentation_otr_web_state_observer_.get();
+}
+
 void ApplicationContextImpl::SetApplicationLocale(const std::string& locale) {
   DCHECK(thread_checker_.CalledOnValidThread());
   application_locale_ = locale;
diff --git a/chromium_src/services/network/cookie_settings.cc b/chromium_src/services/network/cookie_settings.cc
index c3ff6557f17b..cfcdfad25aed 100644
--- a/chromium_src/services/network/cookie_settings.cc
+++ b/chromium_src/services/network/cookie_settings.cc
@@ -12,30 +12,27 @@
 // uses an explicit 1PES setting (CONTENT_SETTING_SESSION_ONLY). By default
 // Chromimum allows all 3p cookies if applied CookieSettingsPatterns for the URL
 // were explicit. We use explicit setting to enable 1PES mode, but in this mode
-// we still want to block 3p frames as usual and not fallback to "allow
+// we still want to block 3p frames as usual and not fall back to "allow
 // everything" path.
-#define BRAVE_COOKIE_SETTINGS_GET_COOKIE_SETTINGS_INTERNAL               \
-  if (blocked_by_third_party_setting ==                                  \
-          CookieSettings::ThirdPartyCookieBlockingSetting::              \
-              kThirdPartyStateAllowed &&                                 \
-      is_third_party_request) {                                          \
-    blocked_by_third_party_setting =                                     \
-        ShouldBlockThirdPartyIfSettingIsExplicit(                        \
-            block_third_party_cookies_, cookie_setting,                  \
-            content_settings::IsExplicitSetting(*entry),                 \
-            base::Contains(third_party_cookies_allowed_schemes_,         \
-                           first_party_url.scheme()))                    \
-            ? CookieSettings::ThirdPartyCookieBlockingSetting::          \
-                  kThirdPartyStateDisallowed                             \
-            : blocked_by_third_party_setting;                            \
-  }                                                                      \
-  /* Store patterns information to determine if Shields are disabled. */ \
-  if (auto* setting_with_brave_metadata =                                \
-          cookie_setting_with_brave_metadata()) {                        \
-    setting_with_brave_metadata->primary_pattern_matches_all_hosts =     \
-        entry->primary_pattern.MatchesAllHosts();                        \
-    setting_with_brave_metadata->secondary_pattern_matches_all_hosts =   \
-        entry->secondary_pattern.MatchesAllHosts();                      \
+#define BRAVE_COOKIE_SETTINGS_GET_COOKIE_SETTINGS_INTERNAL                    \
+  DCHECK(third_party_blocking_outcome ==                                      \
+         ThirdPartyBlockingOutcome::kIrrelevant);                             \
+  if (is_third_party_request &&                                               \
+      ShouldBlockThirdPartyIfSettingIsExplicit(                               \
+          block_third_party_cookies_, cookie_setting, found_explicit_setting, \
+          base::Contains(third_party_cookies_allowed_schemes_,                \
+                         first_party_url.scheme()))) {                        \
+    third_party_blocking_outcome =                                            \
+        ThirdPartyBlockingOutcome::kAllStateDisallowed;                       \
+    cookie_setting = CONTENT_SETTING_BLOCK;                                   \
+  }                                                                           \
+  /* Store patterns information to determine if Shields are disabled. */      \
+  if (auto* setting_with_brave_metadata =                                     \
+          cookie_setting_with_brave_metadata()) {                             \
+    setting_with_brave_metadata->primary_pattern_matches_all_hosts =          \
+        match->primary_pattern.MatchesAllHosts();                             \
+    setting_with_brave_metadata->secondary_pattern_matches_all_hosts =        \
+        match->secondary_pattern.MatchesAllHosts();                           \
   }
 
 #include "src/services/network/cookie_settings.cc"
diff --git a/chromium_src/third_party/blink/common/features.cc b/chromium_src/third_party/blink/common/features.cc
index b8540e7864d3..ff4cc2639043 100644
--- a/chromium_src/third_party/blink/common/features.cc
+++ b/chromium_src/third_party/blink/common/features.cc
@@ -19,6 +19,7 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kAdInterestGroupAPI, base::FEATURE_DISABLED_BY_DEFAULT},
     {kAllowURNsInIframes, base::FEATURE_DISABLED_BY_DEFAULT},
     {kBrowsingTopics, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kClientHintsMetaEquivDelegateCH, base::FEATURE_DISABLED_BY_DEFAULT},
     {kComputePressure, base::FEATURE_DISABLED_BY_DEFAULT},
     {kConversionMeasurement, base::FEATURE_DISABLED_BY_DEFAULT},
     {kCssSelectorFragmentAnchor, base::FEATURE_DISABLED_BY_DEFAULT},
diff --git a/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc b/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc
index 76f34b3a9adb..f291ecb7f5e9 100644
--- a/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc
+++ b/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc
@@ -32,7 +32,6 @@ bool IsTrialDisabledInBrave(base::StringPiece trial_name) {
       "FencedFrames",
       "Fledge",
       "Parakeet",
-      "Prerender2",
       "PrivacySandboxAdsAPIs",
       "SignedExchangeSubresourcePrefetch",
       "SubresourceWebBundles",
@@ -62,7 +61,6 @@ bool IsTrialDisabledInBrave(OriginTrialFeature feature) {
           OriginTrialFeature::kFencedFrames,
           OriginTrialFeature::kFledge,
           OriginTrialFeature::kParakeet,
-          OriginTrialFeature::kPrerender2,
           OriginTrialFeature::kPrivacySandboxAdsAPIs,
           OriginTrialFeature::kSignedExchangeSubresourcePrefetch,
           OriginTrialFeature::kTrustTokens,
diff --git a/chromium_src/ui/views/controls/focus_ring.cc b/chromium_src/ui/views/controls/focus_ring.cc
index ca83a91f20c2..ac0506262854 100644
--- a/chromium_src/ui/views/controls/focus_ring.cc
+++ b/chromium_src/ui/views/controls/focus_ring.cc
@@ -51,12 +51,15 @@ FocusRingTheme& GetFocusRingTheme() {
 
 namespace views {
 
-SkColor FocusRing::GetColor(View* focus_ring, bool valid) {
+SkColor FocusRing::GetPaintColor(FocusRing* focus_ring, bool valid) {
   // To avoid unused GetColor() in anonymous ns error.
   if (true) {
+    if (auto color_id = focus_ring->GetColorId(); color_id.has_value()) {
+      return focus_ring->GetColorProvider()->GetColor(color_id.value());
+    }
     return GetFocusRingTheme().GetSystemColor(ColorIdForValidity(valid));
   } else {
-    return ::views::GetColor(focus_ring, valid);
+    return ::views::GetPaintColor(focus_ring, valid);
   }
 }
 
diff --git a/chromium_src/ui/views/controls/focus_ring.h b/chromium_src/ui/views/controls/focus_ring.h
index 3d855ef402db..417fa817081d 100644
--- a/chromium_src/ui/views/controls/focus_ring.h
+++ b/chromium_src/ui/views/controls/focus_ring.h
@@ -6,9 +6,9 @@
 #ifndef BRAVE_CHROMIUM_SRC_UI_VIEWS_CONTROLS_FOCUS_RING_H_
 #define BRAVE_CHROMIUM_SRC_UI_VIEWS_CONTROLS_FOCUS_RING_H_
 
-#define RefreshLayer                              \
-  RefreshLayer_UnUsed() {}                        \
-  SkColor GetColor(View* focus_ring, bool valid); \
+#define RefreshLayer                                        \
+  RefreshLayer_UnUsed() {}                                  \
+  SkColor GetPaintColor(FocusRing* focus_ring, bool valid); \
   void RefreshLayer
 
 #include "src/ui/views/controls/focus_ring.h"
diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp
index 2cce10401372..3406d4a5efc9 100644
--- a/components/autofill_payments_strings.grdp
+++ b/components/autofill_payments_strings.grdp
@@ -414,22 +414,25 @@
   <message name="IDS_AUTOFILL_CARD_UNMASK_CONFIRMATION_MESSAGE" desc="Message displayed after tapping a Virtual Card, and the response from the bank indicates that no further verification is required.">
     Your card is confirmed
   </message>
+  <message name="IDS_AUTOFILL_FIDO_AUTHENTICATION_PROMPT_TITLE" desc="Title for FIDO authentication progress dialog">
+      Verifying...
+  </message>
 
   <!-- WebAuthn fingerprint opt-in dialog -->
   <!-- Desktop only -->
   <if expr="not is_ios and not is_android">
     <if expr="is_macosx">
       <message name="IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_TITLE" desc="Headline asking the user if they want to use their device's platform authenticator to confirm their cards in the future instead of CVC.">
-        Use Touch ID instead of CVC?
+        Use device unlock instead of CVC?
       </message>
       <message name="IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_TITLE_ERROR" desc="Headline explaining to users there were errors in the attempt to opt in using platform's authenticator.">
-        Couldn't use Touch ID
+        Couldn't use device unlock
       </message>
       <message name="IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_INSTRUCTION" desc="Subheading that appears below the headline explaining to the user that they won't have to enter their card's security code if they decide to use their device's platform authenticator in the future.">
-        Confirm your cards faster by using Touch ID from now on
+        Confirm your cards faster by using device unlock from now on
       </message>
       <message name="IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_OK_BUTTON_LABEL" desc="Button that allows the user to use their device's platform authenticator to confirm card use in the future.">
-        Use Touch ID
+        Use device unlock
       </message>
     </if>
     <if expr="is_win">
diff --git a/components/autofill_strings.grdp b/components/autofill_strings.grdp
index 3adc1802fe4b..61221a523e96 100644
--- a/components/autofill_strings.grdp
+++ b/components/autofill_strings.grdp
@@ -208,11 +208,11 @@
       </message>
       <!-- WebAuthn titles -->
       <if expr="is_macosx">
-        <message name="IDS_ENABLE_CREDIT_CARD_FIDO_AUTH_LABEL" desc="The product name of the fingerprint reader on macOS. Label for a toggle that allows users to control whether or not to use FIDO authentication for credit card unmasking. Title-Cased.">
-          Touch ID
+        <message name="IDS_ENABLE_CREDIT_CARD_FIDO_AUTH_LABEL" desc="A platform authenticator using device unlock on macOS. Label for a toggle that allows users to control whether or not to use FIDO authentication for credit card unmasking.">
+          Device unlock
         </message>
         <message name="IDS_ENABLE_CREDIT_CARD_FIDO_AUTH_SUBLABEL" desc="Sublabel for a toggle that allows users to control whether or not to use FIDO authentication for credit card unmasking on macOS. Sentence-Cased.">
-          Use Touch ID to confirm cards faster
+          Use device unlock to confirm cards faster
         </message>
       </if>
       <if expr="is_win">
diff --git a/components/binance/browser/binance_json_parser.cc b/components/binance/browser/binance_json_parser.cc
index 6f28c88b10b7..ed5f03bf58fa 100644
--- a/components/binance/browser/binance_json_parser.cc
+++ b/components/binance/browser/binance_json_parser.cc
@@ -26,11 +26,9 @@ bool BinanceJSONParser::GetTokensFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -69,12 +67,9 @@ bool BinanceJSONParser::GetAccountBalancesFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -131,11 +126,9 @@ bool BinanceJSONParser::GetQuoteInfoFromJSON(
   DCHECK(total_fee);
   DCHECK(total_amount);
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -189,12 +182,9 @@ bool BinanceJSONParser::GetDepositInfoFromJSON(
   DCHECK(address);
   DCHECK(tag);
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -246,11 +236,9 @@ bool BinanceJSONParser::GetConfirmStatusFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -311,12 +299,9 @@ bool BinanceJSONParser::GetConvertAssetsFromJSON(const std::string& json,
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -367,11 +352,9 @@ bool BinanceJSONParser::RevokeTokenFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -412,12 +395,9 @@ bool BinanceJSONParser::GetCoinNetworksFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc
index 168bb018f53e..3d6d79c778ad 100644
--- a/components/brave_ads/browser/ads_service_impl.cc
+++ b/components/brave_ads/browser/ads_service_impl.cc
@@ -1813,12 +1813,7 @@ void AdsServiceImpl::SetTimePref(const std::string& path,
 
 absl::optional<base::Value::Dict> AdsServiceImpl::GetDictPref(
     const std::string& path) const {
-  const base::Value::Dict* value = profile_->GetPrefs()->GetValueDict(path);
-  if (!value) {
-    return absl::nullopt;
-  }
-
-  return value->Clone();
+  return profile_->GetPrefs()->GetValueDict(path).Clone();
 }
 
 void AdsServiceImpl::SetDictPref(const std::string& path,
@@ -1829,12 +1824,7 @@ void AdsServiceImpl::SetDictPref(const std::string& path,
 
 absl::optional<base::Value::List> AdsServiceImpl::GetListPref(
     const std::string& path) const {
-  const base::Value::List* value = profile_->GetPrefs()->GetValueList(path);
-  if (!value) {
-    return absl::nullopt;
-  }
-
-  return value->Clone();
+  return profile_->GetPrefs()->GetValueList(path).Clone();
 }
 
 void AdsServiceImpl::SetListPref(const std::string& path,
diff --git a/components/brave_referrals/browser/brave_referrals_service.cc b/components/brave_referrals/browser/brave_referrals_service.cc
index a4ef9f407245..53ac0f9e986a 100644
--- a/components/brave_referrals/browser/brave_referrals_service.cc
+++ b/components/brave_referrals/browser/brave_referrals_service.cc
@@ -304,16 +304,16 @@ void BraveReferralsService::OnReferralInitLoadComplete(
     return;
   }
 
-  base::JSONReader::ValueWithError parsed_json =
+  auto parsed_json =
       base::JSONReader::ReadAndReturnValueWithError(*response_body);
-  if (!parsed_json.value || !parsed_json.value->is_dict()) {
+  if (!parsed_json.has_value() || !parsed_json->is_dict()) {
     LOG(ERROR) << "Failed to parse referral initialization response: "
-               << (!parsed_json.value ? parsed_json.error_message
-                                      : "not a dictionary");
+               << (!parsed_json.has_value() ? parsed_json.error().message
+                                            : "not a dictionary");
     return;
   }
 
-  const auto& root = parsed_json.value->GetDict();
+  const auto& root = parsed_json->GetDict();
   const auto* download_id = root.FindString("download_id");
   if (!download_id) {
     LOG(ERROR)
@@ -359,14 +359,15 @@ void BraveReferralsService::OnReferralFinalizationCheckLoadComplete(
     return;
   }
 
-  base::JSONReader::ValueWithError parsed_json =
+  auto parsed_json =
       base::JSONReader::ReadAndReturnValueWithError(*response_body);
-  if (!parsed_json.value || !parsed_json.value->is_dict()) {
+  if (!parsed_json.has_value() || !parsed_json->is_dict()) {
     LOG(ERROR) << "Failed to parse referral finalization check response: "
-               << parsed_json.error_message;
+               << (!parsed_json.has_value() ? parsed_json.error().message
+                                            : "not a dictionary");
     return;
   }
-  const auto& root = parsed_json.value->GetDict();
+  const auto& root = parsed_json->GetDict();
   auto finalized = root.FindBool("finalized");
   if (!finalized.has_value() || !finalized.value()) {
     LOG(ERROR) << "Referral is not ready, please wait at least 30 days";
diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc b/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc
index 2e9a15220b0a..cf4aa85217f5 100644
--- a/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc
+++ b/components/brave_rewards/browser/test/common/rewards_browsertest_util.cc
@@ -67,8 +67,8 @@ GURL GetUrl(
 void ActivateTabAtIndex(Browser* browser, const int32_t index) {
   DCHECK(browser);
   browser->tab_strip_model()->ActivateTabAt(
-      index,
-      TabStripModel::UserGestureDetails(TabStripModel::GestureType::kOther));
+      index, TabStripUserGestureDetails(
+                 TabStripUserGestureDetails::GestureType::kOther));
 }
 
 std::string BalanceDoubleToString(double amount) {
diff --git a/components/brave_shields/browser/domain_block_page.cc b/components/brave_shields/browser/domain_block_page.cc
index 8ba5950f0d5f..3994e173eff1 100644
--- a/components/brave_shields/browser/domain_block_page.cc
+++ b/components/brave_shields/browser/domain_block_page.cc
@@ -66,35 +66,33 @@ void DomainBlockPage::CommandReceived(const std::string& command) {
   }
 }
 
-void DomainBlockPage::PopulateInterstitialStrings(base::Value* load_time_data) {
-  load_time_data->SetStringKey(
-      "tabTitle",
-      brave_l10n::GetLocalizedResourceUTF16String(IDS_DOMAIN_BLOCK_TITLE));
-  load_time_data->SetStringKey(
-      "heading",
-      brave_l10n::GetLocalizedResourceUTF16String(IDS_DOMAIN_BLOCK_HEADING));
-
-  load_time_data->SetStringKey("primaryParagraph",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_DOMAIN_BLOCK_PRIMARY_PARAGRAPH));
+void DomainBlockPage::PopulateInterstitialStrings(
+    base::Value::Dict& load_time_data) {
+  load_time_data.Set("tabTitle", brave_l10n::GetLocalizedResourceUTF16String(
+                                     IDS_DOMAIN_BLOCK_TITLE));
+  load_time_data.Set("heading", brave_l10n::GetLocalizedResourceUTF16String(
+                                    IDS_DOMAIN_BLOCK_HEADING));
+
+  load_time_data.Set("primaryParagraph",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_DOMAIN_BLOCK_PRIMARY_PARAGRAPH));
 
   url::Origin request_url_origin = url::Origin::Create(request_url());
-  load_time_data->SetStringKey("domain", request_url_origin.Serialize());
-
-  load_time_data->SetStringKey("explanationParagraph",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_DOMAIN_BLOCK_EXPLANATION));
-
-  load_time_data->SetStringKey("dontWarnAgainText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_DOMAIN_BLOCK_DONT_WARN_AGAIN_BUTTON));
-
-  load_time_data->SetStringKey("proceedAnywayText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_DOMAIN_BLOCK_PROCEED_ANYWAY_BUTTON));
-  load_time_data->SetStringKey("goBackText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_DOMAIN_BLOCK_GO_BACK_BUTTON));
+  load_time_data.Set("domain", request_url_origin.Serialize());
+
+  load_time_data.Set("explanationParagraph",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_DOMAIN_BLOCK_EXPLANATION));
+
+  load_time_data.Set("dontWarnAgainText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_DOMAIN_BLOCK_DONT_WARN_AGAIN_BUTTON));
+
+  load_time_data.Set("proceedAnywayText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_DOMAIN_BLOCK_PROCEED_ANYWAY_BUTTON));
+  load_time_data.Set("goBackText", brave_l10n::GetLocalizedResourceUTF16String(
+                                       IDS_DOMAIN_BLOCK_GO_BACK_BUTTON));
 }
 
 int DomainBlockPage::GetHTMLTemplateId() {
diff --git a/components/brave_shields/browser/domain_block_page.h b/components/brave_shields/browser/domain_block_page.h
index 47b2bcf4471b..63455e7fe1a4 100644
--- a/components/brave_shields/browser/domain_block_page.h
+++ b/components/brave_shields/browser/domain_block_page.h
@@ -53,7 +53,7 @@ class DomainBlockPage
 
  protected:
   // SecurityInterstitialPage:: overrides
-  void PopulateInterstitialStrings(base::Value* load_time_data) override;
+  void PopulateInterstitialStrings(base::Value::Dict& load_time_data) override;
   int GetHTMLTemplateId() override;
 };
 
diff --git a/components/brave_shields/browser/https_everywhere_service_browsertest.cc b/components/brave_shields/browser/https_everywhere_service_browsertest.cc
index 73bf1cfd55ce..532a42d46837 100644
--- a/components/brave_shields/browser/https_everywhere_service_browsertest.cc
+++ b/components/brave_shields/browser/https_everywhere_service_browsertest.cc
@@ -135,7 +135,7 @@ IN_PROC_BROWSER_TEST_F(HTTPSEverywhereServiceTest, RedirectsKnownSiteInIframe) {
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(NavigateIframeToURL(contents, kIframeID, iframe_url));
   content::RenderFrameHost* iframe_contents =
-      ChildFrameAt(contents->GetMainFrame(), 0);
+      ChildFrameAt(contents->GetPrimaryMainFrame(), 0);
   WaitForLoadStop(contents);
   EXPECT_EQ(GURL("https://www.digg.com/"),
             iframe_contents->GetLastCommittedURL());
diff --git a/components/brave_today/browser/feed_parsing.cc b/components/brave_today/browser/feed_parsing.cc
index 8dcc264198f7..82a4a7205bee 100644
--- a/components/brave_today/browser/feed_parsing.cc
+++ b/components/brave_today/browser/feed_parsing.cc
@@ -118,10 +118,8 @@ bool ParseFeedItem(const base::Value& feed_item_raw,
 
 bool ParseFeedItems(const std::string& json,
                     std::vector<mojom::FeedItemPtr>* feed_items) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
diff --git a/components/brave_today/browser/publishers_parsing.cc b/components/brave_today/browser/publishers_parsing.cc
index 736340656d9f..6b47c654ce4d 100644
--- a/components/brave_today/browser/publishers_parsing.cc
+++ b/components/brave_today/browser/publishers_parsing.cc
@@ -21,11 +21,9 @@ namespace brave_news {
 bool ParseCombinedPublisherList(const std::string& json,
                                 Publishers* publishers) {
   DCHECK(publishers);
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
diff --git a/components/brave_vpn/brave_vpn_service.cc b/components/brave_vpn/brave_vpn_service.cc
index 217cb29b82f9..465ebb7ec172 100644
--- a/components/brave_vpn/brave_vpn_service.cc
+++ b/components/brave_vpn/brave_vpn_service.cc
@@ -89,11 +89,9 @@ std::string CreateJSONRequestBody(base::ValueView node) {
 }
 
 std::string GetSubscriberCredentialFromJson(const std::string& json) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     VLOG(1) << __func__ << "Invalid response, could not parse JSON.";
     return "";
@@ -994,11 +992,8 @@ void BraveVpnService::OnCredentialSummary(const std::string& domain,
     return;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          summary_string, base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v = base::JSONReader::Read(
+      summary_string, base::JSONParserOptions::JSON_PARSE_RFC);
   if (records_v && records_v->is_dict()) {
     auto active = records_v->GetDict().FindBool("active").value_or(false);
     if (active) {
diff --git a/components/brave_wallet/browser/asset_ratio_response_parser.cc b/components/brave_wallet/browser/asset_ratio_response_parser.cc
index 985c42ee7531..3edf73f0c510 100644
--- a/components/brave_wallet/browser/asset_ratio_response_parser.cc
+++ b/components/brave_wallet/browser/asset_ratio_response_parser.cc
@@ -26,11 +26,9 @@ absl::optional<std::string> ParseSardineAuthToken(const std::string& json) {
   //   "name": "brave-core",
   // }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     VLOG(0) << "Invalid response, could not parse JSON, JSON is: " << json;
     return absl::nullopt;
@@ -71,11 +69,9 @@ bool ParseAssetPrice(const std::string& json,
 
   DCHECK(values);
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -133,11 +129,9 @@ bool ParseAssetPriceHistory(const std::string& json,
   //   }
   // }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -193,11 +187,9 @@ std::string ParseEstimatedTime(const std::string& json) {
   //   "lastUpdated": "2021-09-22T21:45:40.015Z"
   // }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return "";
@@ -246,11 +238,9 @@ mojom::BlockchainTokenPtr ParseTokenInfo(const std::string& json,
   //   "lastUpdated": "2021-12-09T22:02:23.187Z"
   // }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return nullptr;
@@ -335,11 +325,9 @@ bool ParseCoinMarkets(const std::string& json,
   //   ],
   //   "lastUpdated": "2022-03-07T00:25:12.259823452Z"
   // }
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     VLOG(0) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
diff --git a/components/brave_wallet/browser/blockchain_list_parser.cc b/components/brave_wallet/browser/blockchain_list_parser.cc
index 281081df3c9c..6dd9669e27e9 100644
--- a/components/brave_wallet/browser/blockchain_list_parser.cc
+++ b/components/brave_wallet/browser/blockchain_list_parser.cc
@@ -67,11 +67,9 @@ bool ParseTokenList(const std::string& json,
   //  }
   // }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  auto& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -174,16 +172,14 @@ bool ParseChainList(const std::string& json, ChainList* result) {
   //   },
   // ]
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  auto& records_v = value_with_error.value;
-  if (!records_v) {
+  auto records_v = base::JSONReader::ReadAndReturnValueWithError(
+      json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                base::JSONParserOptions::JSON_PARSE_RFC);
+  if (!records_v.has_value()) {
     LOG(ERROR) << "Invalid response, could not parse JSON. "
-               << value_with_error.error_message
-               << ", line: " << value_with_error.error_line
-               << ", col: " << value_with_error.error_column;
+               << records_v.error().message
+               << ", line: " << records_v.error().line
+               << ", col: " << records_v.error().column;
     return false;
   }
 
diff --git a/components/brave_wallet/browser/fil_requests.cc b/components/brave_wallet/browser/fil_requests.cc
index 736cf179be39..918003de64db 100644
--- a/components/brave_wallet/browser/fil_requests.cc
+++ b/components/brave_wallet/browser/fil_requests.cc
@@ -87,13 +87,12 @@ std::string getStateSearchMsgLimited(const std::string& cid, uint64_t period) {
 }
 
 absl::optional<std::string> getSendTransaction(const std::string& signed_tx) {
-  base::JSONReader::ValueWithError parsed_tx =
-      base::JSONReader::ReadAndReturnValueWithError(signed_tx);
-  if (!parsed_tx.value || !parsed_tx.value->is_dict()) {
+  absl::optional<base::Value> parsed_tx = base::JSONReader::Read(signed_tx);
+  if (!parsed_tx || !parsed_tx->is_dict()) {
     return absl::nullopt;
   }
   base::Value::List params;
-  params.Append(std::move(*parsed_tx.value));
+  params.Append(std::move(*parsed_tx));
 
   // TODO(cdesouza): This dictionary should be composed by GetJsonRpcDictionary.
   base::Value::Dict dict;
diff --git a/components/brave_wallet/browser/filecoin_keyring.cc b/components/brave_wallet/browser/filecoin_keyring.cc
index e2bdf39b4697..ba65faa37d5c 100644
--- a/components/brave_wallet/browser/filecoin_keyring.cc
+++ b/components/brave_wallet/browser/filecoin_keyring.cc
@@ -55,11 +55,9 @@ bool FilecoinKeyring::DecodeImportPayload(
   if (!base::HexStringToString(payload_hex, &key_payload)) {
     return false;
   }
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          key_payload, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                           base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v = base::JSONReader::Read(
+      key_payload, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     VLOG(1) << "Invalid payload, could not parse JSON, JSON is: "
             << key_payload;
diff --git a/components/brave_wallet/browser/internal/hd_key.cc b/components/brave_wallet/browser/internal/hd_key.cc
index ba9fa20808fd..93222f5a5aec 100644
--- a/components/brave_wallet/browser/internal/hd_key.cc
+++ b/components/brave_wallet/browser/internal/hd_key.cc
@@ -214,21 +214,20 @@ std::unique_ptr<HDKey> HDKey::GenerateFromV3UTC(const std::string& password,
     VLOG(0) << __func__ << "empty password";
     return nullptr;
   }
-  base::JSONReader::ValueWithError parsed_json =
-      base::JSONReader::ReadAndReturnValueWithError(json);
-  if (!parsed_json.value) {
+  auto parsed_json = base::JSONReader::ReadAndReturnValueWithError(json);
+  if (!parsed_json.has_value()) {
     VLOG(0) << __func__ << ": UTC v3 json parsed failed because "
-            << parsed_json.error_message;
+            << parsed_json.error().message;
     return nullptr;
   }
   // check version
-  auto version = parsed_json.value->FindIntKey("version");
+  auto version = parsed_json->FindIntKey("version");
   if (!version || *version != 3) {
     VLOG(0) << __func__ << ": missing version or version is not 3";
     return nullptr;
   }
 
-  const auto* crypto = parsed_json.value->FindKey("crypto");
+  const auto* crypto = parsed_json->FindKey("crypto");
   if (!crypto) {
     VLOG(0) << __func__ << ": missing crypto";
     return nullptr;
diff --git a/components/brave_wallet/browser/json_rpc_response_parser.cc b/components/brave_wallet/browser/json_rpc_response_parser.cc
index c7effcc6f938..db71bab8c2a5 100644
--- a/components/brave_wallet/browser/json_rpc_response_parser.cc
+++ b/components/brave_wallet/browser/json_rpc_response_parser.cc
@@ -36,11 +36,9 @@ absl::optional<std::string> ParseSingleStringResult(const std::string& json) {
 }
 
 absl::optional<base::Value> ParseResultValue(const std::string& json) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return absl::nullopt;
diff --git a/components/brave_wallet/browser/json_rpc_response_parser.h b/components/brave_wallet/browser/json_rpc_response_parser.h
index bf6a49686db5..ceea11b9abd3 100644
--- a/components/brave_wallet/browser/json_rpc_response_parser.h
+++ b/components/brave_wallet/browser/json_rpc_response_parser.h
@@ -36,10 +36,8 @@ void ParseErrorResult(const std::string& json,
   *error = Error::kParsingError;
   *error_message = l10n_util::GetStringUTF8(IDS_WALLET_PARSING_ERROR);
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return;
diff --git a/components/brave_wallet/browser/rlp_decode.cc b/components/brave_wallet/browser/rlp_decode.cc
index 1d9fc83446fc..faffbbd4ca8d 100644
--- a/components/brave_wallet/browser/rlp_decode.cc
+++ b/components/brave_wallet/browser/rlp_decode.cc
@@ -141,11 +141,7 @@ bool RLPDecodeInternal(const std::string& s,
     std::string str = s.substr(*offset, *data_len);
     *output = base::Value(str);
   } else if (output->is_list()) {
-    *output = base::ListValue();
-    base::ListValue* output_list;
-    if (!output->GetAsList(&output_list)) {
-      return false;
-    }
+    base::Value::List list;
     if (!IsWithinBounds(*offset, *data_len, length)) {
       return false;
     }
@@ -156,7 +152,7 @@ bool RLPDecodeInternal(const std::string& s,
       if (!RLPDecodeInternal(sub, &v, &offset2, &data_len2)) {
         return false;
       }
-      output_list->Append(std::move(v));
+      list.Append(std::move(v));
       *offset += data_len2 + offset2;
       *data_len -= data_len2 + offset2;
       if (!IsWithinBounds(*offset, *data_len, length)) {
@@ -164,6 +160,7 @@ bool RLPDecodeInternal(const std::string& s,
       }
       sub = s.substr(*offset, *data_len);
     }
+    *output = base::Value(std::move(list));
   }
 
   return true;
diff --git a/components/brave_wallet/browser/rlp_decode_unittest.cc b/components/brave_wallet/browser/rlp_decode_unittest.cc
index 748a05397b43..6259dc941acd 100644
--- a/components/brave_wallet/browser/rlp_decode_unittest.cc
+++ b/components/brave_wallet/browser/rlp_decode_unittest.cc
@@ -23,9 +23,8 @@ std::string RLPTestValueToString(const base::Value& val) {
     }
     output += "[";
     std::string elems;
-    const base::ListValue* list;
-    val.GetAsList(&list);
-    for (const auto& item : list->GetList()) {
+    const base::Value::List& list = val.GetList();
+    for (const auto& item : list) {
       if (elems.size()) {
         elems += ", ";
       }
diff --git a/components/brave_wallet/browser/swap_response_parser.cc b/components/brave_wallet/browser/swap_response_parser.cc
index a8a73a2871d6..43798f3887dd 100644
--- a/components/brave_wallet/browser/swap_response_parser.cc
+++ b/components/brave_wallet/browser/swap_response_parser.cc
@@ -59,11 +59,9 @@ absl::optional<double> ParseDoubleResultFromStringDictValue(
 
 absl::optional<const base::Value::List> GetRoutesFromJupiterSwapQuote(
     const std::string& json) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  auto& records_v = value_with_error.value;
+  auto records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return absl::nullopt;
@@ -106,11 +104,9 @@ mojom::SwapResponsePtr ParseSwapResponse(const std::string& json,
   //   "buyTokenToEthRate":"1"
   // }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  auto& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return nullptr;
@@ -419,12 +415,9 @@ mojom::JupiterSwapTransactionsPtr ParseJupiterSwapTransactions(
     const std::string& json) {
   auto swap_transactions = mojom::JupiterSwapTransactions::New();
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-
-  auto& records_v = value_with_error.value;
+  auto records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v || !records_v->is_dict()) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return nullptr;
diff --git a/components/brave_wallet/browser/tx_state_manager.cc b/components/brave_wallet/browser/tx_state_manager.cc
index 296f6f3f9427..1eda4f57a5df 100644
--- a/components/brave_wallet/browser/tx_state_manager.cc
+++ b/components/brave_wallet/browser/tx_state_manager.cc
@@ -119,7 +119,7 @@ void TxStateManager::AddOrUpdateTx(const TxMeta& meta) {
 
 std::unique_ptr<TxMeta> TxStateManager::GetTx(const std::string& id) {
   const base::Value::Dict& dict =
-      *prefs_->GetValueDict(kBraveWalletTransactions);
+      prefs_->GetValueDict(kBraveWalletTransactions);
   const base::Value::Dict* value =
       dict.FindDictByDottedPath(GetTxPrefPathPrefix() + "." + id);
   if (!value)
@@ -145,7 +145,7 @@ std::vector<std::unique_ptr<TxMeta>> TxStateManager::GetTransactionsByStatus(
     absl::optional<std::string> from) {
   std::vector<std::unique_ptr<TxMeta>> result;
   const base::Value::Dict& dict =
-      *prefs_->GetValueDict(kBraveWalletTransactions);
+      prefs_->GetValueDict(kBraveWalletTransactions);
   const base::Value::Dict* network_dict =
       dict.FindDictByDottedPath(GetTxPrefPathPrefix());
   if (!network_dict)
diff --git a/components/brave_wallet/browser/tx_state_manager_unittest.cc b/components/brave_wallet/browser/tx_state_manager_unittest.cc
index d171a1d75412..efc8476d2e5b 100644
--- a/components/brave_wallet/browser/tx_state_manager_unittest.cc
+++ b/components/brave_wallet/browser/tx_state_manager_unittest.cc
@@ -115,7 +115,7 @@ TEST_F(TxStateManagerUnitTest, TxOperations) {
   tx_state_manager_->AddOrUpdateTx(meta);
   EXPECT_TRUE(prefs_.HasPrefPath(kBraveWalletTransactions));
   {
-    const auto& dict = *prefs_.GetValueDict(kBraveWalletTransactions);
+    const auto& dict = prefs_.GetValueDict(kBraveWalletTransactions);
     EXPECT_EQ(dict.size(), 1u);
     const auto* ethereum_dict = dict.FindDict("ethereum");
     ASSERT_TRUE(ethereum_dict);
@@ -134,7 +134,7 @@ TEST_F(TxStateManagerUnitTest, TxOperations) {
   // Update
   tx_state_manager_->AddOrUpdateTx(meta);
   {
-    const auto& dict = *prefs_.GetValueDict(kBraveWalletTransactions);
+    const auto& dict = prefs_.GetValueDict(kBraveWalletTransactions);
     EXPECT_EQ(dict.size(), 1u);
     const auto* ethereum_dict = dict.FindDict("ethereum");
     ASSERT_TRUE(ethereum_dict);
@@ -154,7 +154,7 @@ TEST_F(TxStateManagerUnitTest, TxOperations) {
   // Add another one
   tx_state_manager_->AddOrUpdateTx(meta);
   {
-    const auto& dict = *prefs_.GetValueDict(kBraveWalletTransactions);
+    const auto& dict = prefs_.GetValueDict(kBraveWalletTransactions);
     EXPECT_EQ(dict.size(), 1u);
     const auto* ethereum_dict = dict.FindDict("ethereum");
     ASSERT_TRUE(ethereum_dict);
@@ -184,7 +184,7 @@ TEST_F(TxStateManagerUnitTest, TxOperations) {
   // Delete
   tx_state_manager_->DeleteTx("001");
   {
-    const auto& dict = *prefs_.GetValueDict(kBraveWalletTransactions);
+    const auto& dict = prefs_.GetValueDict(kBraveWalletTransactions);
     EXPECT_EQ(dict.size(), 1u);
     const auto* ethereum_dict = dict.FindDict("ethereum");
     ASSERT_TRUE(ethereum_dict);
@@ -294,7 +294,7 @@ TEST_F(TxStateManagerUnitTest, SwitchNetwork) {
   EXPECT_EQ(tx_state_manager_->GetTx("001"), nullptr);
   tx_state_manager_->AddOrUpdateTx(meta);
 
-  const auto& dict = *prefs_.GetValueDict(kBraveWalletTransactions);
+  const auto& dict = prefs_.GetValueDict(kBraveWalletTransactions);
   EXPECT_EQ(dict.size(), 1u);
   const auto* ethereum_dict = dict.FindDict("ethereum");
   ASSERT_TRUE(ethereum_dict);
diff --git a/components/brave_wallet/common/eth_request_helper.cc b/components/brave_wallet/common/eth_request_helper.cc
index e657b7847864..7432295eaf42 100644
--- a/components/brave_wallet/common/eth_request_helper.cc
+++ b/components/brave_wallet/common/eth_request_helper.cc
@@ -189,11 +189,9 @@ bool GetEthJsonRequestInfo(const std::string& json,
                            base::Value* id,
                            std::string* method,
                            std::string* params) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     return false;
   }
@@ -232,11 +230,9 @@ bool GetEthJsonRequestInfo(const std::string& json,
 bool NormalizeEthRequest(const std::string& input_json,
                          std::string* output_json) {
   CHECK(output_json);
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          input_json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                          base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v = base::JSONReader::Read(
+      input_json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                      base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v)
     return false;
 
diff --git a/components/brave_wallet/renderer/js_ethereum_provider.cc b/components/brave_wallet/renderer/js_ethereum_provider.cc
index 7223d35fe96b..0e7996d76178 100644
--- a/components/brave_wallet/renderer/js_ethereum_provider.cc
+++ b/components/brave_wallet/renderer/js_ethereum_provider.cc
@@ -51,7 +51,7 @@ void JSEthereumProvider::OnIsUnlocked(
   v8::Local<v8::Context> context = global_context.Get(isolate);
   base::Value result = base::Value(!locked);
   v8::Local<v8::Value> local_result =
-      content::V8ValueConverter::Create()->ToV8Value(&result, context);
+      content::V8ValueConverter::Create()->ToV8Value(result, context);
   std::ignore = resolver->Resolve(context, local_result);
 }
 
@@ -78,7 +78,7 @@ void JSEthereumProvider::SendResponse(
   }
 
   v8::Local<v8::Value> result =
-      content::V8ValueConverter::Create()->ToV8Value(&formed_response, context);
+      content::V8ValueConverter::Create()->ToV8Value(formed_response, context);
   if (global_callback) {
     v8::Local<v8::Value> result_null = v8::Null(isolate);
     v8::Local<v8::Value> argv[] = {success ? result_null : result,
@@ -593,7 +593,7 @@ void JSEthereumProvider::FireEvent(const std::string& event,
   std::vector<v8::Local<v8::Value>> args;
   for (auto const& argument : args_list) {
     args.push_back(
-        content::V8ValueConverter::Create()->ToV8Value(&argument, context));
+        content::V8ValueConverter::Create()->ToV8Value(argument, context));
   }
   CallMethodOfObject(render_frame_->GetWebFrame(), u"ethereum", u"emit",
                      std::move(args));
diff --git a/components/brave_wallet/renderer/js_solana_provider.cc b/components/brave_wallet/renderer/js_solana_provider.cc
index 7bbc4b5a77da..f225fc1fc46a 100644
--- a/components/brave_wallet/renderer/js_solana_provider.cc
+++ b/components/brave_wallet/renderer/js_solana_provider.cc
@@ -551,7 +551,7 @@ void JSSolanaProvider::FireEvent(
       render_frame()->GetWebFrame()->MainWorldScriptContext();
   std::vector<v8::Local<v8::Value>> args;
   const base::Value event_value(event);
-  args.push_back(v8_value_converter_->ToV8Value(&event_value, context));
+  args.push_back(v8_value_converter_->ToV8Value(event_value, context));
   args.insert(args.end(), event_args.begin(), event_args.end());
   CallMethodOfObject(render_frame()->GetWebFrame(), u"braveSolana", u"emit",
                      std::move(args));
@@ -575,7 +575,7 @@ void JSSolanaProvider::OnConnect(
   } else {
     base::Value formed_response =
         GetSolanaProviderErrorDictionary(error, error_message);
-    result = v8_value_converter_->ToV8Value(&formed_response, context);
+    result = v8_value_converter_->ToV8Value(formed_response, context);
   }
 
   SendResponse(std::move(global_context), std::move(promise_resolver), isolate,
@@ -605,11 +605,11 @@ void JSSolanaProvider::OnSignAndSendTransaction(
   v8::Local<v8::Value> v8_result;
   if (error == mojom::SolanaProviderError::kSuccess) {
     base::Value value(std::move(result));
-    v8_result = v8_value_converter_->ToV8Value(&value, context);
+    v8_result = v8_value_converter_->ToV8Value(value, context);
   } else {
     base::Value formed_response =
         GetSolanaProviderErrorDictionary(error, error_message);
-    v8_result = v8_value_converter_->ToV8Value(&formed_response, context);
+    v8_result = v8_value_converter_->ToV8Value(formed_response, context);
   }
 
   SendResponse(std::move(global_context), std::move(promise_resolver), isolate,
@@ -641,7 +641,7 @@ void JSSolanaProvider::OnSignMessage(
     CHECK(Base58Decode(*signature, &signature_bytes, signature_bytes.size()));
     const base::Value signature_value(signature_bytes);
     v8::Local<v8::Value> v8_signature =
-        v8_value_converter_->ToV8Value(&signature_value, context);
+        v8_value_converter_->ToV8Value(signature_value, context);
     // From ArraryBuffer to Uint8Array
     v8_signature =
         v8::Uint8Array::New(v8::Local<v8::ArrayBuffer>::Cast(v8_signature), 0,
@@ -656,7 +656,7 @@ void JSSolanaProvider::OnSignMessage(
   } else {
     base::Value formed_response =
         GetSolanaProviderErrorDictionary(error, error_message);
-    v8_result = v8_value_converter_->ToV8Value(&formed_response, context);
+    v8_result = v8_value_converter_->ToV8Value(formed_response, context);
   }
 
   SendResponse(std::move(global_context), std::move(promise_resolver), isolate,
@@ -680,7 +680,7 @@ void JSSolanaProvider::OnSignTransaction(
   } else {
     base::Value formed_response =
         GetSolanaProviderErrorDictionary(error, error_message);
-    result = v8_value_converter_->ToV8Value(&formed_response, context);
+    result = v8_value_converter_->ToV8Value(formed_response, context);
   }
 
   SendResponse(std::move(global_context), std::move(promise_resolver), isolate,
@@ -714,7 +714,7 @@ void JSSolanaProvider::OnSignAllTransactions(
   } else {
     base::Value formed_response =
         GetSolanaProviderErrorDictionary(error, error_message);
-    result = v8_value_converter_->ToV8Value(&formed_response,
+    result = v8_value_converter_->ToV8Value(formed_response,
                                             global_context.Get(isolate));
   }
 
@@ -746,12 +746,12 @@ void JSSolanaProvider::OnRequest(
       // Dictionary to object
       base::Value value(std::move(result));
       v8_result =
-          v8_value_converter_->ToV8Value(&value, global_context.Get(isolate));
+          v8_value_converter_->ToV8Value(value, global_context.Get(isolate));
     }
   } else {
     base::Value formed_response =
         GetSolanaProviderErrorDictionary(error, error_message);
-    v8_result = v8_value_converter_->ToV8Value(&formed_response,
+    v8_result = v8_value_converter_->ToV8Value(formed_response,
                                                global_context.Get(isolate));
   }
 
@@ -867,7 +867,7 @@ v8::Local<v8::Value> JSSolanaProvider::CreatePublicKey(
   ExecuteScript(render_frame()->GetWebFrame(), *g_provider_internal_script);
   const base::Value public_key_value(base58_str);
   std::vector<v8::Local<v8::Value>> args;
-  args.push_back(v8_value_converter_->ToV8Value(&public_key_value, context));
+  args.push_back(v8_value_converter_->ToV8Value(public_key_value, context));
   v8::MaybeLocal<v8::Value> public_key_result =
       CallMethodOfObject(render_frame()->GetWebFrame(), u"_brave_solana",
                          u"createPublickey", std::move(args));
@@ -882,7 +882,7 @@ v8::Local<v8::Value> JSSolanaProvider::CreateTransaction(
   ExecuteScript(render_frame()->GetWebFrame(), *g_provider_internal_script);
   const base::Value serialized_tx_value(serialized_tx);
   std::vector<v8::Local<v8::Value>> args;
-  args.push_back(v8_value_converter_->ToV8Value(&serialized_tx_value, context));
+  args.push_back(v8_value_converter_->ToV8Value(serialized_tx_value, context));
 
   v8::MaybeLocal<v8::Value> transaction_result =
       CallMethodOfObject(render_frame()->GetWebFrame(), u"_brave_solana",
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java
index 05a5d917a28e..e447b1d1d958 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java
@@ -20,15 +20,7 @@ public class BraveSingleCategorySettings
     private static final String ADD_EXCEPTION_KEY = "add_exception";
 
     @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.close_menu_id) {
-            getSiteSettingsDelegate().closeButton();
-        }
-		return super.onOptionsItemSelected(item);
-    }
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {}
 
     public String getAddExceptionDialogMessage() {
         BrowserContextHandle browserContextHandle =
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveWebsite.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveWebsite.java
index bc97ad485c23..9aa553960c37 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveWebsite.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveWebsite.java
@@ -31,7 +31,7 @@ public void setContentSetting(BrowserContextHandle browserContextHandle,
                         ((WebsiteAddress) BraveReflectionUtil.InvokeMethod(
                                  Website.class, this, "getAddress"))
                                 .getHost(),
-                        value, "");
+                        value, "", false);
                 BraveReflectionUtil.InvokeMethod(Website.class, this, "setContentSettingException",
                         int.class, type, ContentSettingException.class, exception);
             }
diff --git a/components/components_strings.grd b/components/components_strings.grd
index a88ed12c26ac..fb797efb3b2f 100644
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -305,6 +305,7 @@
       <part file="history_strings.grdp" />
       <part file="javascript_dialogs_strings.grdp" />
       <part file="login_dialog_strings.grdp" />
+      <part file="management_strings.grdp" />
       <part file="media_message_center_strings.grdp" />
       <part file="new_or_sad_tab_strings.grdp" />
       <part file="ntp_snippets_strings.grdp" />
@@ -336,14 +337,12 @@
       <part file="version_ui_strings.grdp" />
       <part file="webapps_strings.grdp" />
 
-      <if expr="not is_ios">
-        <part file="management_strings.grdp" />
-      </if>
       <if expr="not is_ios">
         <part file="history_clusters_strings.grdp" />
       </if>
       <if expr="is_android">
         <part file="android_system_error_page_strings.grdp" />
+        <part file="external_intents_strings.grdp" />
       </if>
       <if expr="is_ios">
         <part file="management_ios_strings.grdp" />
@@ -525,6 +524,9 @@
       <message name="IDS_PATCH_SERVICE_DISPLAY_NAME" desc="The display name (in the system task manager, etc) of the service process used for patching file operations.">
         Patch Service
       </message>
+      <message name="IDS_PASSWORD_MANAGER_CSV_PASSWORD_PARSER_SERVICE_DISPLAY_NAME" desc="The display name (in the system task manager, etc) of the service process used for parsing a csv passwords file.">
+        CSV Password Parser Service
+      </message>
       <message name="IDS_UNZIP_SERVICE_DISPLAY_NAME" desc="The display name (in the system task manager, etc) of the service process used for unzipping files.">
         Unzip Service
       </message>
diff --git a/components/components_strings_override.grd b/components/components_strings_override.grd
index ad77a026baf4..e15a0ea7129c 100644
--- a/components/components_strings_override.grd
+++ b/components/components_strings_override.grd
@@ -94,9 +94,8 @@
       <part file="privacy_sandbox_strings_override.grdp" />
       <part file="security_interstitials_strings_override.grdp" />
       <if expr="not is_ios">
-        </if>
-      <if expr="not is_ios">
-        </if>
+        <part file="history_clusters_strings_override.grdp" />
+      </if>
       <if expr="is_android">
         </if>
       <if expr="is_ios">
diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc
index fb3d876a3531..d77634db27c9 100644
--- a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc
+++ b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc
@@ -223,8 +223,8 @@ void BravePrefProvider::EnsureNoWildcardEntries(
 void BravePrefProvider::MigrateShieldsSettingsFromResourceIds() {
   BravePrefProvider::CopyPluginSettingsForMigration(prefs_);
 
-  const base::Value::Dict& plugins_dict = *prefs_->GetValueDict(
-      "brave.migrate.content_settings.exceptions.plugins");
+  const base::Value::Dict& plugins_dict =
+      prefs_->GetValueDict("brave.migrate.content_settings.exceptions.plugins");
 
   for (const auto [key, value] : plugins_dict) {
     const std::string& patterns_string(key);
diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc b/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc
index 0c533edb7ed0..fee644dcd28b 100644
--- a/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc
+++ b/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc
@@ -492,7 +492,7 @@ TEST_F(BravePrefProviderTest, TestShieldsSettingsMigrationFromResourceIDs) {
   // Check migration for all the settings has been properly done.
   for (auto content_type : GetShieldsContentSettingsTypes()) {
     const base::Value::Dict& brave_shields_dict =
-        *pref_service->GetValueDict(GetShieldsSettingUserPrefsPath(
+        pref_service->GetValueDict(GetShieldsSettingUserPrefsPath(
             GetShieldsContentTypeName(content_type)));
 
     if (content_type == ContentSettingsType::BRAVE_SHIELDS) {
diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc b/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
index a871f23f2d9b..7c53db5dbaa1 100644
--- a/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
+++ b/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
@@ -9,7 +9,6 @@
 #include "components/content_settings/core/common/content_settings_utils.h"
 #include "components/content_settings/renderer/content_settings_agent_impl.h"
 #include "content/public/renderer/render_frame.h"
-#include "content/public/renderer/render_view.h"
 #include "content/public/test/render_view_test.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc b/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc
index 610405709bfc..68f5f6a7dcd9 100644
--- a/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc
+++ b/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc
@@ -303,7 +303,7 @@ class BraveContentSettingsAgentImplBrowserTest : public InProcessBrowserTest {
   }
 
   content::RenderFrameHost* child_frame() {
-    return ChildFrameAt(contents()->GetMainFrame(), 0);
+    return ChildFrameAt(contents()->GetPrimaryMainFrame(), 0);
   }
 
   template <typename T>
@@ -334,7 +334,7 @@ class BraveContentSettingsAgentImplBrowserTest : public InProcessBrowserTest {
 
   void RedirectToPageWithLink(const GURL& url, const GURL& final_url) {
     NavigateDirectlyToPageWithLink(url);
-    content::RenderFrameHost* main_frame = contents()->GetMainFrame();
+    content::RenderFrameHost* main_frame = contents()->GetPrimaryMainFrame();
     EXPECT_EQ(main_frame->GetLastCommittedURL(), final_url);
   }
 
@@ -342,7 +342,7 @@ class BraveContentSettingsAgentImplBrowserTest : public InProcessBrowserTest {
     ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url()));
     ASSERT_EQ(CollectAllRenderFrameHosts(contents()).size(), 2u)
         << "Two frames (main + iframe) should be created.";
-    content::RenderFrameHost* main_frame = contents()->GetMainFrame();
+    content::RenderFrameHost* main_frame = contents()->GetPrimaryMainFrame();
     EXPECT_EQ(main_frame->GetLastCommittedURL(), url());
   }
 
diff --git a/components/crypto_dot_com/browser/crypto_dot_com_json_parser.cc b/components/crypto_dot_com/browser/crypto_dot_com_json_parser.cc
index 2da06defa551..427d06ff1f9b 100644
--- a/components/crypto_dot_com/browser/crypto_dot_com_json_parser.cc
+++ b/components/crypto_dot_com/browser/crypto_dot_com_json_parser.cc
@@ -29,12 +29,9 @@ bool CryptoDotComJSONParser::GetTickerInfoFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -83,12 +80,9 @@ bool CryptoDotComJSONParser::GetChartDataFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -150,12 +144,9 @@ bool CryptoDotComJSONParser::GetPairsFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -205,12 +196,9 @@ bool CryptoDotComJSONParser::GetRankingsFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
diff --git a/components/de_amp/browser/de_amp_throttle.cc b/components/de_amp/browser/de_amp_throttle.cc
index 37fe44cda8ea..a7993ab6263b 100644
--- a/components/de_amp/browser/de_amp_throttle.cc
+++ b/components/de_amp/browser/de_amp_throttle.cc
@@ -129,7 +129,7 @@ bool DeAmpThrottle::OpenCanonicalURL(const GURL& new_url,
   content::OpenURLParams params(
       new_url,
       content::Referrer::SanitizeForRequest(new_url, entry->GetReferrer()),
-      contents->GetMainFrame()->GetFrameTreeNodeId(),
+      contents->GetPrimaryMainFrame()->GetFrameTreeNodeId(),
       WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_CLIENT_REDIRECT,
       false);
 
diff --git a/components/de_amp/browser/test/de_amp_browsertest.cc b/components/de_amp/browser/test/de_amp_browsertest.cc
index dd45071520b5..30cb5f9f21a9 100644
--- a/components/de_amp/browser/test/de_amp_browsertest.cc
+++ b/components/de_amp/browser/test/de_amp_browsertest.cc
@@ -486,7 +486,8 @@ IN_PROC_BROWSER_TEST_F(DeAmpBrowserTest, NonDeAmpedPageSameAsOriginal) {
   const GURL original_url =
       https_server_->GetURL(kTestHost, kTestSimpleNonAmpPage);
   NavigateToURLAndWaitForRedirects(original_url, original_url);
-  content::RenderFrameHost* current_main_frame = web_contents()->GetMainFrame();
+  content::RenderFrameHost* current_main_frame =
+      web_contents()->GetPrimaryMainFrame();
   // Open View Source for page
   content::WebContentsAddedObserver view_source_contents_observer;
   current_main_frame->ViewSource();
diff --git a/components/decentralized_dns/decentralized_dns_opt_in_page.cc b/components/decentralized_dns/decentralized_dns_opt_in_page.cc
index 6e532287bcec..84f105356e9a 100644
--- a/components/decentralized_dns/decentralized_dns_opt_in_page.cc
+++ b/components/decentralized_dns/decentralized_dns_opt_in_page.cc
@@ -66,7 +66,7 @@ void DecentralizedDnsOptInPage::CommandReceived(const std::string& command) {
 }
 
 void DecentralizedDnsOptInPage::PopulateInterstitialStrings(
-    base::Value* load_time_data) {
+    base::Value::Dict& load_time_data) {
   const std::vector<std::u16string> message_params = {
       u"<a "
       u"href='https://consensys.net/terms-of-use/' "
@@ -81,41 +81,36 @@ void DecentralizedDnsOptInPage::PopulateInterstitialStrings(
   };
 
   if (IsUnstoppableDomainsTLD(request_url_)) {
-    load_time_data->SetStringKey("tabTitle",
-                                 brave_l10n::GetLocalizedResourceUTF16String(
-                                     IDS_UNSTOPPABLE_DOMAINS_OPT_IN_TITLE));
-    load_time_data->SetStringKey("heading",
-                                 brave_l10n::GetLocalizedResourceUTF16String(
-                                     IDS_UNSTOPPABLE_DOMAINS_OPT_IN_HEADING));
-
-    load_time_data->SetStringKey(
+    load_time_data.Set("tabTitle", brave_l10n::GetLocalizedResourceUTF16String(
+                                       IDS_UNSTOPPABLE_DOMAINS_OPT_IN_TITLE));
+    load_time_data.Set("heading", brave_l10n::GetLocalizedResourceUTF16String(
+                                      IDS_UNSTOPPABLE_DOMAINS_OPT_IN_HEADING));
+
+    load_time_data.Set(
         "primaryParagraph",
         base::ReplaceStringPlaceholders(
             brave_l10n::GetLocalizedResourceUTF16String(
                 IDS_UNSTOPPABLE_DOMAINS_OPT_IN_PRIMARY_PARAGRAPH),
             message_params, nullptr));
   } else {
-    load_time_data->SetStringKey(
-        "tabTitle",
-        brave_l10n::GetLocalizedResourceUTF16String(IDS_ENS_OPT_IN_TITLE));
-    load_time_data->SetStringKey(
-        "heading",
-        brave_l10n::GetLocalizedResourceUTF16String(IDS_ENS_OPT_IN_HEADING));
-    load_time_data->SetStringKey(
-        "primaryParagraph", base::ReplaceStringPlaceholders(
-                                brave_l10n::GetLocalizedResourceUTF16String(
-                                    IDS_ENS_OPT_IN_PRIMARY_PARAGRAPH),
-                                message_params, nullptr));
+    load_time_data.Set("tabTitle", brave_l10n::GetLocalizedResourceUTF16String(
+                                       IDS_ENS_OPT_IN_TITLE));
+    load_time_data.Set("heading", brave_l10n::GetLocalizedResourceUTF16String(
+                                      IDS_ENS_OPT_IN_HEADING));
+    load_time_data.Set("primaryParagraph",
+                       base::ReplaceStringPlaceholders(
+                           brave_l10n::GetLocalizedResourceUTF16String(
+                               IDS_ENS_OPT_IN_PRIMARY_PARAGRAPH),
+                           message_params, nullptr));
   }
 
-  load_time_data->SetStringKey(
-      "primaryButtonText", brave_l10n::GetLocalizedResourceUTF16String(
-                               IDS_DECENTRALIZED_DNS_OPT_IN_PRIMARY_BUTTON));
-  load_time_data->SetStringKey(
-      "dontProceedButtonText",
-      brave_l10n::GetLocalizedResourceUTF16String(
-          IDS_DECENTRALIZED_DNS_OPT_IN_DONT_PROCEED_BUTTON));
-  load_time_data->SetStringKey("finalParagraph", std::u16string());
+  load_time_data.Set("primaryButtonText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_DECENTRALIZED_DNS_OPT_IN_PRIMARY_BUTTON));
+  load_time_data.Set("dontProceedButtonText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_DECENTRALIZED_DNS_OPT_IN_DONT_PROCEED_BUTTON));
+  load_time_data.Set("finalParagraph", std::u16string());
 }
 
 int DecentralizedDnsOptInPage::GetHTMLTemplateId() {
diff --git a/components/decentralized_dns/decentralized_dns_opt_in_page.h b/components/decentralized_dns/decentralized_dns_opt_in_page.h
index 5cd5f15d05e1..6ddc8af7d3b9 100644
--- a/components/decentralized_dns/decentralized_dns_opt_in_page.h
+++ b/components/decentralized_dns/decentralized_dns_opt_in_page.h
@@ -52,7 +52,7 @@ class DecentralizedDnsOptInPage
 
  protected:
   // SecurityInterstitialPage::
-  void PopulateInterstitialStrings(base::Value* load_time_data) override;
+  void PopulateInterstitialStrings(base::Value::Dict& load_time_data) override;
   int GetHTMLTemplateId() override;
 
  private:
diff --git a/components/error_page_strings.grdp b/components/error_page_strings.grdp
index 573fb6399f0c..68b5972c64ab 100644
--- a/components/error_page_strings.grdp
+++ b/components/error_page_strings.grdp
@@ -361,7 +361,7 @@
       If spelling is correct, <ph name="BEGIN_LINK">&lt;a href="javascript:diagnoseErrors()" id="diagnose-link"&gt;</ph>try running Windows Network Diagnostics<ph name="END_LINK">&lt;/a&gt;</ph>.
     </message>
   </if>
-  <if expr="chromeos_ash">
+  <if expr="chromeos_ash or chromeos_lacros">
     <message name="IDS_ERRORPAGES_SUGGESTION_DIAGNOSE" desc="Label for the link that invokes the connection diagnostic tool on the error page displayed in a list of suggestions. The suggestions list is prefixed with 'Try:'.">
       <ph name="BEGIN_LINK">&lt;a href="javascript:diagnoseErrors()" id="diagnose-link"&gt;</ph>Running Connectivity Diagnostics<ph name="END_LINK">&lt;/a&gt;</ph>
     </message>
diff --git a/components/error_page_strings_override.grdp b/components/error_page_strings_override.grdp
index 86fde0d6ff6f..8218fd98986a 100644
--- a/components/error_page_strings_override.grdp
+++ b/components/error_page_strings_override.grdp
@@ -28,7 +28,7 @@
     </if>
   <if expr="is_win">
     </if>
-  <if expr="chromeos_ash">
+  <if expr="chromeos_ash or chromeos_lacros">
     </if>
   <if expr="is_android or is_ios">
     </if>
diff --git a/components/external_intents_strings.grdp b/components/external_intents_strings.grdp
new file mode 100644
index 000000000000..0f4f7933aaca
--- /dev/null
+++ b/components/external_intents_strings.grdp
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--This file is created by l10nUtil.js. Do not edit manually.-->
+<grit-part>
+  <message name="IDS_EXTERNAL_NAVIGATION_CONTINUE_TO_TITLE" desc="Title for the Continue To App Message." formatter_data="android_java">
+    Continue to <ph name="APP_NAME">%1s<ex>Youtube</ex></ph>?
+  </message>
+  <message name="IDS_EXTERNAL_NAVIGATION_CONTINUE_TO_DESCRIPTION" desc="Description for the Continue To App Message." formatter_data="android_java">
+    This site wants to open the <ph name="APP_NAME">%1s<ex>Youtube</ex></ph> app
+  </message>
+  <message name="IDS_EXTERNAL_NAVIGATION_CONTINUE_TO_ACTION" desc="Action for the Continue To App Message." formatter_data="android_java">
+    Continue
+  </message>
+</grit-part>
diff --git a/components/ftx/browser/ftx_json_parser.cc b/components/ftx/browser/ftx_json_parser.cc
index 9e522c69f4d4..5e6d75bfdffc 100644
--- a/components/ftx/browser/ftx_json_parser.cc
+++ b/components/ftx/browser/ftx_json_parser.cc
@@ -18,11 +18,9 @@ bool FTXJSONParser::GetFuturesDataFromJSON(const std::string& json,
   if (!data) {
     return false;
   }
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "FTX GetFuturesDataFromJSON: did not understand json";
     return false;
@@ -70,12 +68,9 @@ bool FTXJSONParser::GetChartDataFromJSON(const std::string& json,
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "FTX GetChartDataFromJSON: did not understand json";
     return false;
@@ -116,11 +111,9 @@ bool FTXJSONParser::GetAccessTokenFromJSON(const std::string& json,
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "FTX GetAccessTokenFromJSON: did not understand json";
     return false;
@@ -178,12 +171,9 @@ bool FTXJSONParser::GetAccountBalancesFromJSON(const std::string& json,
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "FTX GetAccountBalancesFromJSON: Did not understand json";
     return false;
@@ -213,12 +203,9 @@ bool FTXJSONParser::GetAccountBalancesFromJSON(const std::string& json,
 
 bool FTXJSONParser::GetQuoteIdJSON(const std::string& json,
                                    std::string* quote_id) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "FTX GetQuoteIdJSON: Did not understand json";
     return false;
@@ -259,12 +246,9 @@ bool FTXJSONParser::GetQuoteStatusJSON(const std::string& json,
   //     "expiry": 1619158147.924754
   //   }
   // }
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "FTX GetQuoteStatusJSON: did not understand json";
     return false;
diff --git a/components/fullscreen_control_strings.grdp b/components/fullscreen_control_strings.grdp
index 12ed51967e14..581f5187e191 100644
--- a/components/fullscreen_control_strings.grdp
+++ b/components/fullscreen_control_strings.grdp
@@ -19,4 +19,7 @@
   <message name="IDS_PRESS_TO_EXIT_MOUSELOCK_TWO_KEYS" desc="Text displayed in the bubble to tell users how to escape from mouselock mode (where the mouse cursor is hidden) by activating ChromeOS's Overview mode, in the case where two keys must be pressed together. Please surround the names of the keys (e.g. 'Overview') in pipe characters so it can be rendered as a key.">
     Press |<ph name="ACCELERATOR1">$1<ex>Search</ex></ph>| + |<ph name="ACCELERATOR2">$2<ex>Overview</ex></ph>| to show your cursor
   </message>
+  <message name="IDS_FULLSCREEN_PRESS_TO_SEE_DOWNLOADS" desc="Text displayed in the bubble to tell users that they need to go to normal mode to see Downloads. Please surround the name of the key (e.g. 'Esc') in pipe characters so it can be rendered as a key.">
+    Download started. To see it, press |<ph name="ACCELERATOR">$1<ex>Esc</ex></ph>|.
+  </message>
 </grit-part>
diff --git a/components/gemini/browser/gemini_json_parser.cc b/components/gemini/browser/gemini_json_parser.cc
index 76fef4a91e3e..9e0b93b6c61e 100644
--- a/components/gemini/browser/gemini_json_parser.cc
+++ b/components/gemini/browser/gemini_json_parser.cc
@@ -18,11 +18,9 @@ bool GeminiJSONParser::GetTokensFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -48,11 +46,9 @@ bool GeminiJSONParser::GetTickerPriceFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -74,12 +70,9 @@ bool GeminiJSONParser::GetAccountBalancesFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -113,12 +106,9 @@ bool GeminiJSONParser::GetDepositInfoFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -147,11 +137,9 @@ bool GeminiJSONParser::GetOrderQuoteInfoFromJSON(
     return false;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     LOG(ERROR) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
diff --git a/components/greaselion/browser/greaselion_download_service.cc b/components/greaselion/browser/greaselion_download_service.cc
index 53c8ac951a29..e3dfd5c89a8a 100644
--- a/components/greaselion/browser/greaselion_download_service.cc
+++ b/components/greaselion/browser/greaselion_download_service.cc
@@ -287,17 +287,18 @@ void GreaselionDownloadService::OnDATFileDataReady(std::string contents) {
   }
   auto& root_list = root->GetList();
   for (base::Value& rule_it : root_list) {
+    DCHECK(rule_it.is_dict());
     auto& rule_dict = rule_it.GetDict();
     auto* preconditions_value = rule_dict.FindDict(kPreconditions);
     auto* urls_value = rule_dict.FindList(kURLs);
     auto* scripts_value = rule_dict.FindList(kScripts);
-    const std::string* run_at_ptr = rule_dict.FindStringByDottedPath(kRunAt);
+    const std::string* run_at_ptr = rule_dict.FindString(kRunAt);
     const std::string run_at_value = run_at_ptr ? *run_at_ptr : "";
     const std::string* minimum_brave_version_ptr =
-        rule_dict.FindStringByDottedPath(kMinimumBraveVersion);
+        rule_dict.FindString(kMinimumBraveVersion);
     const std::string minimum_brave_version_value =
         minimum_brave_version_ptr ? *minimum_brave_version_ptr : "";
-    const std::string* messages = rule_dict.FindStringByDottedPath(kMessages);
+    const std::string* messages = rule_dict.FindString(kMessages);
     base::FilePath messages_path;
     if (messages) {
       messages_path = base::FilePath::FromUTF8Unsafe(messages->c_str());
diff --git a/components/history_clusters_strings.grdp b/components/history_clusters_strings.grdp
index bd7aeeb3866d..73cb7e4dde25 100644
--- a/components/history_clusters_strings.grdp
+++ b/components/history_clusters_strings.grdp
@@ -5,16 +5,16 @@
   <message name="IDS_HISTORY_CLUSTERS_ACTION_MENU_DESCRIPTION" desc="Text used to identify the history clusters drop-down menu for screen readers">
     Actions
   </message>
-  <message name="IDS_HISTORY_CLUSTERS_DISABLE_MENU_ITEM_LABEL" desc="A label for the menu item to turn off the Journeys feature, which collects different search and browsing activities related to a single topic into a single place, and organizes them by topic. See glossary entry for meaning of 'Journeys'.">
+  <message name="IDS_HISTORY_CLUSTERS_DISABLE_MENU_ITEM_LABEL" desc="A label for the menu item to turn off the Journeys feature, which collects different search and browsing activities related to a single topic into a single place, and organizes them by topic. See glossary entry for meaning of 'Journeys'." formatter_data="android_java">
     Turn off Journeys
   </message>
-  <message name="IDS_HISTORY_CLUSTERS_ENABLE_MENU_ITEM_LABEL" desc="A label for the menu item to turn on the Journeys feature, which collects different search and browsing activities related to a single topic into a single place, and organizes them by topic. See glossary entry for meaning of 'Journeys'.">
+  <message name="IDS_HISTORY_CLUSTERS_ENABLE_MENU_ITEM_LABEL" desc="A label for the menu item to turn on the Journeys feature, which collects different search and browsing activities related to a single topic into a single place, and organizes them by topic. See glossary entry for meaning of 'Journeys'." formatter_data="android_java">
     Turn on Journeys
   </message>
   <message name="IDS_HISTORY_CLUSTERS_JOURNEYS_TAB_LABEL" desc="A label for the section in Brave History (chrome://history) where Journeys are collected and shown to the user. See glossary entry for meaning of 'Journeys'." formatter_data="android_java">
     Journeys
   </message>
-  <message name="IDS_HISTORY_CLUSTERS_LIST_TAB_LABEL" desc="A label for the section in Brave History (chrome://history) where a list of history items are shown to the user.">
+  <message name="IDS_HISTORY_CLUSTERS_LIST_TAB_LABEL" desc="A label for the section in Brave History (chrome://history) where a list of history items are shown to the user." formatter_data="android_java">
     List
   </message>
   <message name="IDS_HISTORY_CLUSTERS_CLUSTER_LABEL_SEARCH_TERMS" desc="The header used for Journeys that are anchored by search terms. The header is just the search terms in locale-specific quotation marks.">
@@ -26,21 +26,36 @@
   <message name="IDS_HISTORY_CLUSTERS_LOAD_MORE_BUTTON_LABEL" desc="A label for the button that loads more history clusters at the bottom of the history clusters list.">
     Load more
   </message>
-  <message name="IDS_HISTORY_CLUSTERS_OPEN_ALL_IN_TABGROUP" desc="Label of the item in drop-down menu that allows the user to open a group of urls in a tab group.">
+  <message name="IDS_HISTORY_CLUSTERS_OPEN_ALL_IN_TABGROUP" desc="Label of the item in drop-down menu that allows the user to open a group of urls in a tab group." formatter_data="android_java">
     Open all in new tab group
   </message>
+  <message name="IDS_HISTORY_CLUSTERS_OPEN_INCOGNITO" desc="Label of the item in drop-down menu that allows the user to open a link in a private window.">
+    Open Link in Private Window
+  </message>
+  <message name="IDS_HISTORY_CLUSTERS_OPEN_IN_NEW_TAB" desc="Label of the item in drop-down menu that allows the user to open a link in a new tab.">
+    Open Link in New Tab
+  </message>
+  <message name="IDS_HISTORY_CLUSTERS_OPEN_IN_NEW_WINDOW" desc="Label of the item in drop-down menu that allows the user to open a link in a new window.">
+    Open Link in New Window
+  </message>
   <message name="IDS_HISTORY_CLUSTERS_RELATED_SEARCHES_HEADER" desc="Header text shown for the section containing search suggestions related to a group of search and browsing activities.">
     Related searches
   </message>
   <message name="IDS_HISTORY_CLUSTERS_REMOVE_ALL_ITEMS" desc="Label of the item in drop-down menu that allows the user to remove a group of history items.">
     Remove all from history
   </message>
+  <message name="IDS_HISTORY_CLUSTERS_REMOVE_PAGE" desc="Label of the item in drop-down menu that allows the user to remove a history item">
+    Remove from history
+  </message>
   <message name="IDS_HISTORY_CLUSTERS_REMOVE_ITEM_TOAST" desc="Confirmation message shown after user successfully removes one history item from the item's drop-down menu.">
     Item removed
   </message>
   <message name="IDS_HISTORY_CLUSTERS_SAVED_IN_TABGROUP_LABEL" desc="A label indicating whether a history item was added to a tab group.">
     Saved in tab group
   </message>
+  <message name="IDS_HISTORY_CLUSTERS_COPY_LINK" desc="Label of the item in drop-down menu that allows the user to copy a link.">
+    Copy Link Address
+  </message>
   <message name="IDS_HISTORY_CLUSTERS_SHOW_LESS_BUTTON_LABEL" desc="A label for the button that collapses the view showing fewer history items.">
     Show less
   </message>
@@ -50,4 +65,8 @@
   <message name="IDS_HISTORY_CLUSTERS_SEARCH_YOUR_JOURNEYS" desc="A label for the hint text for the search box in Brave Journeys." formatter_data="android_java">
     Search your Journeys
   </message>
+  <message name="IDS_HISTORY_CLUSTERS_N_MATCHES" desc="A label for the number of matching clusters for a given label." formatter_data="android_java">
+   {NUM_MATCHES, plural,
+        =1 {# match} other {# matches}}
+  </message>
 </grit-part>
diff --git a/components/history_clusters_strings_override.grdp b/components/history_clusters_strings_override.grdp
new file mode 100644
index 000000000000..ca189d2775dd
--- /dev/null
+++ b/components/history_clusters_strings_override.grdp
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Strings for the chrome://history/journeys page -->
+<grit-part>
+  <message name="IDS_HISTORY_CLUSTERS_OPEN_INCOGNITO" desc="Label of the item in drop-down menu that allows the user to open a link in a private window.">
+    Open Link in Private Window
+  </message>
+  </grit-part>
diff --git a/components/ipfs/ipfs_json_parser.cc b/components/ipfs/ipfs_json_parser.cc
index 45f6c0dce0ac..2345ee02bc38 100644
--- a/components/ipfs/ipfs_json_parser.cc
+++ b/components/ipfs/ipfs_json_parser.cc
@@ -107,12 +107,9 @@ bool IPFSJSONParser::GetPeersFromJSON(const std::string& json,
 // }
 bool IPFSJSONParser::GetAddressesConfigFromJSON(const std::string& json,
                                                 ipfs::AddressesConfig* config) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     VLOG(1) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -160,12 +157,9 @@ bool IPFSJSONParser::GetAddressesConfigFromJSON(const std::string& json,
 //}
 bool IPFSJSONParser::GetRepoStatsFromJSON(const std::string& json,
                                           ipfs::RepoStats* stats) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     VLOG(1) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -209,12 +203,9 @@ bool IPFSJSONParser::GetRepoStatsFromJSON(const std::string& json,
 //}
 bool IPFSJSONParser::GetNodeInfoFromJSON(const std::string& json,
                                          ipfs::NodeInfo* info) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     VLOG(1) << "Invalid response, could not parse JSON, JSON is: " << json;
     return false;
@@ -248,14 +239,12 @@ bool IPFSJSONParser::GetNodeInfoFromJSON(const std::string& json,
 // }
 bool IPFSJSONParser::GetGarbageCollectionFromJSON(const std::string& json,
                                                   std::string* error) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-  if (!records_v) {
+  auto records_v = base::JSONReader::ReadAndReturnValueWithError(
+      json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                base::JSONParserOptions::JSON_PARSE_RFC);
+  if (!records_v.has_value()) {
     VLOG(1) << "Invalid response, could not parse JSON, JSON is: " << json
-            << " error is:" << value_with_error.error_message;
+            << " error is:" << records_v.error().message;
     return false;
   }
 
@@ -279,14 +268,12 @@ bool IPFSJSONParser::GetGarbageCollectionFromJSON(const std::string& json,
 // }
 bool IPFSJSONParser::GetImportResponseFromJSON(const std::string& json,
                                                ipfs::ImportedData* data) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-  if (!records_v) {
+  auto records_v = base::JSONReader::ReadAndReturnValueWithError(
+      json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                base::JSONParserOptions::JSON_PARSE_RFC);
+  if (!records_v.has_value()) {
     VLOG(1) << "Invalid response, could not parse JSON, JSON is: " << json
-            << " error is:" << value_with_error.error_message;
+            << " error is:" << records_v.error().message;
     return false;
   }
 
@@ -318,14 +305,12 @@ bool IPFSJSONParser::GetParseKeysFromJSON(
     const std::string& json,
     std::unordered_map<std::string, std::string>* data) {
   DCHECK(data);
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-  if (!records_v) {
+  auto records_v = base::JSONReader::ReadAndReturnValueWithError(
+      json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                base::JSONParserOptions::JSON_PARSE_RFC);
+  if (!records_v.has_value()) {
     VLOG(1) << "Invalid response, could not parse JSON, JSON is: " << json
-            << " error is:" << value_with_error.error_message;
+            << " error is:" << records_v.error().message;
     return false;
   }
 
@@ -362,14 +347,12 @@ bool IPFSJSONParser::GetParseKeysFromJSON(
 bool IPFSJSONParser::GetParseSingleKeyFromJSON(const std::string& json,
                                                std::string* name,
                                                std::string* value) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
-  if (!records_v) {
+  auto records_v = base::JSONReader::ReadAndReturnValueWithError(
+      json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                base::JSONParserOptions::JSON_PARSE_RFC);
+  if (!records_v.has_value()) {
     VLOG(1) << "Invalid response, could not parse JSON, JSON is: " << json
-            << " error is:" << value_with_error.error_message;
+            << " error is:" << records_v.error().message;
     return false;
   }
 
@@ -397,11 +380,9 @@ std::string IPFSJSONParser::PutNewPeerToConfigJSON(const std::string& json,
   if (!ipfs::ParsePeerConnectionString(peer, &peer_id, &address))
     return std::string();
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     VLOG(1) << "Could not parse JSON, JSON is: " << json;
     return std::string();
@@ -452,11 +433,9 @@ std::string IPFSJSONParser::PutNewPeerToConfigJSON(const std::string& json,
 // https://github.com/ipfs/go-ipfs/blob/master/docs/config.md#peering
 bool IPFSJSONParser::GetPeersFromConfigJSON(const std::string& json,
                                             std::vector<std::string>* peers) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     VLOG(1) << "Could not parse JSON, JSON is: " << json;
     return false;
@@ -504,11 +483,9 @@ std::string IPFSJSONParser::RemovePeerFromConfigJSON(
     const std::string& json,
     const std::string& peer_id,
     const std::string& peer_address) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                    base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v =
+      base::JSONReader::Read(json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                                       base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     VLOG(1) << "Could not parse JSON, JSON is: " << json;
     return std::string();
diff --git a/components/ipfs/ipfs_not_connected_page.cc b/components/ipfs/ipfs_not_connected_page.cc
index de1054f9399b..68485a0ef9f9 100644
--- a/components/ipfs/ipfs_not_connected_page.cc
+++ b/components/ipfs/ipfs_not_connected_page.cc
@@ -55,31 +55,29 @@ void IPFSNotConnectedPage::CommandReceived(const std::string& command) {
 }
 
 void IPFSNotConnectedPage::PopulateInterstitialStrings(
-    base::Value* load_time_data) {
-  load_time_data->SetStringKey("tabTitle",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_NOT_CONNECTED_TITLE));
-  load_time_data->SetStringKey("heading",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_NOT_CONNECTED_HEADING));
-
-  load_time_data->SetStringKey("primaryParagraph",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_NOT_CONNECTED_PRIMARY_PARAGRAPH));
-
-  load_time_data->SetStringKey("primaryButtonText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_NOT_CONNECTED_PRIMARY_BUTTON));
-  load_time_data->SetStringKey("openDetails",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_NOT_CONNECTED_OPEN_DETAILS_BUTTON));
-  load_time_data->SetStringKey(
-      "closeDetails", brave_l10n::GetLocalizedResourceUTF16String(
-                          IDS_IPFS_NOT_CONNECTED_CLOSE_DETAILS_BUTTON));
-  load_time_data->SetStringKey("explanationParagraph",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_NOT_CONNECTED_EXPLANATION));
-  load_time_data->SetStringKey("finalParagraph", std::u16string());
+    base::Value::Dict& load_time_data) {
+  load_time_data.Set("tabTitle", brave_l10n::GetLocalizedResourceUTF16String(
+                                     IDS_IPFS_NOT_CONNECTED_TITLE));
+  load_time_data.Set("heading", brave_l10n::GetLocalizedResourceUTF16String(
+                                    IDS_IPFS_NOT_CONNECTED_HEADING));
+
+  load_time_data.Set("primaryParagraph",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_NOT_CONNECTED_PRIMARY_PARAGRAPH));
+
+  load_time_data.Set("primaryButtonText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_NOT_CONNECTED_PRIMARY_BUTTON));
+  load_time_data.Set("openDetails",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_NOT_CONNECTED_OPEN_DETAILS_BUTTON));
+  load_time_data.Set("closeDetails",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_NOT_CONNECTED_CLOSE_DETAILS_BUTTON));
+  load_time_data.Set("explanationParagraph",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_NOT_CONNECTED_EXPLANATION));
+  load_time_data.Set("finalParagraph", std::u16string());
 }
 
 int IPFSNotConnectedPage::GetHTMLTemplateId() {
diff --git a/components/ipfs/ipfs_not_connected_page.h b/components/ipfs/ipfs_not_connected_page.h
index b08ec68174e2..fe4703240872 100644
--- a/components/ipfs/ipfs_not_connected_page.h
+++ b/components/ipfs/ipfs_not_connected_page.h
@@ -54,7 +54,7 @@ class IPFSNotConnectedPage
 
  protected:
   // SecurityInterstitialPage::
-  void PopulateInterstitialStrings(base::Value* load_time_data) override;
+  void PopulateInterstitialStrings(base::Value::Dict& load_time_data) override;
   int GetHTMLTemplateId() override;
 
  private:
diff --git a/components/ipfs/ipfs_onboarding_page.cc b/components/ipfs/ipfs_onboarding_page.cc
index 495fdd229eab..4aec1e3c9a6e 100644
--- a/components/ipfs/ipfs_onboarding_page.cc
+++ b/components/ipfs/ipfs_onboarding_page.cc
@@ -160,15 +160,15 @@ void IPFSOnboardingPage::Proceed() {
 
 void IPFSOnboardingPage::RespondToPage(IPFSOnboardingResponse code,
                                        const std::u16string& value) {
-  auto* main_frame = web_contents()->GetMainFrame();
-  DCHECK(main_frame);
+  auto* primary_main_frame = web_contents()->GetPrimaryMainFrame();
+  DCHECK(primary_main_frame);
 
   std::u16string script(kResponseScript);
   base::ReplaceSubstringsAfterOffset(&script, 0, u"{code}",
                                      base::NumberToString16(code));
   base::ReplaceSubstringsAfterOffset(&script, 0, u"{value}", value);
-  main_frame->ExecuteJavaScriptInIsolatedWorld(script, {},
-                                               kOnboardingIsolatedWorldId);
+  primary_main_frame->ExecuteJavaScriptInIsolatedWorld(
+      script, {}, kOnboardingIsolatedWorldId);
 }
 
 void IPFSOnboardingPage::CommandReceived(const std::string& command) {
@@ -201,59 +201,53 @@ void IPFSOnboardingPage::CommandReceived(const std::string& command) {
 }
 
 void IPFSOnboardingPage::PopulateInterstitialStrings(
-    base::Value* load_time_data) {
-  load_time_data->SetStringKey(
-      "tabTitle",
-      brave_l10n::GetLocalizedResourceUTF16String(IDS_IPFS_ONBOARDING_TITLE));
-  load_time_data->SetStringKey(
-      "heading",
-      brave_l10n::GetLocalizedResourceUTF16String(IDS_IPFS_ONBOARDING_HEADING));
-  load_time_data->SetStringKey("primaryParagraph",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_PRIMARY_PARAGRAPH));
-  load_time_data->SetStringKey("localNodeButton",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_LOCAL_NODE_BUTTON));
-  load_time_data->SetStringKey("publicGatewayButton",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_PUBLIC_GATEWAY_BUTTON));
-  load_time_data->SetStringKey("learnMore",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_LEARN_MORE));
-  load_time_data->SetStringKey("localNodeText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_LOCAL_NODE_TEXT));
-  load_time_data->SetStringKey("publicGatewayText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_PUBLIC_GATEWAY_TEXT));
-  load_time_data->SetStringKey("footerText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_FOOTER_TEXT));
-  load_time_data->SetStringKey("settings",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_SETTINGS));
-  load_time_data->SetStringKey("retryText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_SERVICE_LAUNCH_RETRY));
-  load_time_data->SetStringKey("installationText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_INSTALLATION_STATUS));
-  load_time_data->SetStringKey("watingPeersText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_WAITING_PEERS_STATUS));
-  load_time_data->SetStringKey("retryLimitPeersText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_PEERS_LIMIT_ERROR));
-  load_time_data->SetStringKey("tryAgainText",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_TRY_AGAIN));
-  load_time_data->SetStringKey("localNodeError",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_SERVICE_LAUNCH_ERROR));
-  load_time_data->SetStringKey("installationError",
-                               brave_l10n::GetLocalizedResourceUTF16String(
-                                   IDS_IPFS_ONBOARDING_INSTALLATION_ERROR));
-  load_time_data->SetStringKey(
+    base::Value::Dict& load_time_data) {
+  load_time_data.Set("tabTitle", brave_l10n::GetLocalizedResourceUTF16String(
+                                     IDS_IPFS_ONBOARDING_TITLE));
+  load_time_data.Set("heading", brave_l10n::GetLocalizedResourceUTF16String(
+                                    IDS_IPFS_ONBOARDING_HEADING));
+  load_time_data.Set("primaryParagraph",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_ONBOARDING_PRIMARY_PARAGRAPH));
+  load_time_data.Set("localNodeButton",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_ONBOARDING_LOCAL_NODE_BUTTON));
+  load_time_data.Set("publicGatewayButton",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_ONBOARDING_PUBLIC_GATEWAY_BUTTON));
+  load_time_data.Set("learnMore", brave_l10n::GetLocalizedResourceUTF16String(
+                                      IDS_IPFS_ONBOARDING_LEARN_MORE));
+  load_time_data.Set("localNodeText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_ONBOARDING_LOCAL_NODE_TEXT));
+  load_time_data.Set("publicGatewayText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_ONBOARDING_PUBLIC_GATEWAY_TEXT));
+  load_time_data.Set("footerText", brave_l10n::GetLocalizedResourceUTF16String(
+                                       IDS_IPFS_ONBOARDING_FOOTER_TEXT));
+  load_time_data.Set("settings", brave_l10n::GetLocalizedResourceUTF16String(
+                                     IDS_IPFS_ONBOARDING_SETTINGS));
+  load_time_data.Set("retryText", brave_l10n::GetLocalizedResourceUTF16String(
+                                      IDS_IPFS_SERVICE_LAUNCH_RETRY));
+  load_time_data.Set("installationText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_ONBOARDING_INSTALLATION_STATUS));
+  load_time_data.Set("watingPeersText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_ONBOARDING_WAITING_PEERS_STATUS));
+  load_time_data.Set("retryLimitPeersText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_ONBOARDING_PEERS_LIMIT_ERROR));
+  load_time_data.Set("tryAgainText",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_ONBOARDING_TRY_AGAIN));
+  load_time_data.Set("localNodeError",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_SERVICE_LAUNCH_ERROR));
+  load_time_data.Set("installationError",
+                     brave_l10n::GetLocalizedResourceUTF16String(
+                         IDS_IPFS_ONBOARDING_INSTALLATION_ERROR));
+  load_time_data.Set(
       "peersError",
       l10n_util::GetStringFUTF16(IDS_IPFS_ONBOARDING_PEERS_ERROR, u"{value}"));
 
@@ -262,11 +256,11 @@ void IPFSOnboardingPage::PopulateInterstitialStrings(
       ui::NativeTheme::GetInstanceForNativeUi()->ShouldUseDarkColors()
           ? u"dark"
           : u"light";
-  load_time_data->SetStringKey("braveTheme", theme_type);
-  load_time_data->SetStringKey("os", "");
+  load_time_data.Set("braveTheme", theme_type);
+  load_time_data.Set("os", "");
 #else
-  load_time_data->SetStringKey("braveTheme", "light");
-  load_time_data->SetStringKey("os", "Android");
+  load_time_data.Set("braveTheme", "light");
+  load_time_data.Set("os", "Android");
 #endif
 }
 
diff --git a/components/ipfs/ipfs_onboarding_page.h b/components/ipfs/ipfs_onboarding_page.h
index a15844ef6137..caa39d75a178 100644
--- a/components/ipfs/ipfs_onboarding_page.h
+++ b/components/ipfs/ipfs_onboarding_page.h
@@ -94,7 +94,7 @@ class IPFSOnboardingPage
 
  protected:
   // SecurityInterstitialPage::
-  void PopulateInterstitialStrings(base::Value* load_time_data) override;
+  void PopulateInterstitialStrings(base::Value::Dict& load_time_data) override;
   int GetHTMLTemplateId() override;
 
  private:
diff --git a/components/l10n/common/locale_util.cc b/components/l10n/common/locale_util.cc
index 672084ef0f2e..78c85a3c7191 100644
--- a/components/l10n/common/locale_util.cc
+++ b/components/l10n/common/locale_util.cc
@@ -6,11 +6,11 @@
 #include "brave/components/l10n/common/locale_util.h"
 
 #include <algorithm>
-#include <codecvt>
 #include <vector>
 
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace brave_l10n {
@@ -71,10 +71,12 @@ std::string GetCountryCode(
 }
 
 std::u16string GetLocalizedResourceUTF16String(int resource_id) {
-  std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter;
-  return converter.from_bytes(
+  std::string value =
       ui::ResourceBundle::GetSharedInstance().LoadLocalizedResourceString(
-          resource_id));
+          resource_id);
+  std::u16string output;
+  base::UTF8ToUTF16(value.data(), value.size(), &output);
+  return output;
 }
 
 }  // namespace brave_l10n
diff --git a/components/management_strings.grdp b/components/management_strings.grdp
index b926f48b929d..ad93b814d539 100644
--- a/components/management_strings.grdp
+++ b/components/management_strings.grdp
@@ -10,16 +10,18 @@
 -->
 <!--This file is created by l10nUtil.js. Do not edit manually.-->
 <grit-part>
-  <!-- Title of the page -->
-  <message name="IDS_MANAGEMENT_TITLE" desc="Title of management page.">
-    Settings - Management
-  </message>
-  <message name="IDS_MANAGEMENT_TOOLBAR_TITLE" desc="Title of the toolbar in the management page.">
-    Settings
-  </message>
-
+  <if expr="not is_ios">
+    <!-- Title of the page -->
+    <message name="IDS_MANAGEMENT_TITLE" desc="Title of management page.">
+      Settings - Management
+    </message>
+    <message name="IDS_MANAGEMENT_TOOLBAR_TITLE" desc="Title of the toolbar in the management page.">
+      Settings
+    </message>
+  </if>
+  
   <!-- Subtitles of the ChromeOS version of the management page -->
- <if expr="chromeos_ash">
+  <if expr="chromeos_ash">
     <message name="IDS_MANAGEMENT_SUBTITLE_MANAGED" desc="Title of chrome://management page, shows when device is managed by an unknown manager">
       Your <ph name="DEVICE_NAME">$1<ex>Chromebook</ex></ph> is managed
     </message>
@@ -42,28 +44,39 @@
     <message name="IDS_MANAGEMENT_NOT_MANAGED_SUBTITLE" desc="Title of chrome://management page for a browser that is not managed">
       Your browser is not managed
     </message>
+    <message name="IDS_MANAGEMENT_SUBTITLE_BROWSER_AND_PROFILE_DIFFERENT_MANAGED_BY" desc="Text displayed to inform that the browser is managed by BROWSER_DOMAIN and the profile by PROFILE_DOMAIN.">
+      Your browser is managed by <ph name="BROWSER_DOMAIN">$1<ex>foo.com</ex></ph> and your profile is managed by <ph name="PROFILE_DOMAIN">$2<ex>bar.com</ex></ph>
+    </message>
+    <message name="IDS_MANAGEMENT_SUBTITLE_BROWSER_AND_PROFILE_SAME_MANAGED_BY" desc="Text displayed to inform that the browser and profile are managed by the same DOMAIN.">
+      Your profile and browser are managed by <ph name="DOMAIN">$1<ex>google.com</ex></ph>
+    </message>
+    <message name="IDS_MANAGEMENT_SUBTITLE_PROFILE_MANAGED_BY" desc="Text displayed to inform the user that the browser is managed by DOMAIN. [iOS only]">
+      Your profile is managed by <ph name="DOMAIN">$1<ex>google.com</ex></ph>
+    </message>
   </if>
 
-  <!-- Browser managed status section -->
-  <if expr="not chromeos_ash">
-    <if expr="_google_chrome">
-      <message name="IDS_MANAGEMENT_BROWSER_NOTICE" desc="Message shown when the (Brave-branded) Brave browser is managed, it indicates what the administrator can do on the browser.">
-      Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Brave. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
-      </message>
-      <message name="IDS_MANAGEMENT_NOT_MANAGED_NOTICE" desc="Message indicating that the (Brave-branded) Brave browser is not managed">
-       This browser is not managed by a company or other organization. Activity on this device may be managed outside of Brave. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
-      </message>
-    </if>
-    <if expr="not _google_chrome">
-      <message name="IDS_MANAGEMENT_BROWSER_NOTICE" desc="Message shown when the (non-Brave-branded) Brave browser is managed, it indicates what the administrator can do on the browser.">
-      Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Brave. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
-      </message>
-      <message name="IDS_MANAGEMENT_NOT_MANAGED_NOTICE" desc="Message indicating that the (non-Brave-branded) Brave browser is not managed">
-       This browser is not managed by a company or other organization. Activity on this device may be managed outside of Brave. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
-      </message>
+  <if expr="not is_ios">
+    <!-- Browser managed status section -->
+    <if expr="not chromeos_ash">
+      <if expr="_google_chrome">
+        <message name="IDS_MANAGEMENT_BROWSER_NOTICE" desc="Message shown when the (Brave-branded) Brave browser is managed, it indicates what the administrator can do on the browser.">
+        Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Brave. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
+        </message>
+        <message name="IDS_MANAGEMENT_NOT_MANAGED_NOTICE" desc="Message indicating that the (Brave-branded) Brave browser is not managed">
+        This browser is not managed by a company or other organization. Activity on this device may be managed outside of Brave. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
+        </message>
+      </if>
+      <if expr="not _google_chrome">
+        <message name="IDS_MANAGEMENT_BROWSER_NOTICE" desc="Message shown when the (non-Brave-branded) Brave browser is managed, it indicates what the administrator can do on the browser.">
+        Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Brave. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
+        </message>
+        <message name="IDS_MANAGEMENT_NOT_MANAGED_NOTICE" desc="Message indicating that the (non-Brave-branded) Brave browser is not managed">
+        This browser is not managed by a company or other organization. Activity on this device may be managed outside of Brave. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
+        </message>
+      </if>
     </if>
   </if>
-
+  
   <!-- ChromeOS managed status section -->
   <if expr="chromeos_ash">
     <message name="IDS_MANAGEMENT_DEVICE_NOT_MANAGED" desc="Message indicating that the device and account are not managed">
@@ -175,114 +188,116 @@
     </message>
   </if>
 
-  <!-- Strings related to extension reporting section of the management page -->
-  <message name="IDS_MANAGEMENT_EXTENSION_REPORTING" desc="Title of the force installed extensions section of the page">
-    Extensions
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSIONS_INSTALLED" desc="Message describing that the administrator has installed some powerful extensions on the managed user's browser">
-    The administrator of this device has installed extensions for additional functions. Extensions have access to some of your data.
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSIONS_INSTALLED_BY" desc="Message describing that the administrator has installed some powerful extensions on the managed user's browser from a specific domain">
-    <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph> has installed extensions for additional functions. Extensions have access to some of your data.
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSIONS_NAME" desc="Title of a column of the extension table showing the name of the extension" meaning="Name of an inanimate object">
-    Name
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSIONS_PERMISSIONS" desc="Title of a column of the extension table showing the permissions of the extension">
-    Permissions
-  </message>
+  <if expr="not is_ios">
+    <!-- Strings related to extension reporting section of the management page -->
+    <message name="IDS_MANAGEMENT_EXTENSION_REPORTING" desc="Title of the force installed extensions section of the page">
+      Extensions
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSIONS_INSTALLED" desc="Message describing that the administrator has installed some powerful extensions on the managed user's browser">
+      The administrator of this device has installed extensions for additional functions. Extensions have access to some of your data.
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSIONS_INSTALLED_BY" desc="Message describing that the administrator has installed some powerful extensions on the managed user's browser from a specific domain">
+      <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph> has installed extensions for additional functions. Extensions have access to some of your data.
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSIONS_NAME" desc="Title of a column of the extension table showing the name of the extension" meaning="Name of an inanimate object">
+      Name
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSIONS_PERMISSIONS" desc="Title of a column of the extension table showing the permissions of the extension">
+      Permissions
+    </message>
 
-  <!-- Strings related to website managed configuration of the management page -->
-  <message name="IDS_MANAGEMENT_MANAGED_WEBSITES" desc="Title of the configured websites section of the page">
-    Websites with info from your organization
-  </message>
-  <message name="IDS_MANAGEMENT_MANAGED_WEBSITES_EXPLANATION" desc="Message describing that administrator has set some preset organization data to be sent to the following websites">
-    The administrator of this device has sent some info to the following websites, like settings or policies.
-  </message>
-  <message name="IDS_MANAGEMENT_MANAGED_WEBSITES_BY_EXPLANATION" desc="Message describing that administrator has set some preset organization data to be sent to the following websites">
-    Your organization, <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph>, has sent some info to the following websites, like settings or policies.
-  </message>
+    <!-- Strings related to website managed configuration of the management page -->
+    <message name="IDS_MANAGEMENT_MANAGED_WEBSITES" desc="Title of the configured websites section of the page">
+      Websites with info from your organization
+    </message>
+    <message name="IDS_MANAGEMENT_MANAGED_WEBSITES_EXPLANATION" desc="Message describing that administrator has set some preset organization data to be sent to the following websites">
+      The administrator of this device has sent some info to the following websites, like settings or policies.
+    </message>
+    <message name="IDS_MANAGEMENT_MANAGED_WEBSITES_BY_EXPLANATION" desc="Message describing that administrator has set some preset organization data to be sent to the following websites">
+      Your organization, <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph>, has sent some info to the following websites, like settings or policies.
+    </message>
 
 
-  <!-- Strings related to browser reporting section of the management page -->
-  <message name="IDS_MANAGEMENT_BROWSER_REPORTING" desc="Title of the types of browser reporting section of the page" formatter_data="android_java">
-    Browser
-  </message>
-  <message name="IDS_MANAGEMENT_BROWSER_REPORTING_EXPLANATION" desc="Message explaining browser reporting" formatter_data="android_java">
-    Your administrator can see:
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSION_REPORT_MACHINE_NAME" desc="Message explaining that an extension currently reports the user's machine name">
-    Your device name
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSION_REPORT_MACHINE_NAME_ADDRESS" desc="Message explaining that an extension currently reports the user's machine name and address">
-    Your device name and network address
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSION_REPORT_USERNAME" desc="Message explaining that an extension currently reports the user's username" formatter_data="android_java">
-    Your device username and Brave username
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSION_REPORT_VERSION" desc="Message explaining that an extension currently reports the user's browser and machine version" formatter_data="android_java">
-    Version information about your device and browser
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSION_REPORT_EXTENSIONS_PLUGINS" desc="Message explaining that an extension currently reports the user's exensions and plugins">
-    Which extensions and plugins you have installed
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSION_REPORT_USER_BROWSING_DATA" desc="Message explaining that an extension currently reports the user's browsing data">
-    Websites you visit and time spent on them
-  </message>
-  <message name="IDS_MANAGEMENT_EXTENSION_REPORT_PERF_CRASH" desc="Message explaining that an extension currently reports the user's  performance data and crash report">
-    Performance data and crash reports
-  </message>
+    <!-- Strings related to browser reporting section of the management page -->
+    <message name="IDS_MANAGEMENT_BROWSER_REPORTING" desc="Title of the types of browser reporting section of the page" formatter_data="android_java">
+      Browser
+    </message>
+    <message name="IDS_MANAGEMENT_BROWSER_REPORTING_EXPLANATION" desc="Message explaining browser reporting" formatter_data="android_java">
+      Your administrator can see:
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSION_REPORT_MACHINE_NAME" desc="Message explaining that an extension currently reports the user's machine name">
+      Your device name
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSION_REPORT_MACHINE_NAME_ADDRESS" desc="Message explaining that an extension currently reports the user's machine name and address">
+      Your device name and network address
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSION_REPORT_USERNAME" desc="Message explaining that an extension currently reports the user's username" formatter_data="android_java">
+      Your device username and Brave username
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSION_REPORT_VERSION" desc="Message explaining that an extension currently reports the user's browser and machine version" formatter_data="android_java">
+      Version information about your device and browser
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSION_REPORT_EXTENSIONS_PLUGINS" desc="Message explaining that an extension currently reports the user's exensions and plugins">
+      Which extensions and plugins you have installed
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSION_REPORT_USER_BROWSING_DATA" desc="Message explaining that an extension currently reports the user's browsing data">
+      Websites you visit and time spent on them
+    </message>
+    <message name="IDS_MANAGEMENT_EXTENSION_REPORT_PERF_CRASH" desc="Message explaining that an extension currently reports the user's  performance data and crash report">
+      Performance data and crash reports
+    </message>
 
-  <!-- Strings related to Brave Enterprise Connectors -->
-  <message name="IDS_MANAGEMENT_THREAT_PROTECTION" desc="Title of the Brave Enterprise Connectors section of the page">
-    Brave Enterprise Connectors
-  </message>
-  <message name="IDS_MANAGEMENT_THREAT_PROTECTION_DESCRIPTION" desc="Description of the Brave Enterprise Connectors section of the page">
-    Your administrator has turned on Brave Enterprise Connectors on your browser. These connectors have access to some of your data.
-  </message>
-  <message name="IDS_MANAGEMENT_THREAT_PROTECTION_DESCRIPTION_BY" desc="Description of the Brave Enterprise Connectors section of the page">
-    <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph> has turned on Brave Enterprise Connectors on your browser. These connectors have access to some of your data.
-  </message>
-  <message name="IDS_MANAGEMENT_CONNECTORS_EVENT" desc="Title of a column of the Connectors table showing the event that triggers a Connector">
-    Event
-  </message>
-  <message name="IDS_MANAGEMENT_CONNECTORS_VISIBLE_DATA" desc="Title of a column of the Connectors table showing the data visible to a Connector">
-    Visible data
-  </message>
-  <message name="IDS_MANAGEMENT_FILE_ATTACHED_EVENT" desc="Event for the file attachment scanning feature.">
-    File is attached
-  </message>
-  <message name="IDS_MANAGEMENT_FILE_DOWNLOADED_EVENT" desc="Event for the file download scanning feature.">
-    File is downloaded
-  </message>
-  <message name="IDS_MANAGEMENT_TEXT_ENTERED_EVENT" desc="Event for the text entry scanning feature.">
-    Text is entered
-  </message>
-  <message name="IDS_MANAGEMENT_PAGE_PRINTED_EVENT" desc="Event for the page print scanning feature.">
-    Page is printed
-  </message>
-  <message name="IDS_MANAGEMENT_ENTERPRISE_REPORTING_EVENT" desc="Event for the enterprise reporting feature">
-    Security event occurs
-  </message>
-  <message name="IDS_MANAGEMENT_PAGE_VISITED_EVENT" desc="Event for the real time URL check feature.">
-    Page is visited
-  </message>
-  <message name="IDS_MANAGEMENT_FILE_ATTACHED_VISIBLE_DATA" desc="Description of the visible data for the file attachment scanning feature.">
-    Files you upload or attach are sent to Google Cloud or third parties for analysis. For example, they might be scanned for sensitive data or malware.
-  </message>
-  <message name="IDS_MANAGEMENT_FILE_DOWNLOADED_VISIBLE_DATA" desc="Description of the visible data for the file download scanning feature.">
-    Files you download are sent to Google Cloud or third parties for analysis. For example, they might be scanned for sensitive data or malware.
-  </message>
-  <message name="IDS_MANAGEMENT_TEXT_ENTERED_VISIBLE_DATA" desc="Description of the visible data for the text entry scanning feature.">
-    Text you paste or attach is sent to Google Cloud or third parties for analysis. For example, it might be scanned for sensitive data.
-  </message>
-  <message name="IDS_MANAGEMENT_PAGE_PRINTED_VISIBLE_DATA" desc="Description of the visible data for the page print scanning feature.">
-    The content of pages you print is sent to Google Cloud or third parties for analysis. For example, it might be scanned for sensitive data.
-  </message>
-  <message name="IDS_MANAGEMENT_ENTERPRISE_REPORTING_VISIBLE_DATA" desc="Description of the visible data for the Connectors reporting feature">
-    When security events are flagged by Brave, relevant data about the events is sent to your administrator. This can include URLs of pages you visit in Brave, file names or metadata, and the username that you use to sign in to web based applications, your device and Brave.
-  </message>
-  <message name="IDS_MANAGEMENT_PAGE_VISITED_VISIBLE_DATA" desc="Description of the visible data for the real time URL check feature.">
-    URLs of pages you visit are sent to Google Cloud or third parties for analysis. For example, they might be scanned to detect unsafe websites.
-  </message>
+    <!-- Strings related to Brave Enterprise Connectors -->
+    <message name="IDS_MANAGEMENT_THREAT_PROTECTION" desc="Title of the Brave Enterprise Connectors section of the page">
+      Brave Enterprise Connectors
+    </message>
+    <message name="IDS_MANAGEMENT_THREAT_PROTECTION_DESCRIPTION" desc="Description of the Brave Enterprise Connectors section of the page">
+      Your administrator has turned on Brave Enterprise Connectors on your browser. These connectors have access to some of your data.
+    </message>
+    <message name="IDS_MANAGEMENT_THREAT_PROTECTION_DESCRIPTION_BY" desc="Description of the Brave Enterprise Connectors section of the page">
+      <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph> has turned on Brave Enterprise Connectors on your browser. These connectors have access to some of your data.
+    </message>
+    <message name="IDS_MANAGEMENT_CONNECTORS_EVENT" desc="Title of a column of the Connectors table showing the event that triggers a Connector">
+      Event
+    </message>
+    <message name="IDS_MANAGEMENT_CONNECTORS_VISIBLE_DATA" desc="Title of a column of the Connectors table showing the data visible to a Connector">
+      Visible data
+    </message>
+    <message name="IDS_MANAGEMENT_FILE_ATTACHED_EVENT" desc="Event for the file attachment scanning feature.">
+      File is attached
+    </message>
+    <message name="IDS_MANAGEMENT_FILE_DOWNLOADED_EVENT" desc="Event for the file download scanning feature.">
+      File is downloaded
+    </message>
+    <message name="IDS_MANAGEMENT_TEXT_ENTERED_EVENT" desc="Event for the text entry scanning feature.">
+      Text is entered
+    </message>
+    <message name="IDS_MANAGEMENT_PAGE_PRINTED_EVENT" desc="Event for the page print scanning feature.">
+      Page is printed
+    </message>
+    <message name="IDS_MANAGEMENT_ENTERPRISE_REPORTING_EVENT" desc="Event for the enterprise reporting feature">
+      Security event occurs
+    </message>
+    <message name="IDS_MANAGEMENT_PAGE_VISITED_EVENT" desc="Event for the real time URL check feature.">
+      Page is visited
+    </message>
+    <message name="IDS_MANAGEMENT_FILE_ATTACHED_VISIBLE_DATA" desc="Description of the visible data for the file attachment scanning feature.">
+      Files you upload or attach are sent to Google Cloud or third parties for analysis. For example, they might be scanned for sensitive data or malware.
+    </message>
+    <message name="IDS_MANAGEMENT_FILE_DOWNLOADED_VISIBLE_DATA" desc="Description of the visible data for the file download scanning feature.">
+      Files you download are sent to Google Cloud or third parties for analysis. For example, they might be scanned for sensitive data or malware.
+    </message>
+    <message name="IDS_MANAGEMENT_TEXT_ENTERED_VISIBLE_DATA" desc="Description of the visible data for the text entry scanning feature.">
+      Text you paste or attach is sent to Google Cloud or third parties for analysis. For example, it might be scanned for sensitive data.
+    </message>
+    <message name="IDS_MANAGEMENT_PAGE_PRINTED_VISIBLE_DATA" desc="Description of the visible data for the page print scanning feature.">
+      The content of pages you print is sent to Google Cloud or third parties for analysis. For example, it might be scanned for sensitive data.
+    </message>
+    <message name="IDS_MANAGEMENT_ENTERPRISE_REPORTING_VISIBLE_DATA" desc="Description of the visible data for the Connectors reporting feature">
+      When security events are flagged by Brave, relevant data about the events is sent to your administrator. This can include URLs of pages you visit in Brave, file names or metadata, and the username that you use to sign in to web based applications, your device and Brave.
+    </message>
+    <message name="IDS_MANAGEMENT_PAGE_VISITED_VISIBLE_DATA" desc="Description of the visible data for the real time URL check feature.">
+      URLs of pages you visit are sent to Google Cloud or third parties for analysis. For example, they might be scanned to detect unsafe websites.
+    </message>
+  </if>
 </grit-part>
diff --git a/components/omnibox/browser/brave_bookmark_provider_unittest.cc b/components/omnibox/browser/brave_bookmark_provider_unittest.cc
index 85ede8efe1be..9b34845a222e 100644
--- a/components/omnibox/browser/brave_bookmark_provider_unittest.cc
+++ b/components/omnibox/browser/brave_bookmark_provider_unittest.cc
@@ -17,6 +17,7 @@
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/test_scheme_classifier.h"
 #include "components/prefs/pref_service.h"
+#include "components/search_engines/template_url_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -40,6 +41,8 @@ class BraveBookmarkProviderTest : public testing::Test {
     auto* node = client_.GetBookmarkModel()->other_node();
     client_.GetBookmarkModel()->AddURL(node, 0, u"Hello",
                                        GURL("https://example.com"));
+    client_.set_template_url_service(
+        std::make_unique<TemplateURLService>(nullptr, 0));
     provider_ = base::MakeRefCounted<BraveBookmarkProvider>(&client_);
   }
 
diff --git a/components/omnibox/browser/brave_history_url_provider_unittest.cc b/components/omnibox/browser/brave_history_url_provider_unittest.cc
index 4d06a7773923..c24e9a2d61b7 100644
--- a/components/omnibox/browser/brave_history_url_provider_unittest.cc
+++ b/components/omnibox/browser/brave_history_url_provider_unittest.cc
@@ -52,7 +52,8 @@ class BraveHistoryURLProviderTest : public testing::Test,
   }
 
   // AutocompleteProviderListener:
-  void OnProviderUpdate(bool updated_matches) override {
+  void OnProviderUpdate(bool updated_matches,
+                        const AutocompleteProvider* provider) override {
     if (autocomplete_->done())
       run_loop_.QuitWhenIdle();
   }
diff --git a/components/permissions/contexts/brave_wallet_permission_context.cc b/components/permissions/contexts/brave_wallet_permission_context.cc
index 57ab47284678..41fdc68380b5 100644
--- a/components/permissions/contexts/brave_wallet_permission_context.cc
+++ b/components/permissions/contexts/brave_wallet_permission_context.cc
@@ -208,7 +208,7 @@ void BraveWalletPermissionContext::GetAllowedAccounts(
 
   // Fail if there is no last committed URL yet
   auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-  if (web_contents->GetMainFrame()->GetLastCommittedURL().is_empty()) {
+  if (web_contents->GetPrimaryMainFrame()->GetLastCommittedURL().is_empty()) {
     std::move(callback).Run(true, std::vector<std::string>());
     return;
   }
diff --git a/components/permissions/permission_lifetime_utils.cc b/components/permissions/permission_lifetime_utils.cc
index 52f90b82ba90..5d43c984f2c9 100644
--- a/components/permissions/permission_lifetime_utils.cc
+++ b/components/permissions/permission_lifetime_utils.cc
@@ -91,11 +91,11 @@ bool ShouldShowLifetimeOptions(PermissionPrompt::Delegate* delegate) {
 }
 
 void SetRequestsLifetime(const std::vector<PermissionLifetimeOption>& options,
-                         int index,
+                         size_t index,
                          PermissionPrompt::Delegate* delegate) {
   DCHECK(base::FeatureList::IsEnabled(features::kPermissionLifetime));
   DCHECK(!options.empty());
-  DCHECK(index >= 0 && static_cast<size_t>(index) < options.size());
+  DCHECK(index < options.size());
   const auto& lifetime = options[index].lifetime;
   DLOG(INFO) << "Set permission lifetime "
              << (lifetime ? lifetime->InSeconds() : -1);
diff --git a/components/permissions/permission_lifetime_utils.h b/components/permissions/permission_lifetime_utils.h
index d9c1451ea89e..dc1262ee0dc6 100644
--- a/components/permissions/permission_lifetime_utils.h
+++ b/components/permissions/permission_lifetime_utils.h
@@ -23,7 +23,7 @@ bool ShouldShowLifetimeOptions(PermissionPrompt::Delegate* delegate);
 
 // Sets selected lifetime in all queued requests.
 void SetRequestsLifetime(const std::vector<PermissionLifetimeOption>& options,
-                         int index,
+                         size_t index,
                          PermissionPrompt::Delegate* delegate);
 
 }  // namespace permissions
diff --git a/components/playlist/playlist_download_request_manager.cc b/components/playlist/playlist_download_request_manager.cc
index 87f349f22f90..8e2baa676b1f 100644
--- a/components/playlist/playlist_download_request_manager.cc
+++ b/components/playlist/playlist_download_request_manager.cc
@@ -127,7 +127,7 @@ bool PlaylistDownloadRequestManager::ReadyToRunMediaDetectorScript() const {
 
 void PlaylistDownloadRequestManager::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
-  DCHECK(web_contents_->GetMainFrame());
+  DCHECK(web_contents_->GetPrimaryMainFrame());
 
   // This script is from
   // https://github.com/brave/brave-ios/blob/development/Client/Frontend/UserContent/UserScripts/PlaylistSwizzler.js
@@ -146,22 +146,22 @@ void PlaylistDownloadRequestManager::DidFinishNavigation(
 
   // In order to hide js API from main world, use testing
   // api temporarily.
-  web_contents_->GetMainFrame()->ExecuteJavaScriptForTests(
+  web_contents_->GetPrimaryMainFrame()->ExecuteJavaScriptForTests(
       kScriptToHideMediaSourceAPI, base::NullCallback());
 }
 
 void PlaylistDownloadRequestManager::DidFinishLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url) {
-  if (render_frame_host != web_contents_->GetMainFrame())
+  if (render_frame_host != web_contents_->GetPrimaryMainFrame())
     return;
 
   if (in_progress_urls_count_ == 0 || callback_for_current_request_.is_null())
     return;
 
-  DCHECK(web_contents_->GetMainFrame());
+  DCHECK(web_contents_->GetPrimaryMainFrame());
 
-  web_contents_->GetMainFrame()->ExecuteJavaScriptInIsolatedWorld(
+  web_contents_->GetPrimaryMainFrame()->ExecuteJavaScriptInIsolatedWorld(
       base::UTF8ToUTF16(media_detector_script_),
       base::BindOnce(&PlaylistDownloadRequestManager::OnGetMedia,
                      weak_factory_.GetWeakPtr()),
diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp
index 5d4f1391004e..0712d105ba07 100644
--- a/components/policy_strings.grdp
+++ b/components/policy_strings.grdp
@@ -194,6 +194,9 @@
   <message name="IDS_POLICY_SCHEMA_VALIDATION_ERROR" desc="The text displayed in the status column when the policy value doesn't conform to the policy schema.">
     Schema validation error at "<ph name="ERROR_PATH">$1<ex>AC.Delays.ScreenOff</ex></ph>": <ph name="ERROR">$2<ex>Value is out of range.</ex></ph>
   </message>
+  <message name="IDS_POLICY_SCHEMA_VALIDATION_ERROR_WITHOUT_PATH" desc="The text displayed in the status column when the policy value doesn't conform to the policy schema.">
+    Schema validation error: <ph name="ERROR">$1<ex>Value is out of range.</ex></ph>
+  </message>
   <message name="IDS_POLICY_INVALID_JSON_ERROR" desc="The text displayed in the status column when the policy value should be a valid JSON string, but it cannot be parsed as JSON.">
     Error while parsing JSON value: <ph name="ERROR">$1<ex>Line 2, Column 3: Map keys must be quoted.</ex></ph>
   </message>
diff --git a/components/privacy_sandbox/brave_privacy_sandbox_settings.cc b/components/privacy_sandbox/brave_privacy_sandbox_settings.cc
index 6b4205d2a248..3f5924ed22be 100644
--- a/components/privacy_sandbox/brave_privacy_sandbox_settings.cc
+++ b/components/privacy_sandbox/brave_privacy_sandbox_settings.cc
@@ -25,7 +25,7 @@ BravePrivacySandboxSettings::BravePrivacySandboxSettings(
                                               pref_service,
                                               incognito_profile),
       pref_service_(pref_service) {
-  // Register observers for the Privacy Sandbox & FLoC preferences.
+  // Register observers for the Privacy Sandbox.
   user_prefs_registrar_.Init(pref_service_);
   user_prefs_registrar_.Add(
       prefs::kPrivacySandboxApisEnabled,
@@ -37,11 +37,6 @@ BravePrivacySandboxSettings::BravePrivacySandboxSettings(
       base::BindRepeating(
           &BravePrivacySandboxSettings::OnPrivacySandboxPrefChanged,
           base::Unretained(this)));
-  user_prefs_registrar_.Add(
-      prefs::kPrivacySandboxFlocEnabled,
-      base::BindRepeating(
-          &BravePrivacySandboxSettings::OnPrivacySandboxPrefChanged,
-          base::Unretained(this)));
 }
 
 BravePrivacySandboxSettings::~BravePrivacySandboxSettings() = default;
@@ -55,7 +50,4 @@ void BravePrivacySandboxSettings::OnPrivacySandboxPrefChanged() {
   if (pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabledV2)) {
     pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, false);
   }
-  if (pref_service_->GetBoolean(prefs::kPrivacySandboxFlocEnabled)) {
-    pref_service_->SetBoolean(prefs::kPrivacySandboxFlocEnabled, false);
-  }
 }
diff --git a/components/security_interstitials_strings.grdp b/components/security_interstitials_strings.grdp
index 40dcadfe0bf5..c68df345a5de 100644
--- a/components/security_interstitials_strings.grdp
+++ b/components/security_interstitials_strings.grdp
@@ -420,45 +420,6 @@
     Proceed
   </message>
 
-  <!-- Origin Policy Error Interstial -->
-  <message name="IDS_ORIGIN_POLICY_TITLE" desc="Title of the Origin Policy Error interstitial.">
-    Origin Policy Error
-  </message>
-  <message name="IDS_ORIGIN_POLICY_HEADING" desc="The large heading at the top of the Origin Policy Error Interstitial">
-    Blocked according to <ph name="ORIGIN">$2</ph>'s origin policy.
-  </message>
-  <message name="IDS_ORIGIN_POLICY_INFO" desc="The primary explanatory paragraph for the Origin Policy Error interstitial.">
-    The site <ph name="ORIGIN">$2</ph> has requested that an origin policy
-    apply to all requests to it, but this policy cannot presently be applied.
-  </message>
-  <message name="IDS_ORIGIN_POLICY_INFO2" desc="The second paragraph of the text of the Origin Policy Error Interstitial. (Presently intentionally left blank.)" />
-  <message name="IDS_ORIGIN_POLICY_BUTTON" desc="The text for the Origin Policy Error Interstitial button that takes the user back to the previous page">
-    Back to safety
-  </message>
-  <message name="IDS_ORIGIN_POLICY_DETAILS" desc="The text for the Origin Policy Error Interstitial button that contains additional information.">
-    Advanced
-  </message>
-  <message name="IDS_ORIGIN_POLICY_EXPLANATION_CANNOT_LOAD" desc="The text of the Origin Policy Error Interstitial that will be displayed when the user presses the 'Advanced' button for additional information, for the case where the policy was requested but could not be loaded.">
-    The server you are going to, <ph name="ORIGIN">$2</ph>, has requested that
-    an origin policy be applied to all requests to it. But it has now failed to
-    deliver a policy, which prevents the browser from fulfilling your request
-    for <ph name="SITE">$1</ph>. Origin policies can be used by site operators
-    to configure security and other properties for a site.
-  </message>
-  <message name="IDS_ORIGIN_POLICY_EXPLANATION_CANNOT_PARSE_HEADER" desc="The text of the Origin Policy Error Interstitial that will be displayed when the user presses the 'Advanced' button for additional information, for the case where the policy header could not be parsed.">
-    The server you are going to, <ph name="ORIGIN">$2</ph>, has set a header
-    requiring that an origin policy be applied to all requests to it. But
-    the header is malformed, which prevents the browser from fulfilling
-    your request for <ph name="SITE">$1</ph>. Origin policies can be used by
-    site operators to configure security and other properties for a site.
-  </message>
-  <message name="IDS_ORIGIN_POLICY_FINAL_PARAGRAPH" desc="The text of the Origin Policy Error Interstitial that a user can click to proceed to the site, despite the error.">
-    <ph name="BEGIN_LINK">&lt;a href="#" id="proceed-link"&gt;</ph>Proceed to <ph name="SITE">$1<ex>example.com</ex></ph><ph name="END_LINK">&lt;/a&gt;</ph>
-  </message>
-  <message name="IDS_ORIGIN_POLICY_CLOSE" desc="The text of the Origin Policy Error Interstitial that will hide the 'advanced' section again.">
-    Hide advanced
-  </message>
-
   <if expr="not is_ios">
     <!-- Blocked interception interstitial strings -->
     <message name="IDS_BLOCKED_INTERCEPTION_HEADING" desc="Large heading of the known interception interstitial.">
diff --git a/components/services/ipfs/ipfs_service_utils.cc b/components/services/ipfs/ipfs_service_utils.cc
index fb87a095a25b..3e616ed83057 100644
--- a/components/services/ipfs/ipfs_service_utils.cc
+++ b/components/services/ipfs/ipfs_service_utils.cc
@@ -31,11 +31,9 @@ namespace ipfs {
 bool UpdateConfigJSON(const std::string& source,
                       const ipfs::mojom::IpfsConfig* config,
                       std::string* result) {
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          source, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                      base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v = base::JSONReader::Read(
+      source, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                  base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     VLOG(1) << "Could not parse JSON, JSON is: " << source;
     return false;
diff --git a/components/site_settings_strings.grdp b/components/site_settings_strings.grdp
index e384d17f6542..6ccf19bf3224 100644
--- a/components/site_settings_strings.grdp
+++ b/components/site_settings_strings.grdp
@@ -62,6 +62,12 @@
   <message name="IDS_SITE_SETTINGS_TYPE_COOKIES_MID_SENTENCE" desc="The label used for the cookies and site data site settings controls when used mid-sentence.">
     cookies and site data
   </message>
+  <message name="IDS_SITE_SETTINGS_TYPE_FEDERATED_IDENTITY_API" desc="The label used for the third-party sign-in site settings controls.">
+    Third-party sign-in
+  </message>
+  <message name="IDS_SITE_SETTINGS_TYPE_FEDERATED_IDENTITY_API_MID_SENTENCE" desc="The label used for the third-party sign-in site settings controls when used mid-sentence.">
+    third-party sign-in
+  </message>
   <message name="IDS_SITE_SETTINGS_TYPE_IDLE_DETECTION" desc="The label used for the idle detection site settings controls.">
     Your device use
   </message>
@@ -149,12 +155,6 @@
 
   <!-- Site Settings desktop-only -->
   <if expr="not is_android">
-  <message name="IDS_SITE_SETTINGS_TYPE_FEDERATED_IDENTITY_API" desc="The label used for the third-party sign-in site settings controls.">
-    Third-party sign-in
-  </message>
-  <message name="IDS_SITE_SETTINGS_TYPE_FEDERATED_IDENTITY_API_MID_SENTENCE" desc="The label used for the third-party sign-in site settings controls when used mid-sentence.">
-    third-party sign-in
-  </message>
   <message name="IDS_SITE_SETTINGS_TYPE_FILE_SYSTEM_ACCESS_WRITE" desc="The label used for the File System Access write site settings controls. The write permission determines whether sites are allowed to save to the original file that was selected by the user through the File System Access API.">
     File editing
   </message>
diff --git a/components/skus/renderer/skus_js_handler.cc b/components/skus/renderer/skus_js_handler.cc
index 7c2a1720268c..f9e6a4d38101 100644
--- a/components/skus/renderer/skus_js_handler.cc
+++ b/components/skus/renderer/skus_js_handler.cc
@@ -136,11 +136,9 @@ void SkusJSHandler::OnRefreshOrder(
 
   v8::Local<v8::Promise::Resolver> resolver = promise_resolver.Get(isolate);
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          response, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                        base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v = base::JSONReader::Read(
+      response, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                    base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     v8::Local<v8::String> result =
         v8::String::NewFromUtf8(isolate, "Error parsing JSON response")
@@ -149,8 +147,8 @@ void SkusJSHandler::OnRefreshOrder(
     return;
   }
 
-  const base::DictionaryValue* result_dict;
-  if (!records_v->GetAsDictionary(&result_dict)) {
+  const base::Value::Dict* result_dict = records_v->GetIfDict();
+  if (!result_dict) {
     v8::Local<v8::String> result =
         v8::String::NewFromUtf8(isolate,
                                 "Error converting response to dictionary")
@@ -160,7 +158,7 @@ void SkusJSHandler::OnRefreshOrder(
   }
 
   v8::Local<v8::Value> local_result =
-      content::V8ValueConverter::Create()->ToV8Value(result_dict, context);
+      content::V8ValueConverter::Create()->ToV8Value(*result_dict, context);
   std::ignore = resolver->Resolve(context, local_result);
 }
 
@@ -295,11 +293,9 @@ void SkusJSHandler::OnCredentialSummary(
 
   v8::Local<v8::Promise::Resolver> resolver = promise_resolver.Get(isolate);
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          response, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
-                        base::JSONParserOptions::JSON_PARSE_RFC);
-  absl::optional<base::Value>& records_v = value_with_error.value;
+  absl::optional<base::Value> records_v = base::JSONReader::Read(
+      response, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                    base::JSONParserOptions::JSON_PARSE_RFC);
   if (!records_v) {
     v8::Local<v8::String> result =
         v8::String::NewFromUtf8(isolate, "Error parsing JSON response")
@@ -308,8 +304,8 @@ void SkusJSHandler::OnCredentialSummary(
     return;
   }
 
-  const base::DictionaryValue* result_dict;
-  if (!records_v->GetAsDictionary(&result_dict)) {
+  const base::Value::Dict* result_dict = records_v->GetIfDict();
+  if (!result_dict) {
     v8::Local<v8::String> result =
         v8::String::NewFromUtf8(isolate,
                                 "Error converting response to dictionary")
@@ -321,7 +317,7 @@ void SkusJSHandler::OnCredentialSummary(
   vpn_service_->LoadPurchasedState(domain);
 #endif
   v8::Local<v8::Value> local_result =
-      content::V8ValueConverter::Create()->ToV8Value(result_dict, context);
+      content::V8ValueConverter::Create()->ToV8Value(*result_dict, context);
   std::ignore = resolver->Resolve(context, local_result);
 }
 
diff --git a/components/time_period_storage/daily_storage.cc b/components/time_period_storage/daily_storage.cc
index a8aa886e8055..45a5997b892c 100644
--- a/components/time_period_storage/daily_storage.cc
+++ b/components/time_period_storage/daily_storage.cc
@@ -61,10 +61,7 @@ void DailyStorage::FilterToDay() {
 
 void DailyStorage::Load() {
   DCHECK(daily_values_.empty());
-  // TODO(cdesouza): From cr105, this function return a reference rather than a
-  // pointer. Leaving a dereference here for now, but once this breaks on 105,
-  // please remove this comment and the dereferencing bellow.
-  const base::Value::List& list = *prefs_->GetValueList(pref_name_);
+  const base::Value::List& list = prefs_->GetValueList(pref_name_);
   base::Time min = clock_->Now() - base::Days(1);
   for (const auto& it : list) {
     DCHECK(it.is_dict());
diff --git a/components/time_period_storage/time_period_storage.cc b/components/time_period_storage/time_period_storage.cc
index 40aa09c6934b..7aa81d210e87 100644
--- a/components/time_period_storage/time_period_storage.cc
+++ b/components/time_period_storage/time_period_storage.cc
@@ -152,10 +152,7 @@ void TimePeriodStorage::FilterToPeriod() {
 
 void TimePeriodStorage::Load() {
   DCHECK(daily_values_.empty());
-  // TODO(cdesouza): From cr105, this function return a reference rather than a
-  // pointer. Leaving a dereference here for now, but once this breaks on 105,
-  // please remove this comment and the dereferencing bellow.
-  const base::Value::List& list = *prefs_->GetValueList(pref_name_);
+  const base::Value::List& list = prefs_->GetValueList(pref_name_);
   for (const auto& it : list) {
     DCHECK(it.is_dict());
     const base::Value::Dict& dict = it.GetDict();
diff --git a/components/tor/tor_profile_service_impl.cc b/components/tor/tor_profile_service_impl.cc
index 160fb6c54a2d..156577b7a9a1 100644
--- a/components/tor/tor_profile_service_impl.cc
+++ b/components/tor/tor_profile_service_impl.cc
@@ -87,8 +87,7 @@ class TorProxyLookupClient : public network::mojom::ProxyLookupClient {
   mojo::PendingRemote<network::mojom::ProxyLookupClient>
   GetProxyLookupClient() {
     mojo::PendingRemote<network::mojom::ProxyLookupClient> pending_remote =
-        receiver_.BindNewPipeAndPassRemote(content::GetUIThreadTaskRunner(
-            {content::BrowserTaskType::kPreconnect}));
+        receiver_.BindNewPipeAndPassRemote();
     receiver_.set_disconnect_handler(base::BindOnce(
         &TorProxyLookupClient::OnProxyLookupComplete, base::Unretained(this),
         net::ERR_ABORTED, absl::nullopt));
diff --git a/components/version_ui_strings.grdp b/components/version_ui_strings.grdp
index 9df1fd484d33..0ff1c9906b3c 100644
--- a/components/version_ui_strings.grdp
+++ b/components/version_ui_strings.grdp
@@ -55,6 +55,9 @@
       Firmware Version
     </message>
   </if>
+  <message name="IDS_VERSION_UI_COPY_LABEL" desc="label for the button to copy the version string">
+    Copy version string
+  </message>
   <message name="IDS_VERSION_UI_EXECUTABLE_PATH" desc="label for the executable path on the about:version page">
     Executable Path
   </message>
diff --git a/components/webxr_strings.grdp b/components/webxr_strings.grdp
index 58bf2cd0ffbd..50fd4451aba9 100644
--- a/components/webxr_strings.grdp
+++ b/components/webxr_strings.grdp
@@ -4,13 +4,13 @@
 <grit-part>
   <if expr="enable_arcore">
     <!-- ARCore check message -->
-    <message name="IDS_AR_CORE_CHECK_MESSAGE_INSTALL_TITLE" desc="Title for the ARCore check message. When a WebXR page is loaded, if ARCore is needed to display AR content and it is not installed, a message will be shown to the user prompting them to install ARCore.">
-      Install ARCore?
+    <message name="IDS_AR_CORE_CHECK_MESSAGE_INSTALL_TITLE" desc="Title for the ARCore check message. When a WebXR page is loaded, if Google Play Services for AR is needed to display AR content and it is not installed, a message will be shown to the user prompting them to install that package.">
+      Install Google Play Services for AR?
     </message>
-    <message name="IDS_AR_CORE_CHECK_MESSAGE_UPDATE_TITLE" desc="Title for the ARCore check message. When a WebXR page is loaded, if ARCore is needed to display AR content and the installed ARCore is not up to date to the version needed by the implementation, a message will be shown to the user prompting them to update ARCore.">
-      Update ARCore?
+    <message name="IDS_AR_CORE_CHECK_MESSAGE_UPDATE_TITLE" desc="Title for the ARCore check message. When a WebXR page is loaded, if Google Play Services for AR is needed to display AR content and the installed ARCore is not up to date to the version needed by the implementation, a message will be shown to the user prompting them to update that package.">
+      Update Google Play Services for AR?
     </message>
-    <message name="IDS_AR_CORE_CHECK_MESSAGE_DESCRIPTION" desc="Description for the ARCore check message that will be prompted when a WebXR page requires ARCore to display AR content.">
+    <message name="IDS_AR_CORE_CHECK_MESSAGE_DESCRIPTION" desc="Description for the ARCore check message that will be prompted when a WebXR page requires Google Play Services for AR to display AR content.">
       View augmented reality content
     </message>
   </if>
diff --git a/ios/browser/api/certificate/brave_certificate.mm b/ios/browser/api/certificate/brave_certificate.mm
index 017737867888..a9b418745152 100644
--- a/ios/browser/api/certificate/brave_certificate.mm
+++ b/ios/browser/api/certificate/brave_certificate.mm
@@ -19,10 +19,10 @@
 #include "brave/ios/browser/api/certificate/utils/brave_certificate_utils.h"
 #include "brave/ios/browser/api/certificate/utils/brave_certificate_x509_utils.h"
 #include "net/base/net_export.h"
-#include "net/cert/internal/cert_errors.h"
-#include "net/cert/internal/parsed_certificate.h"
-#include "net/cert/internal/verify_name_match.h"
-#include "net/cert/internal/verify_signed_data.h"
+#include "net/cert/pki/cert_errors.h"
+#include "net/cert/pki/parsed_certificate.h"
+#include "net/cert/pki/verify_name_match.h"
+#include "net/cert/pki/verify_signed_data.h"
 #include "net/cert/x509_cert_types.h"
 #include "net/cert/x509_certificate.h"
 #include "net/cert/x509_util.h"
diff --git a/ios/browser/api/certificate/models/brave_certificate_public_key_info.mm b/ios/browser/api/certificate/models/brave_certificate_public_key_info.mm
index 979176aa84ba..c7935b99dea5 100644
--- a/ios/browser/api/certificate/models/brave_certificate_public_key_info.mm
+++ b/ios/browser/api/certificate/models/brave_certificate_public_key_info.mm
@@ -11,7 +11,7 @@
 #include "brave/ios/browser/api/certificate/models/brave_certificate_enums.h"
 #include "brave/ios/browser/api/certificate/utils/brave_certificate_utils.h"
 #include "brave/ios/browser/api/certificate/utils/brave_certificate_x509_utils.h"
-#include "net/cert/internal/parsed_certificate.h"
+#include "net/cert/pki/parsed_certificate.h"
 #include "net/der/input.h"
 #include "net/der/parse_values.h"
 
diff --git a/ios/browser/api/certificate/models/brave_certificate_signature.mm b/ios/browser/api/certificate/models/brave_certificate_signature.mm
index 8aa93746fcd1..52838156ae44 100644
--- a/ios/browser/api/certificate/models/brave_certificate_signature.mm
+++ b/ios/browser/api/certificate/models/brave_certificate_signature.mm
@@ -8,7 +8,7 @@
 #include "base/strings/sys_string_conversions.h"
 #include "brave/ios/browser/api/certificate/utils/brave_certificate_utils.h"
 #include "brave/ios/browser/api/certificate/utils/brave_certificate_x509_utils.h"
-#include "net/cert/internal/parsed_certificate.h"
+#include "net/cert/pki/parsed_certificate.h"
 #include "net/der/input.h"
 
 @implementation BraveCertificateSignature
diff --git a/ios/browser/api/certificate/utils/brave_certificate_x509_utils.cc b/ios/browser/api/certificate/utils/brave_certificate_x509_utils.cc
index 17f20f62e322..5f7ca46b7880 100644
--- a/ios/browser/api/certificate/utils/brave_certificate_x509_utils.cc
+++ b/ios/browser/api/certificate/utils/brave_certificate_x509_utils.cc
@@ -10,9 +10,9 @@
 #include "net/base/net_export.h"
 #include "net/cert/ct_objects_extractor.h"
 #include "net/cert/ct_serialization.h"
-#include "net/cert/internal/cert_errors.h"
-#include "net/cert/internal/parse_certificate.h"
-#include "net/cert/internal/signature_algorithm.h"
+#include "net/cert/pki/cert_errors.h"
+#include "net/cert/pki/parse_certificate.h"
+#include "net/cert/pki/signature_algorithm.h"
 #include "net/cert/signed_certificate_timestamp.h"
 #include "net/der/encode_values.h"
 #include "net/der/input.h"
diff --git a/ios/browser/api/certificate/utils/brave_certificate_x509_utils.h b/ios/browser/api/certificate/utils/brave_certificate_x509_utils.h
index 3e7876131cbb..a9f5a0d2cbdd 100644
--- a/ios/browser/api/certificate/utils/brave_certificate_x509_utils.h
+++ b/ios/browser/api/certificate/utils/brave_certificate_x509_utils.h
@@ -11,7 +11,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
-#include "net/cert/internal/signature_algorithm.h"
+#include "net/cert/pki/signature_algorithm.h"
 #include "net/cert/signed_certificate_timestamp.h"
 #include "net/der/input.h"
 #include "net/der/parse_values.h"
diff --git a/ios/browser/api/net/certificate_utility.mm b/ios/browser/api/net/certificate_utility.mm
index c2a1572a5e3c..bf32c053e809 100644
--- a/ios/browser/api/net/certificate_utility.mm
+++ b/ios/browser/api/net/certificate_utility.mm
@@ -18,9 +18,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/strings/sys_string_conversions.h"
 
-#include "net/cert/internal/cert_errors.h"
-#include "net/cert/internal/parsed_certificate.h"
 #include "net/cert/pem.h"
+#include "net/cert/pki/cert_errors.h"
+#include "net/cert/pki/parsed_certificate.h"
 #include "net/cert/x509_certificate.h"
 #include "net/cert/x509_util.h"
 #include "net/der/input.h"
diff --git a/ios/browser/api/opentabs/brave_tabgenerator_api.mm b/ios/browser/api/opentabs/brave_tabgenerator_api.mm
index 1795924a8245..2f97c0c177b7 100644
--- a/ios/browser/api/opentabs/brave_tabgenerator_api.mm
+++ b/ios/browser/api/opentabs/brave_tabgenerator_api.mm
@@ -297,7 +297,8 @@ void GoToBackForwardListItem(WKBackForwardListItem* wk_item,
 
     navigation_manager->AddPendingItem(
         url, web::Referrer(), ui::PAGE_TRANSITION_TYPED,
-        web::NavigationInitiationType::BROWSER_INITIATED, false, false);
+        web::NavigationInitiationType::BROWSER_INITIATED, false,
+        web::HttpsUpgradeType::kNone);
 
     navigation_manager->CommitPendingItem();
     static_cast<web::WebStateImpl*>(web_state_)->OnPageLoaded(url, true);
diff --git a/ios/browser/api/url/url_spoof_checker.mm b/ios/browser/api/url/url_spoof_checker.mm
index 6e861585ec08..9600d6b1174f 100644
--- a/ios/browser/api/url/url_spoof_checker.mm
+++ b/ios/browser/api/url/url_spoof_checker.mm
@@ -154,14 +154,6 @@ + (BraveURLSpoofCheckerResult*)isLookalikeURL:(NSString*)url {
              suggestedURL:nil];
   }
 
-  // If the URL is in the component updater allowlist, don't show any warning.
-  if (reputation::IsUrlAllowlistedBySafetyTipsComponent(
-          proto, response_url.GetWithEmptyPath())) {
-    return [[BraveURLSpoofCheckerResult alloc]
-        initWithMatchType:LookalikeUrlMatchType::kNone
-             suggestedURL:nil];
-  }
-
   const DomainInfo navigated_domain = GetDomainInfo(response_url);
   // Empty domain_and_registry happens on private domains.
   if (navigated_domain.domain_and_registry.empty() ||
@@ -181,7 +173,10 @@ + (BraveURLSpoofCheckerResult*)isLookalikeURL:(NSString*)url {
       });
   if (!GetMatchingDomain(navigated_domain, engaged_sites, in_target_allowlist,
                          proto, &matched_domain, &match_type)) {
-    if (ShouldBlockBySpoofCheckResult(navigated_domain)) {
+    if (ShouldBlockBySpoofCheckResult(navigated_domain) &&
+        !reputation::IsUrlAllowlistedBySafetyTipsComponent(
+            proto, response_url.GetWithEmptyPath(),
+            response_url.GetWithEmptyPath())) {
       return [[BraveURLSpoofCheckerResult alloc]
           initWithMatchType:LookalikeUrlMatchType::kFailedSpoofChecks
                suggestedURL:nil];
@@ -192,14 +187,23 @@ + (BraveURLSpoofCheckerResult*)isLookalikeURL:(NSString*)url {
              suggestedURL:nil];
   }
   DCHECK(!matched_domain.empty());
+  const std::string suggested_domain = GetETLDPlusOne(matched_domain);
+  DCHECK(!suggested_domain.empty());
+  GURL::Replacements replace_host;
+  replace_host.SetHostStr(suggested_domain);
+  const GURL suggested_url =
+      response_url.ReplaceComponents(replace_host).GetWithEmptyPath();
+
+  // If the URL is in the component updater allowlist, don't show any warning.
+  if (reputation::IsUrlAllowlistedBySafetyTipsComponent(
+          proto, response_url.GetWithEmptyPath(),
+          suggested_url.GetWithEmptyPath())) {
+    return [[BraveURLSpoofCheckerResult alloc]
+        initWithMatchType:LookalikeUrlMatchType::kNone
+             suggestedURL:nil];
+  }
 
   if (ShouldBlockLookalikeUrlNavigation(match_type)) {
-    const std::string suggested_domain = GetETLDPlusOne(matched_domain);
-    DCHECK(!suggested_domain.empty());
-    GURL::Replacements replace_host;
-    replace_host.SetHostStr(suggested_domain);
-    const GURL suggested_url =
-        response_url.ReplaceComponents(replace_host).GetWithEmptyPath();
     return [[BraveURLSpoofCheckerResult alloc]
         initWithMatchType:match_type
              suggestedURL:net::NSURLWithGURL(suggested_url)];
diff --git a/ios/browser/brave_web_main_parts.mm b/ios/browser/brave_web_main_parts.mm
index 064e773d471f..5608a44f0259 100644
--- a/ios/browser/brave_web_main_parts.mm
+++ b/ios/browser/brave_web_main_parts.mm
@@ -14,6 +14,7 @@
 #include "components/metrics_services_manager/metrics_services_manager.h"
 #include "components/variations/service/variations_service.h"
 #include "components/variations/variations_ids_provider.h"
+#include "components/variations/variations_switches.h"
 #include "ios/chrome/browser/application_context_impl.h"
 #include "ios/chrome/browser/browser_state/browser_state_keyed_service_factories.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
@@ -105,8 +106,14 @@
   std::vector<std::string> variation_ids;
   RegisterAllFeatureVariationParameters(&flags_storage, feature_list.get());
 
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
+
   application_context_->GetVariationsService()->SetUpFieldTrials(
-      variation_ids, std::vector<base::FeatureList::FeatureOverrideInfo>(),
+      variation_ids,
+      command_line->GetSwitchValueASCII(
+          variations::switches::kForceVariationIds),
+      std::vector<base::FeatureList::FeatureOverrideInfo>(),
       std::move(feature_list), &ios_field_trials_);
 }
 
diff --git a/ios/browser/providers/BUILD.gn b/ios/browser/providers/BUILD.gn
index da035ce59031..03842f97fcd9 100644
--- a/ios/browser/providers/BUILD.gn
+++ b/ios/browser/providers/BUILD.gn
@@ -23,10 +23,13 @@ group("brave_providers") {
     "//ios/chrome/browser/providers/omaha:chromium_omaha",
     "//ios/chrome/browser/providers/overrides:chromium_overrides",
     "//ios/chrome/browser/providers/password_auto_fill:chromium_password_auto_fill",
+    "//ios/chrome/browser/providers/push_notification:chromium_push_notification",
     "//ios/chrome/browser/providers/risk_data:chromium_risk_data",
     "//ios/chrome/browser/providers/signin:chromium_signin_error",
     "//ios/chrome/browser/providers/signin:chromium_signin_resources",
     "//ios/chrome/browser/providers/signin:chromium_signin_sso",
+    "//ios/chrome/browser/providers/signin:chromium_trusted_vault",
+    "//ios/chrome/browser/providers/text_classifier:chromium_text_classifier",
     "//ios/chrome/browser/providers/text_zoom:chromium_text_zoom",
     "//ios/chrome/browser/providers/ui_utils:chromium_ui_utils",
     "//ios/chrome/browser/providers/url_rewriters:chromium_url_rewriters",
diff --git a/net/proxy_resolution/proxy_config_service_tor_unittest.cc b/net/proxy_resolution/proxy_config_service_tor_unittest.cc
index f5097839967c..d6ae76a8d98e 100644
--- a/net/proxy_resolution/proxy_config_service_tor_unittest.cc
+++ b/net/proxy_resolution/proxy_config_service_tor_unittest.cc
@@ -134,9 +134,8 @@ TEST_F(ProxyConfigServiceTorTest, SetProxyAuthorization) {
   const std::string isolation_key2 =
       ProxyConfigServiceTor::CircuitIsolationKey(site_url2);
 
-  auto config_service =
-      ConfiguredProxyResolutionService::CreateSystemProxyConfigService(
-          base::ThreadTaskRunnerHandle::Get());
+  auto config_service = net::ProxyConfigService::CreateSystemProxyConfigService(
+      base::ThreadTaskRunnerHandle::Get());
 
   auto* service = new ConfiguredProxyResolutionService(
       std::move(config_service),
diff --git a/package.json b/package.json
index c20a5687a23b..ebd93951a5f5 100644
--- a/package.json
+++ b/package.json
@@ -257,7 +257,7 @@
     "projects": {
       "chrome": {
         "dir": "src",
-        "tag": "104.0.5112.102",
+        "tag": "105.0.5195.37",
         "repository": {
           "url": "https://github.com/chromium/chromium"
         }
diff --git a/patches/PRESUBMIT.py.patch b/patches/PRESUBMIT.py.patch
index ff2843b1adc2..40938f074ada 100644
--- a/patches/PRESUBMIT.py.patch
+++ b/patches/PRESUBMIT.py.patch
@@ -1,9 +1,18 @@
 diff --git a/PRESUBMIT.py b/PRESUBMIT.py
-index b5237cbc9988aaa046498c4491dd3b1842fe9440..915c7e79d0b0da57e74d1ac624fe742de38e97a5 100644
+index 35eb97d6756946de54435ccf1ac05ffe1c59b71a..711e407bfee3ee146471f923836e4e3e5d895de7 100644
 --- a/PRESUBMIT.py
 +++ b/PRESUBMIT.py
-@@ -6011,3 +6011,4 @@ def CheckPythonShebang(input_api, output_api):
-                 "Please use '#!/usr/bin/env python/2/3' as the shebang of %s" %
+@@ -6031,7 +6031,6 @@ def CheckPythonShebang(input_api, output_api):
                  file))
      return result
+ 
+-
+ def CheckBatchAnnotation(input_api, output_api):
+     """Checks that tests have either @Batch or @DoNotBatch annotation. If this
+     is not an instrumentation test, disregard."""
+@@ -6094,3 +6093,5 @@ Robolectric tests do not need a @Batch or @DoNotBatch annotations.
+ """, extra_annotation_errors))
+ 
+     return results
++
 +if not globals().get('__name__'): from lib.import_inline import inline_module; inline_module('chromium_presubmit_overrides', globals(), locals())
diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch
index d9740f329ca6..ce1705301072 100644
--- a/patches/base-BUILD.gn.patch
+++ b/patches/base-BUILD.gn.patch
@@ -1,10 +1,10 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 2b1a93670de430138c32493e2eabe475d7839c23..f1995c0b72443d7086de809132aeaadfd221d506 100644
+index 9fc667eaa2bcfe32058a2f8eabaf2f137e410284..c4d1485154e6beb7c6dbaecc9ef24db8e679a387 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -4202,6 +4202,7 @@ if (is_android) {
+@@ -4237,6 +4237,7 @@ if (is_android) {
+       "android/java/src/org/chromium/base/task/TaskTraits.java",
        "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
-       "android/java/src/org/chromium/base/time/Timer.java",
      ]
 +    sources += brave_java_base_sources
  
diff --git a/patches/base-feature_list.cc.patch b/patches/base-feature_list.cc.patch
new file mode 100644
index 000000000000..4c69806c6c73
--- /dev/null
+++ b/patches/base-feature_list.cc.patch
@@ -0,0 +1,13 @@
+diff --git a/base/feature_list.cc b/base/feature_list.cc
+index b9c8d0523c21d56438539f61b1e93cd02c2a4b0a..6089f3b3941790a7e91f798037ad281a393a454b 100644
+--- a/base/feature_list.cc
++++ b/base/feature_list.cc
+@@ -8,7 +8,7 @@
+ // time. Try not to raise this limit unless necessary. See
+ // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md
+ #ifndef NACL_TC_REV
+-#pragma clang max_tokens_here 600000
++#pragma clang max_tokens_here 610000
+ #endif
+ 
+ #include <string>
diff --git a/patches/base-test-launcher-test_results_tracker.cc.patch b/patches/base-test-launcher-test_results_tracker.cc.patch
index 77b51bd843ab..9006b6210a9b 100644
--- a/patches/base-test-launcher-test_results_tracker.cc.patch
+++ b/patches/base-test-launcher-test_results_tracker.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc
-index 3bdd266c5444e2eda9a96391f256b435063b867d..e36c9cdde27f2be45498452b8989c61551881df6 100644
+index 27d991e1a8d430fe6f6e75e5a305287574836339..db583bc41ae41222aed3e41ab3f21b050514d1f0 100644
 --- a/base/test/launcher/test_results_tracker.cc
 +++ b/base/test/launcher/test_results_tracker.cc
 @@ -151,6 +151,7 @@ TestResultsTracker::~TestResultsTracker() {
diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch
index 5c4e5fa4afe4..3a8abb97b245 100644
--- a/patches/base-threading-thread_restrictions.h.patch
+++ b/patches/base-threading-thread_restrictions.h.patch
@@ -1,5 +1,5 @@
 diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
-index 0f46415c50b2d7c83f5e89db50ce7d511b88e5d7..1b11487cc206f40c260867c476c3d43e015134ac 100644
+index 5455aa07547f753b83dd59c173834034d0673ae7..96b6c3c0df91e6827c49c907fb65ed2c820b91d2 100644
 --- a/base/threading/thread_restrictions.h
 +++ b/base/threading/thread_restrictions.h
 @@ -550,6 +550,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
diff --git a/patches/build-android-gyp-dex.py.patch b/patches/build-android-gyp-dex.py.patch
index 3400c6542c92..26b4214b0e97 100644
--- a/patches/build-android-gyp-dex.py.patch
+++ b/patches/build-android-gyp-dex.py.patch
@@ -1,8 +1,8 @@
 diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
-index 883e0faac64ebb6b88cfa5f045da4a8f711fd0a1..8c54b95fc5737d8079d598a6d28628b77edaee5a 100755
+index 89bacb26957304b71ee8ba90e1ae1d786f220aa0..a1300fb4c629395d9e10cf60d3e9ae61c918d1b7 100755
 --- a/build/android/gyp/dex.py
 +++ b/build/android/gyp/dex.py
-@@ -54,7 +54,7 @@ _IGNORE_WARNINGS = (
+@@ -55,7 +55,7 @@ _IGNORE_WARNINGS = (
  _SKIPPED_CLASS_FILE_NAMES = (
      'module-info.class',  # Explicitly skipped by r8/utils/FileUtils#isClassFile
  )
diff --git a/patches/build-config-android-BUILD.gn.patch b/patches/build-config-android-BUILD.gn.patch
index 9d6c4c5b6a95..3b3c9e1aae96 100644
--- a/patches/build-config-android-BUILD.gn.patch
+++ b/patches/build-config-android-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
-index 69341cea35d0c44aeb5f09b39783bd2abfcdcc43..a564159c384f1dd72cf3e890e784b2edf6edfb3c 100644
+index ec6988180492b191682e18d7a35879ef3e7fa3fb..051ca5c47811f6dd494f64fc7be1cdd7456fd9fa 100644
 --- a/build/config/android/BUILD.gn
 +++ b/build/config/android/BUILD.gn
 @@ -46,6 +46,7 @@ config("compiler") {
diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch
index c3f9695b7f3b..fecdd42416fd 100644
--- a/patches/build-config-android-config.gni.patch
+++ b/patches/build-config-android-config.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/config.gni b/build/config/android/config.gni
-index 0c19c020290c96dbe3874cbea07d022bdeebaf9e..322b0eb2c5d11cffd10e61d4b85f0b425f6930c5 100644
+index fb856a31e344653a97abdff2bc2ae844941f769d..0b8c95a17a22a97fabd2da59d18b6029dec95fa8 100644
 --- a/build/config/android/config.gni
 +++ b/build/config/android/config.gni
 @@ -8,6 +8,7 @@
diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch
index 2b2def08ff91..2f4ea46931e3 100644
--- a/patches/build-config-android-internal_rules.gni.patch
+++ b/patches/build-config-android-internal_rules.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
-index af18866bc8622409d36a386eebe8234f0ac0e425..bb8a5e447ec2a340d773a9432a972feed37bbc17 100644
+index 12be71c2d83e78c70b851ed1e499b3ed9280a8cd..55433ef1369f795520a1a85c09515338ca9d1810 100644
 --- a/build/config/android/internal_rules.gni
 +++ b/build/config/android/internal_rules.gni
-@@ -3857,6 +3857,7 @@ if (enable_java_templates) {
+@@ -3892,6 +3892,7 @@ if (enable_java_templates) {
        } else {
          not_needed(invoker, [ "missing_classes_allowlist" ])
        }
diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch
index 9059fcd5faa2..7a65c0a6454a 100644
--- a/patches/build-config-android-rules.gni.patch
+++ b/patches/build-config-android-rules.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index 61a9c96fd1383143ee9c5476b338d1c2334ff9ca..9d293bb3bfda571cfabd17973487810d92517003 100644
+index 15d9977580d3ae93c68be50984f533cf03553ebc..53c1cc256c1846fe9b43815fe5bd78cb40fe9c5b 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
 @@ -500,6 +500,7 @@ if (enable_java_templates) {
diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch
index 323b1cd92a31..9c767063efff 100644
--- a/patches/build-config-compiler-BUILD.gn.patch
+++ b/patches/build-config-compiler-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index df8610696cc6ed7c334a81058802d3136e07b6b4..79a8702b7c956eb6c3dd85afeade088ece26d24a 100644
+index b6aaae9b69576bfa7259034945607d222d45c36d..b0e245ebe1174e5011203e005e7d3d75a7e5c5f9 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1680,6 +1680,7 @@ config("chromium_code") {
+@@ -1683,6 +1683,7 @@ config("chromium_code") {
        ]
      }
    }
diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch
index 92f67a0bdf2d..71fdec0b5d91 100644
--- a/patches/chrome-BUILD.gn.patch
+++ b/patches/chrome-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb375efcb3 100644
+index 7804140cb03f5bfb23a07bcfbbaea3a5ea156ed9..2972dcec8152392b09213b8e56671f30bc304f27 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -174,6 +174,7 @@ if (!is_android && !is_mac) {
+@@ -189,6 +189,7 @@ if (!is_android && !is_mac) {
          "common/crash_keys.cc",
          "common/crash_keys.h",
        ]
@@ -10,7 +10,7 @@ index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb
  
        deps += [
          ":chrome_dll",
-@@ -465,11 +466,12 @@ if (is_win) {
+@@ -487,11 +488,12 @@ if (is_win) {
        args += [ "--privileged_helper_id=$privileged_helper_name" ]
      }
    }
@@ -24,7 +24,7 @@ index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb
      extra_substitutions = [
        "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
        "CHROMIUM_SHORT_NAME=$chrome_product_short_name",
-@@ -489,6 +491,7 @@ if (is_win) {
+@@ -511,6 +513,7 @@ if (is_win) {
        "//chrome/common:buildflags",
        "//chrome/common:version_header",
      ]
@@ -32,7 +32,7 @@ index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb
  
      if (enable_stripping) {
        # At link time, preserve the global symbols specified in the .exports
-@@ -565,7 +568,7 @@ if (is_win) {
+@@ -587,7 +590,7 @@ if (is_win) {
      args =
          [
            "-b",
@@ -41,7 +41,7 @@ index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb
            "-v",
            chrome_version_full,
            "-g",
-@@ -639,6 +642,7 @@ if (is_win) {
+@@ -661,6 +664,7 @@ if (is_win) {
        # this dependency directly copies the file into the framework's
        # resources directory.
        public_deps += [ ":chrome_framework_widevine_signature" ]
@@ -49,7 +49,7 @@ index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb
      }
    }
  
-@@ -682,9 +686,11 @@ if (is_win) {
+@@ -704,9 +708,11 @@ if (is_win) {
        "--scm=0",
      ]
    }
@@ -61,7 +61,7 @@ index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb
      if (is_chrome_branded) {
        # These entitlements are bound to the official Google Chrome signing
        # certificate and will not necessarily work in any other build.
-@@ -709,6 +715,7 @@ if (is_win) {
+@@ -731,6 +737,7 @@ if (is_win) {
          info_plist_target = invoker.info_plist_target
        } else {
          info_plist_target = ":chrome_helper_plist"
@@ -69,7 +69,7 @@ index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb
        }
  
        extra_substitutions = [
-@@ -1196,6 +1203,7 @@ if (is_win) {
+@@ -1218,6 +1225,7 @@ if (is_win) {
        chrome_dylib_version,
        "-Wl,-order_file," + rebase_path("app/framework.order", root_build_dir),
      ]
@@ -77,7 +77,7 @@ index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb
  
      if (!is_component_build) {
        # Specify a sensible install_name for static builds. The library is
-@@ -1374,6 +1382,7 @@ if (is_win) {
+@@ -1396,6 +1404,7 @@ if (is_win) {
  
  group("dependencies") {
    public_deps = [
@@ -85,7 +85,7 @@ index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb
      "//build:branding_buildflags",
      "//build:chromeos_buildflags",
      "//chrome/browser",
-@@ -1445,7 +1454,7 @@ group("dependencies") {
+@@ -1467,7 +1476,7 @@ group("dependencies") {
  
  if (is_win) {
    process_version_rc_template("chrome_exe_version") {
@@ -94,7 +94,7 @@ index abbbfc5db4d63d6b31a062e0394438354030f3e8..dac250127b9a02ee79e1a36f99da16cb
      output = "$target_gen_dir/chrome_exe_version.rc"
    }
  
-@@ -1499,6 +1508,7 @@ group("resources") {
+@@ -1521,6 +1530,7 @@ group("resources") {
      "//chrome/browser:resources",
      "//chrome/common:resources",
      "//chrome/renderer:resources",
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 533244949f5f..7b0c63a913c2 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 1ae877cabde0f91178433e4b238e53da0fd5535a..671caa1a4a64d81149cb1fcd28f166a3851c0f09 100644
+index d8497022e5c014c6a45c232b1cfd2417b00cd7e0..df5c47fd58763c9b2f73688d7f44d877dc590167 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
- MAJOR=104
+ MAJOR=105
 -MINOR=0
--BUILD=5112
--PATCH=102
+-BUILD=5195
+-PATCH=37
 +MINOR=1
 +BUILD=44
 +PATCH=63
diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
index 96d0c95d368a..2886211d5328 100644
--- a/patches/chrome-android-BUILD.gn.patch
+++ b/patches/chrome-android-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001d6c1f23d 100644
+index 7c56c68ac60d531a5bc3828775df8f1f1e0467eb..d54c93512a01184f09fd132f5d824125963ecfda 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -197,6 +197,7 @@ android_resources("chrome_base_module_resources") {
@@ -10,7 +10,7 @@ index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001
  }
  
  android_resources("chrome_app_java_resources") {
-@@ -271,6 +272,7 @@ android_resources("chrome_app_java_resources") {
+@@ -272,6 +273,7 @@ android_resources("chrome_app_java_resources") {
      "//third_party/androidx:androidx_gridlayout_gridlayout_java",
      "//third_party/androidx:androidx_preference_preference_java",
    ]
@@ -18,7 +18,7 @@ index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001
  }
  
  if (enable_vr) {
-@@ -660,6 +662,7 @@ android_library("chrome_java") {
+@@ -667,6 +669,7 @@ android_library("chrome_java") {
    ]
  
    deps += feed_deps
@@ -26,7 +26,7 @@ index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001
  
    srcjar_deps = [
      ":autofill_verification_status_generated_enum",
-@@ -687,6 +690,7 @@ android_library("chrome_java") {
+@@ -694,6 +697,7 @@ android_library("chrome_java") {
      "//components/offline_pages/core:offline_page_model_enums_java",
      "//net:effective_connection_type_java",
    ]
@@ -34,7 +34,7 @@ index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001
  
    # From java_sources.gni.
    sources = chrome_java_sources + [ app_hooks_impl ]
-@@ -818,6 +822,7 @@ java_group("chrome_all_java") {
+@@ -832,6 +836,7 @@ java_group("chrome_all_java") {
        "//chrome/android/features/tab_ui:module_desc_java",
      ]
    }
@@ -42,7 +42,7 @@ index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001
  }
  
  # This is a list of all base module jni headers. New features should add their
-@@ -866,6 +871,7 @@ group("jni_headers") {
+@@ -881,6 +886,7 @@ group("jni_headers") {
      "//components/ukm/android:jni_headers",
      "//components/webauthn/android:jni_headers",
    ]
@@ -50,7 +50,7 @@ index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001
  }
  
  action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
-@@ -1975,6 +1981,7 @@ android_resources("chrome_public_apk_base_module_resources") {
+@@ -2073,6 +2079,7 @@ android_resources("chrome_public_apk_base_module_resources") {
      "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
      "java/res_chromium_base/values/channel_constants.xml",
    ]
@@ -58,7 +58,7 @@ index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001
  
    # Dep needed to ensure override works properly.
    deps = [ ":chrome_base_module_resources" ]
-@@ -2295,6 +2302,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2392,6 +2399,7 @@ if (current_toolchain == default_toolchain) {
          ":${_variant}_locale_pak_assets",
          ":${_variant}_paks",
        ]
@@ -66,7 +66,7 @@ index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001
        if (_is_monochrome) {
          deps += [ "//android_webview:locale_pak_assets" ]
          if (webview_includes_weblayer && !_is_bundle_module) {
-@@ -2554,6 +2562,7 @@ template("chrome_public_apk_or_module_tmpl") {
+@@ -2667,6 +2675,7 @@ template("chrome_public_apk_or_module_tmpl") {
      load_library_from_apk = chromium_linker_supported
  
      version_name = chrome_version_name
@@ -74,7 +74,7 @@ index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001
    }
  }
  
-@@ -2697,6 +2706,7 @@ android_library("base_module_java") {
+@@ -2810,6 +2819,7 @@ android_library("base_module_java") {
      "//components/payments/content/android:service_java",
      "//third_party/androidx:androidx_browser_browser_java",
    ]
@@ -82,7 +82,7 @@ index 03b350ffa467e7b9929674617ddfabc88a23e51f..e38db8640904532da57c85d8dd974001
  
    # More deps for DFMs.
    if (dfmify_dev_ui) {
-@@ -2853,6 +2863,7 @@ template("monochrome_public_apk_or_module_tmpl") {
+@@ -2966,6 +2976,7 @@ template("monochrome_public_apk_or_module_tmpl") {
          deps += [ "//weblayer/browser/java:upstream_java" ]
        }
      }
diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch
index 72bce12978e9..a6ae5875d05a 100644
--- a/patches/chrome-android-chrome_java_sources.gni.patch
+++ b/patches/chrome-android-chrome_java_sources.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
-index 31a71eb593ea3f7a1e8e10b311169e7db10f1907..b1cb547e3faa499e7b7dd9fc0036a16501a7c33a 100644
+index 8631d3871c94aab771e9b40b9870a84a0b82ea6c..dd477f8af52735248ccefaaf5a5029cf261fe897 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1219,3 +1219,4 @@ chrome_java_sources = [
+@@ -1222,3 +1222,4 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java",
    "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
  ]
diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch
index d1ceec19e449..c268c62e20e4 100644
--- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch
+++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
-index 6fb71709dd398673f7950c0d33b39565bbd83ffe..6d5affe1eaac2cd8e27a9179ba25661bed0bb386 100644
+index bf289305713f8e6db146171c824d807195b5daf9..d2436821d95af736a8ffa05395ac7dc36826847d 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
 @@ -181,6 +181,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
@@ -10,7 +10,7 @@ index 6fb71709dd398673f7950c0d33b39565bbd83ffe..6d5affe1eaac2cd8e27a9179ba25661b
  
      # Note most of these, with the exception of resource_exclusion_exceptions,
      # are currently duplicated in system_webview_apk_tmpl.gni.
-@@ -277,6 +278,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
+@@ -290,6 +291,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
        if (!defined(proguard_configs)) {
          proguard_configs = []
        }
diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch
index 5e30b62390e8..9579be4566f1 100644
--- a/patches/chrome-android-expectations-lint-suppressions.xml.patch
+++ b/patches/chrome-android-expectations-lint-suppressions.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml
-index 5572d76f0d852840b4dcb0228a483a0575a34b47..5e08f61c689fadd2da5c5c2169a8826422b23842 100644
+index aa3982c9d6a9f43c696799048d55671fad474271..1c347c1673bd9db2b0632207d42abb4bdf3be225 100644
 --- a/chrome/android/expectations/lint-suppressions.xml
 +++ b/chrome/android/expectations/lint-suppressions.xml
-@@ -296,4 +296,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
+@@ -299,4 +299,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
      <!-- Discussed in crbug.com/1069204, ignoring this class of errors since these are Q+ constants. -->
      <ignore regexp="Must be one of: LineBreaker.BREAK_STRATEGY_SIMPLE, LineBreaker.BREAK_STRATEGY_HIGH_QUALITY, LineBreaker.BREAK_STRATEGY_BALANCED"/>
    </issue>
diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch
index b700e880cd61..e6ec745d8544 100644
--- a/patches/chrome-android-java-AndroidManifest.xml.patch
+++ b/patches/chrome-android-java-AndroidManifest.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index 3bcbcdb5ab8ab6d8a6bb7dfdd19367a56fc54d53..3b69eb3e12fbcf61d4b7cbfb35f9743fb8258a7e 100644
+index 15c4f76eff3d71436d9f2af1f45d933068b75a3c..dcf473e5ce566aedc44b843492c604dd7ae66eee 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -26,6 +26,7 @@ by a child template that "extends" this file.
@@ -79,7 +79,7 @@ index 3bcbcdb5ab8ab6d8a6bb7dfdd19367a56fc54d53..3b69eb3e12fbcf61d4b7cbfb35f9743f
              <meta-data android:name="android.app.searchable"
                  android:resource="@xml/searchable" />
          </activity-alias>
-@@ -1214,6 +1229,7 @@ by a child template that "extends" this file.
+@@ -1188,6 +1203,7 @@ by a child template that "extends" this file.
              android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
          </activity>
  
@@ -87,11 +87,11 @@ index 3bcbcdb5ab8ab6d8a6bb7dfdd19367a56fc54d53..3b69eb3e12fbcf61d4b7cbfb35f9743f
          {% block extra_application_definitions %}
          {% endblock %}
        {% endmacro %}
-@@ -1292,6 +1308,7 @@ by a child template that "extends" this file.
+@@ -1266,6 +1282,7 @@ by a child template that "extends" this file.
        <!-- ARCore APK integration -->
        <!-- This tag indicates that this application optionally uses ARCore. -->
        <meta-data android:name="com.google.ar.core" android:value="optional" />
-+        <meta-data android:name="com.google.ar.core.min_apk_version" android:value="202940000"/><activity android:name="com.google.ar.core.InstallActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:excludeFromRecents="true" android:exported="false" android:launchMode="singleTop" android:theme="@android:style/Theme.Material.Light.Dialog.Alert" />
++        <meta-data android:name="com.google.ar.core.min_apk_version" android:value="221020000"/><activity android:name="com.google.ar.core.InstallActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:excludeFromRecents="true" android:exported="false" android:launchMode="singleTop" android:theme="@android:style/Theme.Material.Light.Dialog.Alert" />
        {% endif %}
  
        <!-- Cast support -->
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch
index fd8572b0c22c..afdd63b4f771 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
-index 9670f5b1aa017cc4969afa753c1909e2ce24bccb..9624bea5328cfb9318f91d583b780e1b02125fa3 100644
+index 9706a1bf1a7d16b2efa05eb43ba2a8d1382207ae..371e6f32ac25dcb267fe3dabf73fb0fbc72bfc2f 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
 @@ -73,7 +73,7 @@ public abstract class AppHooks {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch
index 8426f687ce1d..a5491dd23814 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch
@@ -1,9 +1,9 @@
 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 87574808da6eb4ad9ab4342e38b3be7cb1c4eaeb..106d94d65be1d9d08cb77ad3411b0652537b5f4c 100644
+index 34fb55ab008df1831f9e6764a4b1085dd47015a6..13bb6086b390e1436879307e16ef34a14b577e12 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
-@@ -399,7 +399,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-     private Callback<TabModelSelector> mSelectionPopupBackPressInitCallback;
+@@ -402,7 +402,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+     private StylusWritingCoordinator mStylusWritingCoordinator;
  
      protected ChromeActivity() {
 -        mIntentHandler = new IntentHandler(this, createIntentHandlerDelegate());
diff --git a/patches/chrome-android-java_sources.gni.patch b/patches/chrome-android-java_sources.gni.patch
index 3dbeb44fdc5d..45df69a52b17 100644
--- a/patches/chrome-android-java_sources.gni.patch
+++ b/patches/chrome-android-java_sources.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
-index b2721e0d36082c07cb7cc26f958547381c3d450c..b4ebfabf402464adc3162f67790b2961245c5861 100644
+index 3af185eb2d04268de73a444c9daea6fd7021118d..092d1188aa2531403d9a37eda8f82856e5140f24 100644
 --- a/chrome/android/java_sources.gni
 +++ b/chrome/android/java_sources.gni
 @@ -25,6 +25,7 @@ import("//components/offline_pages/buildflags/features.gni")
diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch
index 872ed83ae6c8..dbb47722295a 100644
--- a/patches/chrome-app-BUILD.gn.patch
+++ b/patches/chrome-app-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
-index 04e4ae004cf9e038dedb402fdf7ce3bbbf229dba..ae498f8d6004dfac6a5f4e250308a41c359729f5 100644
+index 237d86b53904222dc2fe9a667bc5dcfaff5e79d1..2bf79ee915c14fcbb2e045c69bc81c4c700c38b4 100644
 --- a/chrome/app/BUILD.gn
 +++ b/chrome/app/BUILD.gn
-@@ -100,6 +100,8 @@ grit("generated_resources") {
+@@ -109,6 +109,8 @@ grit("generated_resources") {
    if (is_android) {
      outputs += android_generated_java_resources
    }
@@ -11,7 +11,7 @@ index 04e4ae004cf9e038dedb402fdf7ce3bbbf229dba..ae498f8d6004dfac6a5f4e250308a41c
  }
  
  if (is_android) {
-@@ -135,7 +137,7 @@ grit("google_chrome_strings") {
+@@ -144,7 +146,7 @@ grit("google_chrome_strings") {
  }
  
  grit("chromium_strings") {
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
index e55d67aa4812..87c61d57bbbf 100644
--- a/patches/chrome-browser-BUILD.gn.patch
+++ b/patches/chrome-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index bbe8847b3da8d6ec9c5d10bbe875de8c34e060d3..8839df0d13d255c56e0819135bf09b7336312cf0 100644
+index a5d471c22e01c95c099f7b173731955c675d8c13..cedf0d6b3ce8ac0e4e7862c1c08c3cb0211dde97 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2487,6 +2487,7 @@ static_library("browser") {
+@@ -2490,6 +2490,7 @@ static_library("browser") {
        "performance_monitor/metric_evaluator_helper_posix.h",
      ]
    }
diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
index a3c835f1a177..3a343e39e334 100644
--- a/patches/chrome-browser-about_flags.cc.patch
+++ b/patches/chrome-browser-about_flags.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index f70e3c7f3924f77b0e622b38239bc632b183b0af..739efe9191654a19d842a7e8683aa2793668be77 100644
+index 6ba1656aa24a75adea36f8aa8ce1f2433f87010c..3885726772bf1723285b8d5a1567b5857709ce17 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3271,6 +3271,7 @@ const FeatureEntry::FeatureVariation kDesktopSharePreviewVariations[] = {
+@@ -3280,6 +3280,7 @@ const FeatureEntry::FeatureVariation
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {
diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch
index 46ecc5a9efb6..ecd6cee8a5cf 100644
--- a/patches/chrome-browser-browser_process_impl.h.patch
+++ b/patches/chrome-browser-browser_process_impl.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
-index a3eabe6f0ef595cc254f9a609682de3036539740..a73a8541ad547ddda47923c437fa0a557225107c 100644
+index e2b4d0a33d8ca980194ee4d05dcc833e863d170f..c267c159b64ec35a287359336a33e92e8de2eac7 100644
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
 @@ -215,6 +215,7 @@ class BrowserProcessImpl : public BrowserProcess,
diff --git a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch
index 344a33aed4a2..1e77c60ecd68 100644
--- a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch
+++ b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc
-index a1c4ba52c2abfffa4a3e0958b1e08cbe15f498ee..f7ccc411f616121634b0d5494c043bd968303415 100644
+index 975ba6c5b267d7f1dc9b4772c55e1976d84f72de..9f592931f898870a8e7a9b993c467e81c37822e8 100644
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc
 @@ -98,5 +98,5 @@ ChromeBrowsingDataRemoverDelegateFactory::GetBrowserContextToUse(
diff --git a/patches/chrome-browser-download-download_item_model.h.patch b/patches/chrome-browser-download-download_item_model.h.patch
index 1a8e585b4cf1..8635b5914f2a 100644
--- a/patches/chrome-browser-download-download_item_model.h.patch
+++ b/patches/chrome-browser-download-download_item_model.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
-index 8358f379b77881ea4e87ecad8a937c209e0af7a8..c92b020320b282b0aa8dee9fbc84c7e3a9cb8e25 100644
+index 935192355ab3066c2d52927d92ffae2cb5a9767a..c7c81c7c0f5696e00960e55288cd65c5fef51933 100644
 --- a/chrome/browser/download/download_item_model.h
 +++ b/chrome/browser/download/download_item_model.h
-@@ -125,6 +125,7 @@ class DownloadItemModel : public DownloadUIModel,
+@@ -133,6 +133,7 @@ class DownloadItemModel : public DownloadUIModel,
    void OnDownloadDestroyed(download::DownloadItem* download) override;
  
   private:
diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch
index 890dfbadb22a..0acc3d592b00 100644
--- a/patches/chrome-browser-extensions-BUILD.gn.patch
+++ b/patches/chrome-browser-extensions-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
-index 98a0ac5041209213ed9f53c3aded801e3a5ad14f..63052622b8b86207c1efd8f975ff9e00d4fcb624 100644
+index 9a61d5cc1a1c33017cad6fd9e0d4617fc824ecf8..8f950eeb4b4621555289160016f902f6ee39c515 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -1334,6 +1334,7 @@ static_library("extensions") {
+@@ -1362,6 +1362,7 @@ static_library("extensions") {
    } else {
      sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
    }
diff --git a/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch b/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch
index 1fb0466f9bea..4e1e8f67d25e 100644
--- a/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch
+++ b/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
-index 24c2561d4cd27244a11d448ed61deabcad6e3a34..fcbb57fa1e1198da59a0815a77f285f9434c43ea 100644
+index b377740b4bd4898e2414a043255e8bb88ec02af4..7321ebb6905fc9c63ea6e00b13d290b3a2a0b4ac 100644
 --- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
 +++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
 @@ -4,6 +4,8 @@
@@ -40,7 +40,7 @@ index 24c2561d4cd27244a11d448ed61deabcad6e3a34..fcbb57fa1e1198da59a0815a77f285f9
    if (gaia_id.empty() || IsPrimaryAccountOnly()) {
      // Try the primary account.
      // TODO(https://crbug.com/932400): collapse the asynchronicity
-@@ -404,11 +421,17 @@ void IdentityGetAuthTokenFunction::StartSigninFlow() {
+@@ -405,11 +422,17 @@ void IdentityGetAuthTokenFunction::StartSigninFlow() {
  
  void IdentityGetAuthTokenFunction::StartMintTokenFlow(
      IdentityMintRequestQueue::MintType type) {
@@ -62,7 +62,7 @@ index 24c2561d4cd27244a11d448ed61deabcad6e3a34..fcbb57fa1e1198da59a0815a77f285f9
  #endif
    TRACE_EVENT_NESTABLE_ASYNC_BEGIN1("identity", "MintTokenFlow", this, "type",
                                      type);
-@@ -494,6 +517,14 @@ void IdentityGetAuthTokenFunction::StartMintToken(
+@@ -495,6 +518,14 @@ void IdentityGetAuthTokenFunction::StartMintToken(
          }
  #endif
  
@@ -77,7 +77,7 @@ index 24c2561d4cd27244a11d448ed61deabcad6e3a34..fcbb57fa1e1198da59a0815a77f285f9
          if (oauth2_info.auto_approve && *oauth2_info.auto_approve) {
            // oauth2_info.auto_approve is protected by an allowlist in
            // _manifest_features.json hence only selected extensions take
-@@ -536,6 +567,11 @@ void IdentityGetAuthTokenFunction::StartMintToken(
+@@ -537,6 +568,11 @@ void IdentityGetAuthTokenFunction::StartMintToken(
                                     cache_entry.granted_scopes());
          break;
        case IdentityTokenCacheValue::CACHE_STATUS_NOTFOUND:
@@ -89,7 +89,7 @@ index 24c2561d4cd27244a11d448ed61deabcad6e3a34..fcbb57fa1e1198da59a0815a77f285f9
        case IdentityTokenCacheValue::CACHE_STATUS_REMOTE_CONSENT:
          ShowRemoteConsentDialog(resolution_data_);
          break;
-@@ -610,6 +646,33 @@ void IdentityGetAuthTokenFunction::OnRemoteConsentSuccess(
+@@ -611,6 +647,33 @@ void IdentityGetAuthTokenFunction::OnRemoteConsentSuccess(
    StartMintTokenFlow(IdentityMintRequestQueue::MINT_TYPE_INTERACTIVE);
  }
  
@@ -123,7 +123,7 @@ index 24c2561d4cd27244a11d448ed61deabcad6e3a34..fcbb57fa1e1198da59a0815a77f285f9
  void IdentityGetAuthTokenFunction::OnRefreshTokenUpdatedForAccount(
      const CoreAccountInfo& account_info) {
    if (account_listening_mode_ != AccountListeningMode::kListeningTokens)
-@@ -759,6 +822,88 @@ void IdentityGetAuthTokenFunction::OnGaiaRemoteConsentFlowApproved(
+@@ -760,6 +823,88 @@ void IdentityGetAuthTokenFunction::OnGaiaRemoteConsentFlowApproved(
    StartMintTokenFlow(IdentityMintRequestQueue::MINT_TYPE_NONINTERACTIVE);
  }
  
diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch
index 35b9fc93efad..34ebbc3380f8 100644
--- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch
+++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
-index dab2f9850dec564b4e642f08c8e27d2871d7c71a..ad580f50b3b3b478cdd68ee191b1c2dec7700f8b 100644
+index 48748ca6bfc43c457f1caf89b3724ac539259af2..e00104b261ed051fd7844672424d4c9d726cc332 100644
 --- a/chrome/browser/extensions/extension_tab_util.cc
 +++ b/chrome/browser/extensions/extension_tab_util.cc
-@@ -814,6 +814,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
+@@ -815,6 +815,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
    };
  
    if (!url.SchemeIs(content::kChromeUIScheme))
diff --git a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch
index a909c8c70f53..e9cb86a23bfe 100644
--- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch
+++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc
-index 29eba47dbb454c0c5b2b9260e6e8a83ec5b3b509..231de1bdf0f6741f46895df1e2c0056dcad0319b 100644
+index 1ba0226d161465d5e1933e804cbf53ea96f28860..db7ca6be267a4a86804347338ff639e510e29531 100644
 --- a/chrome/browser/external_protocol/external_protocol_handler.cc
 +++ b/chrome/browser/external_protocol/external_protocol_handler.cc
-@@ -332,7 +332,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
+@@ -330,7 +330,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
    // Always allow the hard-coded allowed schemes.
    for (size_t i = 0; i < std::size(kAllowedSchemes); ++i) {
      if (kAllowedSchemes[i] == scheme)
diff --git a/patches/chrome-browser-feature_engagement-java-src-org-chromium-chrome-browser-feature_engagement-TrackerFactory.java.patch b/patches/chrome-browser-feature_engagement-java-src-org-chromium-chrome-browser-feature_engagement-TrackerFactory.java.patch
new file mode 100644
index 000000000000..5eaa261418ce
--- /dev/null
+++ b/patches/chrome-browser-feature_engagement-java-src-org-chromium-chrome-browser-feature_engagement-TrackerFactory.java.patch
@@ -0,0 +1,15 @@
+diff --git a/chrome/browser/feature_engagement/java/src/org/chromium/chrome/browser/feature_engagement/TrackerFactory.java b/chrome/browser/feature_engagement/java/src/org/chromium/chrome/browser/feature_engagement/TrackerFactory.java
+index d8ec0d8a61dac3bf170ffadb93ffcf78ce344087..1b77face226e3744c1879b0176ceb37c9f9a5833 100644
+--- a/chrome/browser/feature_engagement/java/src/org/chromium/chrome/browser/feature_engagement/TrackerFactory.java
++++ b/chrome/browser/feature_engagement/java/src/org/chromium/chrome/browser/feature_engagement/TrackerFactory.java
+@@ -30,6 +30,10 @@ public final class TrackerFactory {
+     public static Tracker getTrackerForProfile(Profile profile) {
+         if (sTestTracker != null) return sTestTracker;
+         if (profile == null) return null;
++        if (!profile.isNativeInitialized()) {
++            // Temporary to debug https://crbug.com/1346710.
++            throw new IllegalArgumentException("Profile must have a valid native pointer.");
++        }
+ 
+         return TrackerFactoryJni.get().getTrackerForProfile(profile);
+     }
diff --git a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch
index c5640290739a..76a08a06cd3a 100644
--- a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch
+++ b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/global_keyboard_shortcuts_mac.mm
-index c766aadf8d462733636874d383c588a7f88bf9f0..8002baaa150199e26f11cb0702df920cecd90cb5 100644
+index 34a7e6bef7608bc1ca61d43fadc0319f23f461da..3bed7105e3ea6e14997f9a6ee80e919656ba2a3e 100644
 --- a/chrome/browser/global_keyboard_shortcuts_mac.mm
 +++ b/chrome/browser/global_keyboard_shortcuts_mac.mm
-@@ -180,6 +180,7 @@ const std::vector<KeyboardShortcutData>& GetShortcutsNotPresentInMainMenu() {
+@@ -149,6 +149,7 @@ const std::vector<KeyboardShortcutData>& GetShortcutsNotPresentInMainMenu() {
        {true,  false, false, true,  kVK_DownArrow,         IDC_FOCUS_NEXT_PANE},
        {true,  false, false, true,  kVK_UpArrow,           IDC_FOCUS_PREVIOUS_PANE},
        {true,  true,  false, true,  kVK_ANSI_A,            IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY},
diff --git a/patches/chrome-browser-net-system_network_context_manager.cc.patch b/patches/chrome-browser-net-system_network_context_manager.cc.patch
index 0d2b876e0789..895c571ee37e 100644
--- a/patches/chrome-browser-net-system_network_context_manager.cc.patch
+++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
-index d0b3897618b51b4520253fcab13409d8ccee0eaa..9c09cece38b2588488c66a171b33a4cc88f89a48 100644
+index a8b9d9499109e0eeaec6a4654b1098e4cd557863..98a2b36eaa0f9640e0b29918d4326c96dbc5f74b 100644
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -327,7 +327,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
+@@ -332,7 +332,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
      if (!manager_)
        return;
      manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
diff --git a/patches/chrome-browser-notifications-BUILD.gn.patch b/patches/chrome-browser-notifications-BUILD.gn.patch
index c8f958f6dc29..a9b5decd0184 100644
--- a/patches/chrome-browser-notifications-BUILD.gn.patch
+++ b/patches/chrome-browser-notifications-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/notifications/BUILD.gn b/chrome/browser/notifications/BUILD.gn
-index 16dcc5d217ed604116c248b9ef64f94062cb8509..1194e12271f5410dc5d030d80b98c6ab6b412d27 100644
+index 4845718b24fae2f190130781b37ffda7aa9c0791..53f3c89780eb527b85374aa3c948040925e5a5f9 100644
 --- a/chrome/browser/notifications/BUILD.gn
 +++ b/chrome/browser/notifications/BUILD.gn
 @@ -82,6 +82,7 @@ if (is_android) {
diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch
index 20218d1c89ac..770b7b7244db 100644
--- a/patches/chrome-browser-prefs-browser_prefs.cc.patch
+++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch
@@ -1,16 +1,17 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index a748644cef16ff05c5a58355f3584cc1edcbb55d..be0c1d36fc0c321e314b7d976c4f870717d876b1 100644
+index e6350b369e417ab89e6da2986606d75fc8832e10..fd9e8e531ae452306528a5daf7c4dd1107c9f45a 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1234,6 +1234,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1257,6 +1257,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+   DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
+ #endif
  
-   registry->RegisterBooleanPref(
-       policy::policy_prefs::kSetTimeoutWithout1MsClampEnabled, false);
 +  brave::RegisterLocalStatePrefs(registry);
- 
++
  #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
    screen_ai::RegisterLocalStatePrefs(registry);
-@@ -1579,6 +1580,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+ #endif  // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
+@@ -1610,6 +1612,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
  #endif
  
    RegisterProfilePrefsForMigration(registry);
diff --git a/patches/chrome-browser-profile_resetter-brandcode_config_fetcher.cc.patch b/patches/chrome-browser-profile_resetter-brandcode_config_fetcher.cc.patch
index 4d437ffe961e..3de79e551fcc 100644
--- a/patches/chrome-browser-profile_resetter-brandcode_config_fetcher.cc.patch
+++ b/patches/chrome-browser-profile_resetter-brandcode_config_fetcher.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc
-index 3aa6ea299b000b35956bccee54da7f8f574ebbc4..b40c73126e9d1df0b5946ad02b1dac606aef5d06 100644
+index 3b41d8bc50efa4c9e4e64e7cefc646f7144f5cce..e884590b2f0385cf843448b0a1aa13266d09abcf 100644
 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc
 +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc
 @@ -57,6 +57,8 @@ BrandcodeConfigFetcher::BrandcodeConfigFetcher(
diff --git a/patches/chrome-browser-profiles-android-java-src-org-chromium-chrome-browser-profiles-Profile.java.patch b/patches/chrome-browser-profiles-android-java-src-org-chromium-chrome-browser-profiles-Profile.java.patch
new file mode 100644
index 000000000000..f82f1cb10e4a
--- /dev/null
+++ b/patches/chrome-browser-profiles-android-java-src-org-chromium-chrome-browser-profiles-Profile.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/Profile.java b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/Profile.java
+index 8df72e91e357fb40e0f719482a7d0a0ce30f43e7..a8a5b1b779adec31990796cbf6d0947ca1f8a679 100644
+--- a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/Profile.java
++++ b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/Profile.java
+@@ -184,7 +184,7 @@ public class Profile implements BrowserContextHandle {
+     /**
+      * @return Whether or not the native side profile exists.
+      */
+-    @VisibleForTesting
++    // @VisibleForTesting (Temporarily allow calling this to debug https://crbug.com/1346710).
+     public boolean isNativeInitialized() {
+         return mNativeProfileAndroid != 0;
+     }
diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch
index 6436277c8a47..7d05b6b08f09 100644
--- a/patches/chrome-browser-profiles-profile.cc.patch
+++ b/patches/chrome-browser-profiles-profile.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index 02a724e47ba2efaee4b0951c4b3ef01cf6d3416c..04b86b856de5e77d35cad1f88df5cde49a506ba2 100644
+index 03dbc7190157c788148312c01dff8bee6d0442c4..b70bd3763ea74da21b4dd642bb5b6606f0c4ac66 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
 @@ -99,6 +99,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
diff --git a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch
index 5b62207c5589..07d58f29f7e5 100644
--- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch
+++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc
-index 0876cb9676a6c9c0f2143c063e8ce0bc7b842235..5b1563e9432bab6a8cd21058decf51d7b64af3af 100644
+index 9ec396bbfd605a2de465100e63acba705575d713..ed75830fd3f034d780eded11dd24d2c16e587f5d 100644
 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc
 +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc
 @@ -270,7 +270,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch
index 24fd1e1106ca..6ca260ffa5bd 100644
--- a/patches/chrome-browser-profiles-profile_impl.cc.patch
+++ b/patches/chrome-browser-profiles-profile_impl.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index 8b4be2abc03ecec026b7989bc91b3f6bc5a5f9c7..60e5df86f939f8f552d37cf37fd71c36b8ef7596 100644
+index b1a3fc0249f3f6b6458038e6173743a1fd3b5724..8ee0b9bd4591b4b5d73805d4282c24a097c7415e 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
 @@ -358,7 +358,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch
index 7d820962dc7f..021ca4a5a7ed 100644
--- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch
+++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-index 36e5cc38f09ff3c1b4609a6418d464f57fd37928..319faba9aae3f64407867beb2e579135cee09eca 100644
+index 7db1991010ce734136dc54b49d1fbf60939cfe0e..e9810216d251c8cea849dc4244ba1044ff3747fc 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1867,6 +1867,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
+@@ -1918,6 +1918,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
    selection_navigation_url_ = match.destination_url;
    if (!selection_navigation_url_.is_valid())
      return;
diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch
index b0aa6d682eff..454c55d1674f 100644
--- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch
+++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h
-index e95f46698826c8386a868f8ff81a76622426cdfd..e61677ed45a0f6b11266acd54c81f29e759705e4 100644
+index 51695cd6d98a822f0ec4e64a7dc1dc1790341ca1..2faea0f92a3122af3c1b307367a510388db402f9 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
-@@ -150,6 +150,7 @@ class RenderViewContextMenu
+@@ -149,6 +149,7 @@ class RenderViewContextMenu
    // Returns true if keyboard lock is active and requires the user to press and
    // hold escape to exit exclusive access mode.
    bool IsPressAndHoldEscRequiredToExitFullscreen() const;
diff --git a/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch b/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch
index 4cb212d003f2..d06e36be50e9 100644
--- a/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch
@@ -1,18 +1,10 @@
 diff --git a/chrome/browser/resources/bookmarks/BUILD.gn b/chrome/browser/resources/bookmarks/BUILD.gn
-index 227ce792eccdbbde61964306df4c0897accc4cc7..5e63b744aa6ca1a3744d2bbc671f45a8d385f589 100644
+index d3f2006f302ddaf57a7d9c4f4949ba44a0db61e1..70a1d7a90f09062e8d21f69b230d4f1262e731ae 100644
 --- a/chrome/browser/resources/bookmarks/BUILD.gn
 +++ b/chrome/browser/resources/bookmarks/BUILD.gn
-@@ -50,6 +50,7 @@ generate_grd("build_grd") {
+@@ -74,4 +74,5 @@ build_webui("build") {
+     optimize_webui_resource_paths_rewrites =
+         [ "bookmarks.rollup.js|bookmarks.js" ]
    }
-   grd_prefix = "bookmarks"
-   out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
-+  deps += [ "//brave/browser/resources/bookmarks:resources" ]
- }
- 
- preprocess_if_expr("preprocess") {
-@@ -117,4 +118,5 @@ ts_library("build_ts") {
-     ":preprocess",
-     ":preprocess_generated",
-   ]
-+  in_files += brave_deps_chrome_browser_resources_bookmarks_in_files extra_deps += brave_deps_chrome_browser_resources_bookmarks_extra_deps
++  extra_build_grd_deps = [ "//brave/browser/resources/bookmarks:resources" ] extra_build_ts_in_files = brave_deps_chrome_browser_resources_bookmarks_in_files extra_build_ts_extra_deps = brave_deps_chrome_browser_resources_bookmarks_extra_deps
  }
diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch
index 4dae8e0202b1..9b17ddf70ecb 100644
--- a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch
+++ b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts
-index d28158479a5f2fdfb42e50856d98d1889e6c02fa..dc31bcabce383dfc8600e44bed2aff675b29e61a 100644
+index c966e0dd62f6b54bc62cd1dc601125c021ef8a00..b4a2d583a47326ae8e407112a0513361458c269e 100644
 --- a/chrome/browser/resources/bookmarks/command_manager.ts
 +++ b/chrome/browser/resources/bookmarks/command_manager.ts
 @@ -428,7 +428,7 @@ export class BookmarksCommandManagerElement extends
diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch
index ba4831f5ea12..3c6273591a28 100644
--- a/patches/chrome-browser-resources-extensions-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-extensions-BUILD.gn.patch
@@ -1,18 +1,10 @@
 diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn
-index cd3ee9766ea9246d75293a829fb6562729f17e8e..1db8dd230d892d8ea59cb19c4117be3dae9d358a 100644
+index adb5e2d759d3f037f70ac3e8e9ddcc86eeef0f9e..95db3f10170da490de85a79896847643c91b07ad 100644
 --- a/chrome/browser/resources/extensions/BUILD.gn
 +++ b/chrome/browser/resources/extensions/BUILD.gn
-@@ -50,6 +50,7 @@ generate_grd("build_grd") {
-     deps = [ ":build_ts" ]
-     manifest_files = [ "$target_gen_dir/tsconfig.manifest" ]
+@@ -105,4 +105,5 @@ build_webui("build") {
+     optimize_webui_resource_paths_rewrites =
+         [ "extensions.rollup.js|extensions.js" ]
    }
-+  deps += [ "//brave/browser/resources/extensions:resources" ]
- }
- 
- preprocess_if_expr("preprocess") {
-@@ -121,4 +122,5 @@ ts_library("build_ts") {
-     ":preprocess",
-     ":preprocess_generated",
-   ]
-+  in_files += brave_deps_chrome_browser_resources_extensions_in_files extra_deps += brave_deps_chrome_browser_resources_extensions_extra_deps
++  extra_build_grd_deps = [ "//brave/browser/resources/extensions:resources" ] extra_build_ts_in_files = brave_deps_chrome_browser_resources_extensions_in_files extra_build_ts_extra_deps = brave_deps_chrome_browser_resources_extensions_extra_deps
  }
diff --git a/patches/chrome-browser-resources-extensions-extensions.ts.patch b/patches/chrome-browser-resources-extensions-extensions.ts.patch
index 0c4eeb9dfb97..087df7cd338c 100644
--- a/patches/chrome-browser-resources-extensions-extensions.ts.patch
+++ b/patches/chrome-browser-resources-extensions-extensions.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/extensions/extensions.ts b/chrome/browser/resources/extensions/extensions.ts
-index 9006e7dab0b856a2a4c9438adc9916fc6f019f5e..0707add148d1fc857362643e3aa8dfb21898547b 100644
+index 5a20e92a5eac4556f1e60de2f6f8714ae3312aee..b1d3ee336c9d9b8e93ffefeae699b708e61b30ea 100644
 --- a/chrome/browser/resources/extensions/extensions.ts
 +++ b/chrome/browser/resources/extensions/extensions.ts
 @@ -2,6 +2,7 @@
diff --git a/patches/chrome-browser-resources-extensions-item_list.ts.patch b/patches/chrome-browser-resources-extensions-item_list.ts.patch
index c8335335ff64..0dfefe945a20 100644
--- a/patches/chrome-browser-resources-extensions-item_list.ts.patch
+++ b/patches/chrome-browser-resources-extensions-item_list.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/extensions/item_list.ts b/chrome/browser/resources/extensions/item_list.ts
-index c02caf2bbc1940b8be008ad1bd098f15314313b8..024f66113e4bd0e14136e4645ce53125b7c6c077 100644
+index c8943c3e392c431effbd57c5142def9a889a66ce..00a65805a1a6c5486b800b5dd1140ec5c54ae138 100644
 --- a/chrome/browser/resources/extensions/item_list.ts
 +++ b/chrome/browser/resources/extensions/item_list.ts
 @@ -13,6 +13,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bu
diff --git a/patches/chrome-browser-resources-history-BUILD.gn.patch b/patches/chrome-browser-resources-history-BUILD.gn.patch
index 50eded5a91e3..9405b5e1260a 100644
--- a/patches/chrome-browser-resources-history-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-history-BUILD.gn.patch
@@ -1,18 +1,10 @@
 diff --git a/chrome/browser/resources/history/BUILD.gn b/chrome/browser/resources/history/BUILD.gn
-index f52a8ca323333322f07d9889a06d268d2f9fbf19..565e5a3f87bf80d46d70161b2a4462c6a9409ddf 100644
+index cbfe95d9eca7e0c57a1e02ed6c35c4a49a4c2d11..21f18e1f82bee5a96750a814c043fe5a62465e9f 100644
 --- a/chrome/browser/resources/history/BUILD.gn
 +++ b/chrome/browser/resources/history/BUILD.gn
-@@ -65,6 +65,7 @@ generate_grd("build_grd") {
-     deps = [ ":build_ts" ]
-     manifest_files = [ "$target_gen_dir/tsconfig.manifest" ]
+@@ -80,4 +80,5 @@ build_webui("build") {
+       "lazy_load.rollup.js|lazy_load.js",
+     ]
    }
-+  deps += [ "//brave/browser/resources/history:resources" ]
- }
- 
- preprocess_if_expr("preprocess") {
-@@ -128,4 +129,5 @@ ts_library("build_ts") {
-     ":preprocess",
-     ":preprocess_generated",
-   ]
-+  in_files += brave_deps_chrome_browser_resources_history_in_files extra_deps += brave_deps_chrome_browser_resources_history_extra_deps
++  extra_build_grd_deps = [ "//brave/browser/resources/history:resources" ] extra_build_ts_in_files = brave_deps_chrome_browser_resources_history_in_files extra_build_ts_extra_deps = brave_deps_chrome_browser_resources_history_extra_deps
  }
diff --git a/patches/chrome-browser-resources-history-history_item.ts.patch b/patches/chrome-browser-resources-history-history_item.ts.patch
index 80ce533862e5..bfd8f9c94afd 100644
--- a/patches/chrome-browser-resources-history-history_item.ts.patch
+++ b/patches/chrome-browser-resources-history-history_item.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/history/history_item.ts b/chrome/browser/resources/history/history_item.ts
-index a8d97401129e154cfe84c947bf8dcdaec6887c91..2585c9b5aac69cc2327ee6b7b2629de72e39c870 100644
+index 9d1a65587b690c1d39a165f01227aa5cdd850758..013d32c6f3aee8947faa5d44d72f2038f3e6897b 100644
 --- a/chrome/browser/resources/history/history_item.ts
 +++ b/chrome/browser/resources/history/history_item.ts
 @@ -9,6 +9,7 @@ import 'chrome://resources/cr_elements/cr_icons_css.m.js';
diff --git a/patches/chrome-browser-resources-history-shared_style.css.patch b/patches/chrome-browser-resources-history-shared_style.css.patch
index c55576d16478..b7f9dad6b502 100644
--- a/patches/chrome-browser-resources-history-shared_style.css.patch
+++ b/patches/chrome-browser-resources-history-shared_style.css.patch
@@ -1,12 +1,13 @@
 diff --git a/chrome/browser/resources/history/shared_style.css b/chrome/browser/resources/history/shared_style.css
-index 3cabafa5881164b3b8f6dbd14010e210fe0f7f8f..34fdd52922dcba7ea73e1431932ab2755635f7fc 100644
+index 3cabafa5881164b3b8f6dbd14010e210fe0f7f8f..50a76e5b381f35ea70fa62e47fd800aaf4aed4fe 100644
 --- a/chrome/browser/resources/history/shared_style.css
 +++ b/chrome/browser/resources/history/shared_style.css
-@@ -8,6 +8,7 @@
+@@ -7,7 +7,7 @@
+  * #import=./shared_vars.css.js
   * #import=chrome://resources/cr_elements/hidden_style_css.m.js
   * #import=chrome://resources/cr_elements/shared_vars_css.m.js
-  * #include=cr-hidden-style
-+ * #include=br-shared-style
+- * #include=cr-hidden-style
++ * #include=cr-hidden-style br-shared-style
   * #css_wrapper_metadata_end */
  
  a {
diff --git a/patches/chrome-browser-resources-history-synced_device_manager.html.patch b/patches/chrome-browser-resources-history-synced_device_manager.html.patch
index 73983dbf0098..0dd11189d7e1 100644
--- a/patches/chrome-browser-resources-history-synced_device_manager.html.patch
+++ b/patches/chrome-browser-resources-history-synced_device_manager.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/history/synced_device_manager.html b/chrome/browser/resources/history/synced_device_manager.html
-index 8658151958b1dedb65fe4e641ac8adca4a942be2..cd24e674ce5d111fbc02fbbb11025adcc4d91c0b 100644
+index 12d27b8ce89778bc57a6f67c2dac898d7b7c5634..12dfdc30becd1aa5993e061a0bb3963eb64ad2c8 100644
 --- a/chrome/browser/resources/history/synced_device_manager.html
 +++ b/chrome/browser/resources/history/synced_device_manager.html
 @@ -73,6 +73,7 @@
@@ -11,7 +11,7 @@ index 8658151958b1dedb65fe4e641ac8adca4a942be2..cd24e674ce5d111fbc02fbbb11025adc
          hidden="[[!showSignInGuide(signInState, guestSession_,
                                     signInAllowed_)]]">
 @@ -84,6 +85,7 @@
-         $i18n{signInButton}
+         $i18n{turnOnSyncButton}
        </cr-button>
      </div>
 +-->
diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch
index 04ff59908b2d..dd901d116952 100644
--- a/patches/chrome-browser-resources-settings-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch
@@ -1,19 +1,18 @@
 diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
-index e163e3e422b6c4933e96a380dfc64c97451a453d..034d0664b00832f7bb439b1ec42318e375a0d57f 100644
+index b6d81b8457a70ea46f38af743bffa855622cc261..695b4b863257997b715db0a7fad0fbdb90d3c882 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
-@@ -145,6 +145,7 @@ generate_grd("build_grd") {
-     deps = [ ":build_ts" ]
-     manifest_files = [ "$target_gen_dir/tsconfig.manifest" ]
-   }
-+  deps += [ "//brave/browser/resources/settings:resources" ]
- }
- 
- preprocess_if_expr("preprocess") {
-@@ -309,4 +310,6 @@ ts_library("build_ts") {
+@@ -175,6 +175,7 @@ ts_library("build_ts") {
      ":preprocess",
      ":preprocess_generated",
    ]
 +  in_files += brave_deps_chrome_browser_resources_settings_in_files extra_deps += brave_deps_chrome_browser_resources_settings_extra_deps
-+
+ }
+ 
+ generate_grd("build_grd") {
+@@ -263,4 +264,5 @@ generate_grd("build_grd") {
+     manifest_files =
+         filter_include(get_target_outputs(":build_ts"), [ "*.manifest" ])
+   }
++  deps += [ "//brave/browser/resources/settings:resources" ]
  }
diff --git a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch
index 146e7cc69062..709b179b30b9 100644
--- a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch
+++ b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/people_page/sync_controls.ts b/chrome/browser/resources/settings/people_page/sync_controls.ts
-index 177e113489644c19d0c6678c4a26263674a967db..944e4ef751c759309f15bcd8c9ea46d109c92593 100644
+index 759b87d113c27754f320384d1cf1673e5dafceee..5d85c2d5ca7c19dc5a5ebc54e9837ae4b9610c35 100644
 --- a/chrome/browser/resources/settings/people_page/sync_controls.ts
 +++ b/chrome/browser/resources/settings/people_page/sync_controls.ts
 @@ -100,7 +100,7 @@ export class SettingsSyncControlsElement extends
diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch
index 4bc7d662b303..70ca40a8cbff 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
-index 53b6e4a5cd512d8b7a56bd77e9f53c044345a47a..7c7b985c5b696f1a91a53656311a84c43c4531b4 100644
+index ccc1481b7df5f99d0937abc3df8c6d48b892cfcf..6f084d99446112b9ab8577b6a481e52dd1f595f2 100644
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
 @@ -74,7 +74,7 @@ export class SettingsPersonalizationOptionsElement extends
diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
index 7287c5f59908..c587f582f893 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-index 248f9d9a319e9d3b31f1d208b39569214d49c875..5b56f2f715e5f2769b00ab1ce0b4d68768e75496 100644
+index 93c60349ed92e4125bc5066f0f32a81397fc6888..5e0cb2dc8c61264e625a9c06a3245c425ba7d15f 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -45,6 +45,7 @@
+@@ -40,6 +40,7 @@
      <settings-animated-pages id="pages" section="privacy"
          focus-config="[[focusConfig_]]">
        <div route-path="default">
@@ -10,7 +10,7 @@ index 248f9d9a319e9d3b31f1d208b39569214d49c875..5b56f2f715e5f2769b00ab1ce0b4d687
          <cr-link-row id="clearBrowsingData"
              start-icon="cr:delete"
              label="$i18n{clearBrowsingData}"
-@@ -184,6 +185,7 @@
+@@ -168,6 +169,7 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
@@ -18,7 +18,7 @@ index 248f9d9a319e9d3b31f1d208b39569214d49c875..5b56f2f715e5f2769b00ab1ce0b4d687
        <template is="dom-if" route-path="/content/backgroundSync" no-search>
          <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
-@@ -211,6 +213,7 @@
+@@ -195,6 +197,7 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch
index 98776c32c00f..31613134cf09 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-index 3fadcedf7ee6609ba363d12717256782a46ed73f..a6566b221460d8f663cd9ca165eb723f03cc15a9 100644
+index 5081302b7f0462f6ce37df8a19e6ebc3fec458d8..2d64e8cffea0c63365de87efe79863ede2c5ec4b 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-@@ -20,6 +20,7 @@ import '../site_settings/site_data_details_subpage.js';
+@@ -19,6 +19,7 @@ import '../site_settings/site_data_details_subpage.js';
  import '../settings_page/settings_animated_pages.js';
  import '../settings_page/settings_subpage.js';
- import '../settings_shared_css.js';
+ import '../settings_shared.css.js';
 +import './personalization_options.js';
  import './privacy_guide/privacy_guide_dialog.js';
  
- import {IPHBubbleElement} from 'chrome://resources/cr_components/iph_bubble/iph_bubble.js';
+ import {CrLinkRowElement} from 'chrome://resources/cr_elements/cr_link_row/cr_link_row.js';
diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch
index 7eb05a8d0f4c..422c3d052aeb 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts
-index 430e9efa0ec7b4842ef293f274d72b2d276612f9..125fff5f4649c701cbd534866383d97ce70aed8e 100644
+index cf0b426894c3802db532749470c68de8bb01fcb0..a2eef456c483b13f6614d312c817677472e870c8 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts
 @@ -46,7 +46,7 @@ export type SecureDnsSetting = {
diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch
index 1971fc9e2ecc..c046807c31d0 100644
--- a/patches/chrome-browser-resources-settings-route.ts.patch
+++ b/patches/chrome-browser-resources-settings-route.ts.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
-index 85ea634a7c6c38ba0c9fa1a8dc3987fbe85897eb..31d8ecafb34f0fe5678f0c36a318997c0b30cf28 100644
+index a2e54078ee5d43cb1b4020a34c788d64ec8ec409..44f99601f9acc719186988245c64dbc5183995a9 100644
 --- a/chrome/browser/resources/settings/route.ts
 +++ b/chrome/browser/resources/settings/route.ts
-@@ -8,6 +8,7 @@ import {pageVisibility} from './page_visibility.js';
+@@ -9,6 +9,7 @@ import {pageVisibility} from './page_visibility.js';
  import {Route, Router} from './router.js';
  import {SettingsRoutes} from './settings_routes.js';
  
@@ -10,7 +10,7 @@ index 85ea634a7c6c38ba0c9fa1a8dc3987fbe85897eb..31d8ecafb34f0fe5678f0c36a318997c
  /**
   * Add all of the child routes that originate from the privacy route,
   * regardless of whether the privacy section under basic or advanced.
-@@ -215,6 +216,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
+@@ -217,6 +218,7 @@ function createBrowserSettingsRoutes(): Partial<SettingsRoutes> {
        // </if>
      }
    }
diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch
index 44f855366d19..cdfb16e7ff5c 100644
--- a/patches/chrome-browser-resources-settings-settings.ts.patch
+++ b/patches/chrome-browser-resources-settings-settings.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts
-index f972cd3fba9db81e2fc4b84379c4ff2365fb39c3..77e052651d86b29a11e9d4404a6229f2be64fbd6 100644
+index 321fb5c4732a37c22a43b32eb948dfb30e88044a..9deb3be5e5df7a32604b23e12880a56e3b5fdd51 100644
 --- a/chrome/browser/resources/settings/settings.ts
 +++ b/chrome/browser/resources/settings/settings.ts
 @@ -2,6 +2,7 @@
diff --git a/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch b/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch
index 1ded5e326857..aeb452078f20 100644
--- a/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch
+++ b/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/settings_page/main_page_mixin.ts b/chrome/browser/resources/settings/settings_page/main_page_mixin.ts
-index edd2054d9099c7b6cb371951f61281f149023891..1390e4dae935ab9654a8625b4cbdf09830199a7f 100644
+index 6146559df96c8705e3913ad3c302fb239ed3e61b..26dfb06978b769d01fbafb1d5a1bb53453cd72e0 100644
 --- a/chrome/browser/resources/settings/settings_page/main_page_mixin.ts
 +++ b/chrome/browser/resources/settings/settings_page/main_page_mixin.ts
 @@ -38,7 +38,7 @@ guestTopLevelRoute = routes.PRIVACY;
diff --git a/patches/chrome-browser-resources-settings-settings_routes.ts.patch b/patches/chrome-browser-resources-settings-settings_routes.ts.patch
index 073f88a27ce9..731e6250453f 100644
--- a/patches/chrome-browser-resources-settings-settings_routes.ts.patch
+++ b/patches/chrome-browser-resources-settings-settings_routes.ts.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/settings_routes.ts b/chrome/browser/resources/settings/settings_routes.ts
-index 75b48c69ca4bd460c909095c5339a2898892c1e7..2d0dfeb7c9d0b16a351a49777ba20b5faabc9330 100644
+index 0fdf17e243bb5c7ffadec33598a0d22fc0cb2f91..e54b3d5c0a324fc3b896d0ed82713a510ed49410 100644
 --- a/chrome/browser/resources/settings/settings_routes.ts
 +++ b/chrome/browser/resources/settings/settings_routes.ts
-@@ -88,4 +88,5 @@ export type SettingsRoutes = {
+@@ -89,4 +89,5 @@ export type SettingsRoutes = {
    SYNC_ADVANCED: Route,
    SYSTEM: Route,
    TRIGGERED_RESET_DIALOG: Route,
diff --git a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch
index 46cc8793d4f1..3b0a65ae82f9 100644
--- a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch
+++ b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.ts b/chrome/browser/resources/settings/site_settings/category_default_setting.ts
-index 3d6137647ab6f4584c29f81e7609505086b36297..9b8ed65a65fe3e47f0456c254454bf5345c537bd 100644
+index 306b03008c00e43d7cea89ec0af003c488e37f71..d0a0d9b7d37eb8b36653dcf052ababc5ac87bc9c 100644
 --- a/chrome/browser/resources/settings/site_settings/category_default_setting.ts
 +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.ts
 @@ -184,6 +184,7 @@ export class CategoryDefaultSettingElement extends
diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch
index 0242c416eec8..7bdb29585bd3 100644
--- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch
+++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
-index 0a0189306e7a371f377ca3fa2d13c334c8935d6b..66bfd3ce67cf39d88d369d994a1bd2f5569373f9 100644
+index bbeb79f1839c7584d7242a0fdf151e3a913ca650..651a9df26feda892ea56d109e19e2bf0a0c71e4d 100644
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
 @@ -8,6 +8,7 @@
diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch
index 2c2a42c507c3..43c35236aa86 100644
--- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch
+++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
-index 014a4ff7b261f3e5e19025b24764fb2a0ee7c595..66fcdf0c083718b9dea307eda53818b15ed0c975 100644
+index 1682461bdaca21736376b1171acb192f550c9abe..6a2e467c71e24b1d29cd9a4102a2da1a97e8fb16 100644
 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
 +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
 @@ -95,6 +95,7 @@ export class ProfilePickerMainViewElement extends
diff --git a/patches/chrome-browser-resources-tools-build_webui.gni.patch b/patches/chrome-browser-resources-tools-build_webui.gni.patch
new file mode 100644
index 000000000000..fc4f70e1da15
--- /dev/null
+++ b/patches/chrome-browser-resources-tools-build_webui.gni.patch
@@ -0,0 +1,20 @@
+diff --git a/chrome/browser/resources/tools/build_webui.gni b/chrome/browser/resources/tools/build_webui.gni
+index 3f5bee5aff4d4f7abadd6c31f98294670944dfa7..0bfd335629bd0f1c05820ff89aa8a8c94fca7373 100644
+--- a/chrome/browser/resources/tools/build_webui.gni
++++ b/chrome/browser/resources/tools/build_webui.gni
+@@ -200,6 +200,7 @@ template("build_webui") {
+       }
+       extra_deps += [ ":copy_mojo" ]
+     }
++    if (defined(invoker.extra_build_ts_in_files)) { in_files += invoker.extra_build_ts_in_files } if (defined(invoker.extra_build_ts_extra_deps)) { extra_deps += invoker.extra_build_ts_extra_deps }
+   }
+ 
+   if (optimize) {
+@@ -243,6 +244,7 @@ template("build_webui") {
+       deps += invoker.extra_grdp_deps
+       grdp_files = invoker.extra_grdp_files
+     }
++    if (defined(invoker.extra_build_grd_deps)) { deps += invoker.extra_build_grd_deps }
+   }
+ 
+   grit("resources") {
diff --git a/patches/chrome-browser-resources-tools-optimize_webui.gni.patch b/patches/chrome-browser-resources-tools-optimize_webui.gni.patch
index c0db9b69157d..03d07a977d14 100644
--- a/patches/chrome-browser-resources-tools-optimize_webui.gni.patch
+++ b/patches/chrome-browser-resources-tools-optimize_webui.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/tools/optimize_webui.gni b/chrome/browser/resources/tools/optimize_webui.gni
-index b7a9fd788a6d051c87c261bd7268129d6e3ad4da..a4c03d67f07755ceb5f6ebcac2caa7b8c36a59cc 100644
+index d3461400579c1ee232b2561805fafb1a4a3dba25..4757139a5c0ad526544ceda15ec0a84caa0ad30e 100644
 --- a/chrome/browser/resources/tools/optimize_webui.gni
 +++ b/chrome/browser/resources/tools/optimize_webui.gni
-@@ -54,6 +54,7 @@ template("optimize_webui") {
+@@ -56,6 +56,7 @@ template("optimize_webui") {
        "//resources/polymer/v3_0/|$polymer_path",
        "//resources/|$resources_path",
      ]
diff --git a/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch b/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch
index b004897c6361..1fcdf4a2d48f 100644
--- a/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch
+++ b/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
-index 4498a5a5f54c36322245622a1351d2a011196b54..4943e97e350d479b7061c605bcb60719e9d758c8 100644
+index 075a150f48d021d8f7aa400fee6fc74e9bda6cad..ccb13b51867ed3f48fad2ca909a250b148b6b156 100644
 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
 +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
-@@ -260,6 +260,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt(
+@@ -282,6 +282,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt(
      std::unique_ptr<ClientDownloadRequest> request) {
    client_download_request_ = std::move(request);
    SanitizeRequest();
diff --git a/patches/chrome-browser-sync-sync_service_factory.cc.patch b/patches/chrome-browser-sync-sync_service_factory.cc.patch
index 8abe398d30f2..f714452277d4 100644
--- a/patches/chrome-browser-sync-sync_service_factory.cc.patch
+++ b/patches/chrome-browser-sync-sync_service_factory.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc
-index 581e57ab27238627e3bbcdf2bb711259b57bf610..ceaa42ee5a3eb26882953c6b7f4c60c268078d70 100644
+index 2570d93be4632e58485dc0745fbff375e721ebf1..c2f160ffb6b9cc7f93633456142704bcb5a8d723 100644
 --- a/chrome/browser/sync/sync_service_factory.cc
 +++ b/chrome/browser/sync/sync_service_factory.cc
-@@ -163,7 +163,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
+@@ -155,7 +155,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
    }
  
    auto sync_service =
diff --git a/patches/chrome-browser-themes-theme_helper.h.patch b/patches/chrome-browser-themes-theme_helper.h.patch
deleted file mode 100644
index 6c2fb1f86b8b..000000000000
--- a/patches/chrome-browser-themes-theme_helper.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/themes/theme_helper.h b/chrome/browser/themes/theme_helper.h
-index a38310327c1b504d3a11126524092364c0284bef..447b0f3c0bfc908377e973508acab2aee042840e 100644
---- a/chrome/browser/themes/theme_helper.h
-+++ b/chrome/browser/themes/theme_helper.h
-@@ -107,6 +107,7 @@ class ThemeHelper {
-       bool incognito,
-       const CustomThemeSupplier* theme_supplier) const;
- 
-+  BRAVE_THEME_HELPER_H_
-  private:
-   friend class theme_service_internal::ThemeServiceTest;
- 
diff --git a/patches/chrome-browser-themes-theme_helper_win.h.patch b/patches/chrome-browser-themes-theme_helper_win.h.patch
deleted file mode 100644
index ab17f946b452..000000000000
--- a/patches/chrome-browser-themes-theme_helper_win.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/themes/theme_helper_win.h b/chrome/browser/themes/theme_helper_win.h
-index ef35bd8a699c2d7ec53e6ef84e7761000f59fb89..478626871d4269cc70b4959b6abfb9235a9862ce 100644
---- a/chrome/browser/themes/theme_helper_win.h
-+++ b/chrome/browser/themes/theme_helper_win.h
-@@ -19,6 +19,7 @@ class ThemeHelperWin : public ThemeHelper {
- 
-   ThemeHelperWin(const ThemeHelperWin&) = delete;
-   ThemeHelperWin& operator=(const ThemeHelperWin&) = delete;
-+  BRAVE_THEME_HELPER_WIN_H_
- 
-  private:
-   // ThemeService:
diff --git a/patches/chrome-browser-themes-theme_service_factory.cc.patch b/patches/chrome-browser-themes-theme_service_factory.cc.patch
index bfe96ecd952f..1e80bc17ab67 100644
--- a/patches/chrome-browser-themes-theme_service_factory.cc.patch
+++ b/patches/chrome-browser-themes-theme_service_factory.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc
-index db3162c7ef1940aa7deca1791955b87d2fe70111..46886571102dfe882771ebdb170d6118d16c3fdc 100644
+index 47184cef4deffce0733b5f5251dbf439be2591f5..3aa818b71a160ee8d9a84ea9acadca8a65554dc0 100644
 --- a/chrome/browser/themes/theme_service_factory.cc
 +++ b/chrome/browser/themes/theme_service_factory.cc
-@@ -80,6 +80,7 @@ ThemeServiceFactory::~ThemeServiceFactory() {}
+@@ -83,6 +83,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
  
  KeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
      content::BrowserContext* profile) const {
diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch
index f48945482c38..88025aaec463 100644
--- a/patches/chrome-browser-ui-BUILD.gn.patch
+++ b/patches/chrome-browser-ui-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index 583a685cd125a327ff1609beb9ec9c3c954a1474..53dd5a5bfb866b71c58b9cc135edc0d1054698db 100644
+index 3f4929cc5078cea1eac968ef41818823223da20d..ec8bde62a3a8dd0630ad88fba9b3c1faa2d25ad1 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -671,6 +671,7 @@ static_library("ui") {
+@@ -656,6 +656,7 @@ static_library("ui") {
      "//ui/webui",
      "//v8:v8_version",
    ]
@@ -10,7 +10,7 @@ index 583a685cd125a327ff1609beb9ec9c3c954a1474..53dd5a5bfb866b71c58b9cc135edc0d1
  
    # TODO(crbug/925153): Remove this circular dependency.
    allow_circular_includes_from = [
-@@ -3869,10 +3870,13 @@ static_library("ui") {
+@@ -3891,10 +3892,13 @@ static_library("ui") {
        ]
        deps += [ "//google_update" ]
      } else {
diff --git a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch
index a22c23b22b12..449d1e87d067 100644
--- a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch
+++ b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chrome/browser/ui/android/appmenu/internal/BUILD.gn
-index 7a8f3befd9633a8e45000e6ba6cc52fe5d3bcdf6..edfd6a1904d48b446c23223627ef54e8dfad46f6 100644
+index b86e1c435d4426918a04ca96952da298594d9cd7..1b7194bec0a94c510ffdd6facf711d9a88644a3e 100644
 --- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn
 +++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn
 @@ -21,6 +21,7 @@ android_library("java") {
diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch
index faac00d1df1e..461dba6cc5f7 100644
--- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch
+++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
-index c7293ed364fec4308e25a46a695070c95eeb8121..20e3fdb13f723d98deba749f43834b563c4e044d 100644
+index 5468e76a9ecda1bbc11949b57e28da56465aa643..6ba31f378a732424c4fbcab70a9deffbd19e8216 100644
 --- a/chrome/browser/ui/android/toolbar/BUILD.gn
 +++ b/chrome/browser/ui/android/toolbar/BUILD.gn
-@@ -101,6 +101,7 @@ android_library("java") {
+@@ -107,6 +107,7 @@ android_library("java") {
      "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java",
      "java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java",
    ]
diff --git a/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch
index 74ae36f5e64d..ec35588b32c1 100644
--- a/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch
+++ b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml
-index 93f598090272745ce4f3ece70593c9628e08a1ea..da7644460322ca032aa654c7dfe4fd186d860eb8 100644
+index f77cc6cabeed75fbc3e421cb72d1fa42d0934a97..87472d2f6d7275e3e0bbb2a2c68c067b6a6dd661 100644
 --- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml
 +++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml
 @@ -36,6 +36,7 @@
@@ -11,10 +11,10 @@ index 93f598090272745ce4f3ece70593c9628e08a1ea..da7644460322ca032aa654c7dfe4fd18
          android:focusable="true"
          android:focusableInTouchMode="true">
 @@ -47,6 +48,7 @@
-             style="@style/ToolbarButton"
-             android:paddingStart="@dimen/toolbar_phone_optional_button_padding"
-             android:visibility="gone" />
+             android:visibility="gone"
+             android:layout_width="52dp"
+             style="@style/ToolbarButton" />
 +        <include layout="@layout/brave_toolbar" android:layout_height="wrap_content" android:layout_width="match_parent" />
- 
          <org.chromium.chrome.browser.toolbar.top.ToggleTabStackButton
              android:id="@+id/tab_switcher_button"
+             style="@style/ToolbarButton"
diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
index e228438839a9..36fe9d897ded 100644
--- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
+++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
@@ -1,11 +1,11 @@
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-index a7d75d885b585f8e639a19a578fc366eb476e835..71a290764a30ca66f60a4315042a255f336861f7 100644
+index 267d5b1d56041ed17bb0d558bc32619f1826054b..f87e163ea6e672c0d81b40dfb3b82f28cd7c7848 100644
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 @@ -432,6 +432,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
-         mCurrentLocationBarColor = color;
-         // TODO(https://crbug.com/1239289): Change back to #setTint once our min API level is 23.
-         mLocationBarBackground.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+         if (mOptionalButton != null) {
+             mOptionalButton.setBackgroundColorFilter(color);
+         }
 +        BraveToolbarLayout.class.cast(this).updateModernLocationBarColorImpl(color);
      }
  
@@ -24,9 +24,9 @@ index a7d75d885b585f8e639a19a578fc366eb476e835..71a290764a30ca66f60a4315042a255f
      private int getBoundsAfterAccountingForRightButtons() {
 +        if (true) return Math.max(mToolbarSidePadding, BraveToolbarLayout.class.cast(this).getBoundsAfterAccountingForRightButtonsImpl(mToolbarButtonsContainer));
          if (mStartSurfaceScrollFraction == 1.0f) return mToolbarSidePadding;
-         return Math.max(mToolbarSidePadding, mToolbarButtonsContainer.getMeasuredWidth());
-     }
-@@ -1013,6 +1016,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+ 
+         int toolbarButtonsContainerWidth = mToolbarButtonsContainer.getWidth();
+@@ -1007,6 +1010,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
       * New Tab Page.
       */
      private void updateLocationBarLayoutForExpansionAnimation() {
@@ -34,7 +34,7 @@ index a7d75d885b585f8e639a19a578fc366eb476e835..71a290764a30ca66f60a4315042a255f
          TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation");
          if (mOptimizationsEnabled && isInTabSwitcherMode()) return;
  
-@@ -2197,6 +2201,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+@@ -2147,6 +2151,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
          } else {
              populateUrlClearExpansionAnimatorSet(animators);
          }
diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
index 405e27695749..414d444d400a 100644
--- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
+++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
-index 6d4051e3f7be170c1d8f8252c5e68c8b6d1e0817..e8edc6f681e537880d1f54a06e5b52f482d53319 100644
+index f5ef4e651f5bf8f9fc4078f591cfe89fb1cb92e6..23c432537bc14d071074fe7188033f3c932d1afa 100644
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
-@@ -347,10 +347,12 @@ public class ToolbarTablet
+@@ -351,10 +351,12 @@ public class ToolbarTablet
              mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab());
              RecordUserAction.record("MobileToolbarDownloadPage");
          }
@@ -15,7 +15,7 @@ index 6d4051e3f7be170c1d8f8252c5e68c8b6d1e0817..e8edc6f681e537880d1f54a06e5b52f4
          String description = null;
          Context context = getContext();
          Resources resources = context.getResources();
-@@ -427,6 +429,7 @@ public class ToolbarTablet
+@@ -431,6 +433,7 @@ public class ToolbarTablet
          mLocationBar.getTabletCoordinator().getBackground().setTint(textBoxColor);
          mLocationBar.updateVisualsForState();
          setToolbarHairlineColor(color);
diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch
index 2b2bfc4c8980..a9febc94580e 100644
--- a/patches/chrome-browser-ui-browser.cc.patch
+++ b/patches/chrome-browser-ui-browser.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 63d64acc7231821219a7bcd89ee02590637d4b79..6b85541e0f17294591042c0871fb30f413778a65 100644
+index 9347ea3c71b79486c7db064faf2dbfa976c82ce9..5dc83e4a5773c853d89a8dac0dbf01ac4280c3fd 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
 @@ -453,6 +453,7 @@ Browser* Browser::Create(const CreateParams& params) {
diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch
index a24d351302c5..6680cb7edfa8 100644
--- a/patches/chrome-browser-ui-browser_navigator.cc.patch
+++ b/patches/chrome-browser-ui-browser_navigator.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
-index 9315a947d5cb24482cf313ccc67a4cb47905a314..069c5702075b5dbed8ca77fa40067fda184ae203 100644
+index 36244f0893bc6a6ae16c025868d10a3e329e1bf1..0aea561aad68ac09a6bc3477f8e76db39477cebb 100644
 --- a/chrome/browser/ui/browser_navigator.cc
 +++ b/chrome/browser/ui/browser_navigator.cc
-@@ -557,6 +557,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
+@@ -602,6 +602,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
      // Block any navigation requests in locked fullscreen mode.
      return nullptr;
    }
@@ -10,7 +10,7 @@ index 9315a947d5cb24482cf313ccc67a4cb47905a314..069c5702075b5dbed8ca77fa40067fda
  
    // Open System Apps in their standalone window if necessary.
    // TODO(crbug.com/1096345): Remove this code after we integrate with intent
-@@ -852,6 +853,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
+@@ -898,6 +899,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
  bool IsHostAllowedInIncognito(const GURL& url) {
    std::string scheme = url.scheme();
    base::StringPiece host = url.host_piece();
diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch
index 79aeda65f1aa..6d9620ba5331 100644
--- a/patches/chrome-browser-ui-chrome_pages.cc.patch
+++ b/patches/chrome-browser-ui-chrome_pages.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
-index 6c4bb9a510d0bc13f714204d81a277170c8016de..c1419b1f88bf843c3ddc8905388a55fdc80415dc 100644
+index 546f6c2d19f7cc46eccd7493fbff41ac972057f3..b4658f397c135874faca6ebab1a12ad8b597c160 100644
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
-@@ -326,7 +326,7 @@ void ShowSlow(Browser* browser) {
+@@ -344,7 +344,7 @@ void ShowSlow(Browser* browser) {
  #endif
  }
  
diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
index 497e64ed35d1..00708af88747 100644
--- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
+++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc
-index c0266ac3efe0436e7ce04cb05bce539b4ed3d97c..b41022fc755ea085ff11f67ec21854eb9f64f1a1 100644
+index 9bee2af486635c708418259de379c26f74d04a2c..d357be81e3620f1c6250801e63fd4814a1aa2814 100644
 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc
 +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc
 @@ -65,7 +65,6 @@ ExtensionActionViewController::Create(
diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch
index b26fb5b9419f..156442fa84d0 100644
--- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch
+++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.h b/chrome/browser/ui/extensions/extension_action_view_controller.h
-index 1a83d837336576b3ab4756c9978fefbe343be1b0..8f8c022a75f050318fca88eecb0cd4f24514cd1a 100644
+index 7248884f6368fb0f9e15e2fdbb6b013799b6839a..44104470e81ad3402ce22721c18a451f8c706bce 100644
 --- a/chrome/browser/ui/extensions/extension_action_view_controller.h
 +++ b/chrome/browser/ui/extensions/extension_action_view_controller.h
 @@ -18,6 +18,7 @@
@@ -18,7 +18,7 @@ index 1a83d837336576b3ab4756c9978fefbe343be1b0..8f8c022a75f050318fca88eecb0cd4f2
    static std::unique_ptr<ExtensionActionViewController> Create(
        const extensions::ExtensionId& extension_id,
        Browser* browser,
-@@ -145,6 +147,7 @@ class ExtensionActionViewController
+@@ -139,6 +141,7 @@ class ExtensionActionViewController
    // In some cases (such as when an action is shown in a menu), a substitute
    // ToolbarActionViewController should be used for showing popups. This
    // returns the preferred controller.
@@ -26,7 +26,7 @@ index 1a83d837336576b3ab4756c9978fefbe343be1b0..8f8c022a75f050318fca88eecb0cd4f2
    ExtensionActionViewController* GetPreferredPopupViewController();
  
    // Begins the process of showing the popup for the extension action on the
-@@ -152,6 +155,7 @@ class ExtensionActionViewController
+@@ -146,6 +149,7 @@ class ExtensionActionViewController
    // user action.
    // The popup may not be shown synchronously if the extension is hidden and
    // first needs to slide itself out.
@@ -34,7 +34,7 @@ index 1a83d837336576b3ab4756c9978fefbe343be1b0..8f8c022a75f050318fca88eecb0cd4f2
    void TriggerPopup(PopupShowAction show_action,
                      bool by_user,
                      ShowPopupCallback callback);
-@@ -163,6 +167,7 @@ class ExtensionActionViewController
+@@ -157,6 +161,7 @@ class ExtensionActionViewController
                   ShowPopupCallback callback);
  
    // Handles cleanup after the popup closes.
diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
index 3ad09d1c3fc1..cb7b6596ed6f 100644
--- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
+++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-index 662a6306cfd8fa085327c961ec4da31ac1310f04..b3ae5d36631412418307293fbf82021cf8fee970 100644
+index 9849f42ce78fcdca2b768ab457bf2352bbf8e6a8..7411d746d570eb85269c17c2d3d15d3df2c3a02f 100644
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -381,6 +381,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
+@@ -382,6 +382,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
  #elif !BUILDFLAG(IS_CHROMEOS_ASH)
    welcome_enabled =
        welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_);
diff --git a/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch b/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch
index f3f790303a16..47340b657151 100644
--- a/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch
+++ b/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/startup/startup_tab_provider.cc b/chrome/browser/ui/startup/startup_tab_provider.cc
-index c85ce7c336957276e0a23255008c71f97251a435..136460c44769cc8c31199d065421b969d8f3d45f 100644
+index 6a74c525dd5187d767799f8f51b3900d57232738..bf5cdafc56b099f418a7ff0ef3b75771eab53aa6 100644
 --- a/chrome/browser/ui/startup/startup_tab_provider.cc
 +++ b/chrome/browser/ui/startup/startup_tab_provider.cc
 @@ -321,6 +321,7 @@ StartupTabs StartupTabProviderImpl::GetPrivacySandboxTabs(
diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch
index 64244fdc8750..2729876b3e4f 100644
--- a/patches/chrome-browser-ui-tab_helpers.cc.patch
+++ b/patches/chrome-browser-ui-tab_helpers.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
-index e004d33e435953ddfb8a7b16285b3fae158cf094..dcd0951f4fb8c6f015c9c09e698e33994a86657c 100644
+index c03d79f67c4494143be99a1b9f4c129e8afa7211..98dc3de2271d237fe491a9c5ad89a1783102832a 100644
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -644,4 +644,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -646,4 +646,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
  
    // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and
    // organized.
diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch
index 2c60761e4a2e..25086c5245d8 100644
--- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch
+++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h
-index 6106b41de476623d0093d53e25b0442fff8ab764..fc2e136048969ff1fe0a2df1f66e858ee3623e67 100644
+index b55c2cc9c777a69d9a597e8c39a465f53bf822bb..a1162f255fe2420a5b30610856497be382bb2736 100644
 --- a/chrome/browser/ui/tabs/tab_strip_model.h
 +++ b/chrome/browser/ui/tabs/tab_strip_model.h
-@@ -672,6 +672,7 @@ class TabStripModel : public TabGroupController {
+@@ -647,6 +647,7 @@ class TabStripModel : public TabGroupController {
    // Serialise this object into a trace.
    void WriteIntoTrace(perfetto::TracedValue context) const;
  
diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch
index 5f72c5e5313f..e06e3404529c 100644
--- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch
+++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
-index 4e298894318c5c1c48d564fc4f0a6890a1fd185b..3ea3a79610ffa1f4c0ebf43c7f6be3113b878092 100644
+index 8d0191ff57c836b97d484ffea9ee43ad75db9378..5482eb7b481b40e573fdc72d6bd17bb15749abbf 100644
 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
 +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
-@@ -462,6 +462,8 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() {
+@@ -464,6 +464,8 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() {
           ++k) {
        BuildOtherDevicesTabItem(session_tag, *tabs_in_session[k]);
      }  // for all tabs in one session
diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch
index 394ab2e0ebca..ea6eca35f680 100644
--- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch
+++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch
@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
-index 4bcfb37d87bd610ac94d074523bb47ea1d8a0a7c..17f66c982f9a3005a9205d01ea58446e9e71c87e 100644
+index 78c082c4cec2d63e8f75651f927a30cecd1eb6a0..f61c544e40784e73e6a45407276511aa557e8200 100644
 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
 +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
 @@ -85,6 +85,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,
-   bool GetURLAndTitleForItemAtIndex(int index,
+   bool GetURLAndTitleForItemAtIndex(size_t index,
                                      std::string* url,
                                      std::u16string* title);
 +  BRAVE_RECENT_TABS_SUB_MENU_MODEL_H_
diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch
index 3edc77f466a3..e86f50c319bb 100644
--- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch
+++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
-index 95b1b81c96044ef29d16df46c7a09eede52b79b9..17d6b3ce51a6986a72dc8a5876dda9d63959088f 100644
+index 831f625c582244890091c9e0f1ede59aba456f26..5c09e2338a5b9bb0ca5d3b785834b22254532ba4 100644
 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
 +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
 @@ -767,7 +767,7 @@ TEST_F(RecentTabsSubMenuModelTest, MaxTabsPerSessionAndRecency) {
    // 5-8         <4 most-recent tabs of session>
  
    TestRecentTabsSubMenuModel model(nullptr, browser());
--  EXPECT_EQ(9, model.GetItemCount());
+-  EXPECT_EQ(9u, model.GetItemCount());
 +  BRAVE_MAX_TABS_PER_SESSION_AND_RECENCY
  
    std::vector<std::u16string> tab_titles =
diff --git a/patches/chrome-browser-ui-toolbar-toolbar_actions_model.h.patch b/patches/chrome-browser-ui-toolbar-toolbar_actions_model.h.patch
index b6f290dc370e..24762ccd26a0 100644
--- a/patches/chrome-browser-ui-toolbar-toolbar_actions_model.h.patch
+++ b/patches/chrome-browser-ui-toolbar-toolbar_actions_model.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.h b/chrome/browser/ui/toolbar/toolbar_actions_model.h
-index bc8d2253bc05635cb59fad8dbc5c353d7dccc126..e60723b8c51765ef1f6a800c8ee00d9f6ca52b00 100644
+index 8e7b4ce5da0412d3a11882e5c7172fe441e07c94..a407351635b9de2de3c2b6b9d4610c9c3d990295 100644
 --- a/chrome/browser/ui/toolbar/toolbar_actions_model.h
 +++ b/chrome/browser/ui/toolbar/toolbar_actions_model.h
-@@ -28,6 +28,7 @@ class Browser;
+@@ -27,6 +27,7 @@ class Browser;
  class PrefService;
  class Profile;
  class ExtensionsContainer;
@@ -10,15 +10,15 @@ index bc8d2253bc05635cb59fad8dbc5c353d7dccc126..e60723b8c51765ef1f6a800c8ee00d9f
  
  namespace extensions {
  class ExtensionActionManager;
-@@ -47,6 +48,7 @@ class ToolbarActionsModel : public extensions::ExtensionActionAPI::Observer,
-                             public content::NotificationObserver,
+@@ -46,6 +47,7 @@ class ToolbarActionsModel : public extensions::ExtensionActionAPI::Observer,
+                             public extensions::PermissionsManager::Observer,
                              public KeyedService {
   public:
 +  friend class BraveToolbarActionsModel;
    using ActionId = std::string;
  
    ToolbarActionsModel(Profile* profile,
-@@ -173,7 +175,7 @@ class ToolbarActionsModel : public extensions::ExtensionActionAPI::Observer,
+@@ -174,7 +176,7 @@ class ToolbarActionsModel : public extensions::ExtensionActionAPI::Observer,
    void RemovePref(const ActionId& action_id);
  
    // Returns true if the given |extension| should be added to the toolbar.
diff --git a/patches/chrome-browser-ui-toolbar-toolbar_actions_model_factory.cc.patch b/patches/chrome-browser-ui-toolbar-toolbar_actions_model_factory.cc.patch
index 318879231a3d..aefb8c336cdc 100644
--- a/patches/chrome-browser-ui-toolbar-toolbar_actions_model_factory.cc.patch
+++ b/patches/chrome-browser-ui-toolbar-toolbar_actions_model_factory.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc
-index c8d6031565de2ba8ea4a3df3fc1ac005c6c7cdab..b7a64a3c8988901fb1a9a79c6937f1482a3038ec 100644
+index ae765e365d1264a66b3d3aeb9d53756d7069f424..d175a574c90a398e5ee12039ff3b53891825e6d3 100644
 --- a/chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc
 +++ b/chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc
-@@ -42,7 +42,7 @@ ToolbarActionsModelFactory::~ToolbarActionsModelFactory() {}
+@@ -44,7 +44,7 @@ ToolbarActionsModelFactory::~ToolbarActionsModelFactory() {}
  
  KeyedService* ToolbarActionsModelFactory::BuildServiceInstanceFor(
      content::BrowserContext* context) const {
diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch
index 5f730c47dc08..bd159dc0a263 100644
--- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch
+++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-index d1bd6009e777baeb14951f03b29b40db52551707..89b24c0d88fe9550a510eab34b2399d029d5a204 100644
+index 48cc9305c1129e470cfa4d26659caa06f45cae5c..1d1e80fa038fcc83a64d769b787e0b09fc1009ec 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-@@ -848,6 +848,7 @@ void BookmarkBarView::Layout() {
+@@ -852,6 +852,7 @@ void BookmarkBarView::Layout() {
        x = next_x;
      }
    }
diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch
index 6cced3056a9f..17dc7b126d40 100644
--- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
-index 7286fbd0494003c1049a5b6ab9755f5e1488a904..89cfccd6d8f149ef505e9234d50b939fc1aebb93 100644
+index 63e6a6b20d0cfaee572a32010286a56c240b58ca..f194c1b88c667e5d5ec4c1a47e7459797d10c378 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
-@@ -226,6 +226,7 @@ void BookmarkBubbleView::ShowBubble(
+@@ -225,6 +225,7 @@ void BookmarkBubbleView::ShowBubble(
    auto bubble = std::make_unique<views::BubbleDialogModelHost>(
        std::move(dialog_model), anchor_view, views::BubbleBorder::TOP_RIGHT);
    bookmark_bubble_ = bubble.get();
diff --git a/patches/chrome-browser-ui-views-download-download_item_view.h.patch b/patches/chrome-browser-ui-views-download-download_item_view.h.patch
index e6b3aabe7378..dc8c558bd1fb 100644
--- a/patches/chrome-browser-ui-views-download-download_item_view.h.patch
+++ b/patches/chrome-browser-ui-views-download-download_item_view.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h
-index a9b1250e24e5adf655cd2f34d20848d7faf2d48e..845144d64a6ba7b36db2211411ab3841436d8e0d 100644
+index 2ab47c9057c3e3d4b4a659d0aab46b00dc4b6630..ceb18bef0903721939308cd2ad8a99386fe6650c 100644
 --- a/chrome/browser/ui/views/download/download_item_view.h
 +++ b/chrome/browser/ui/views/download/download_item_view.h
-@@ -119,6 +119,7 @@ class DownloadItemView : public views::View,
+@@ -118,6 +118,7 @@ class DownloadItemView : public views::View,
    void OnPaintBackground(gfx::Canvas* canvas) override;
    void OnPaint(gfx::Canvas* canvas) override;
    void OnThemeChanged() override;
diff --git a/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch b/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch
index 612630fe01c4..dcc6dbe19df2 100644
--- a/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch
+++ b/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc
-index 4202c5e149d6e3ac25f5269112175a75e0476bd5..0ec3ae6726bf5e310003575adcdd98d62e3515ae 100644
+index fb8560969b4fd3113ea4d75faf50183731f2d017..a57d3b29918f0268cfaa08ebe43c6abc55218dca 100644
 --- a/chrome/browser/ui/views/extensions/extension_popup.cc
 +++ b/chrome/browser/ui/views/extensions/extension_popup.cc
-@@ -115,7 +115,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const {
+@@ -116,7 +116,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const {
  
  void ExtensionPopup::AddedToWidget() {
    BubbleDialogDelegateView::AddedToWidget();
diff --git a/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch
index f004f7839488..4933e94b655c 100644
--- a/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
-index 4a18ee887810650bb93e9bff6f2755df65eea06f..991dfb2428320c4b296f778a1e733f6034be8f76 100644
+index b31d9187e518e0c62f1705a6b10335cfcc75975d..a2f29d20fe89d69773c5116da6c065774122817f 100644
 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
 +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
-@@ -592,6 +592,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const {
+@@ -591,6 +591,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const {
    const float corner_radius = highlight_bounds.height() / 2.f;
    const SkRect rect = RectToSkRect(highlight_bounds);
  
diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
index 66bacde1bf7d..ccb2875bc187 100644
--- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
+++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-index dd999f0a3970288cfbf5d8f50f0c7fb3d5a73f21..03911d50b60a7c2e25e9734bb56af629134d7791 100644
+index 99dddaa8d4f456488238dbd7210630958a0a1a7b..632e053042ebcf33dc62f199fa25b6e539f18065 100644
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-@@ -662,6 +662,7 @@ void LocationBarView::Layout() {
+@@ -663,6 +663,7 @@ void LocationBarView::Layout() {
      }
    };
  
diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch
index 9517c285b4cc..31e24a12f538 100644
--- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch
+++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
-index afdc0a53a8e92ec7f7711ed0a48861c12f8dcc1d..77f5de930741cc13de3bbe8b9ff28a5770f8042b 100644
+index 329615ab006346f0eebe39a0a8c895436802a360..858751de35ffb83f355e37b65f4ac8932472c581 100644
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
 @@ -111,6 +111,7 @@ class LocationBarView : public LocationBar,
@@ -10,7 +10,7 @@ index afdc0a53a8e92ec7f7711ed0a48861c12f8dcc1d..77f5de930741cc13de3bbe8b9ff28a57
    void Init();
  
    // True if this instance has been initialized by calling Init, which can only
-@@ -166,6 +167,7 @@ class LocationBarView : public LocationBar,
+@@ -163,6 +164,7 @@ class LocationBarView : public LocationBar,
  
    // Updates the controller, and, if |contents| is non-null, restores saved
    // state that the tab holds.
@@ -18,7 +18,7 @@ index afdc0a53a8e92ec7f7711ed0a48861c12f8dcc1d..77f5de930741cc13de3bbe8b9ff28a57
    void Update(content::WebContents* contents);
  
    // Clears the location bar's state for |contents|.
-@@ -269,6 +271,7 @@ class LocationBarView : public LocationBar,
+@@ -266,6 +268,7 @@ class LocationBarView : public LocationBar,
    std::vector<ContentSettingImageView*>& GetContentSettingViewsForTest() {
      return content_setting_views_;
    }
diff --git a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch
index 68f71d4d730b..6264c1e58cd3 100644
--- a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch
+++ b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
-index 8f196b1f1231da9e78ceafd254eafd1d5059532f..8021989767c0005a2c14e4cfbc1438496ba56337 100644
+index 98ed6177519a22f4696b6db18280accfb595370a..afe8717f10a2accef1f49f9bda5f8306838b3d6c 100644
 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
-@@ -139,6 +139,7 @@ bool LocationIconView::GetShowText() const {
+@@ -140,6 +140,7 @@ bool LocationIconView::GetShowText() const {
    const auto* location_bar_model = delegate_->GetLocationBarModel();
    const GURL& url = location_bar_model->GetURL();
    if (url.SchemeIs(content::kChromeUIScheme) ||
diff --git a/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch b/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch
index 15c6d4db1232..de7ed242721a 100644
--- a/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch
+++ b/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
-index a5405c946c95ec09f66df6ffc279a6d7bba5d212..5ca0e49f440fac12d2916f1c6ee7582718a468a8 100644
+index c105c0547445480f645d99fd6c10210bdf7564fb..5e7b86c708f5f8e9ed7da94927dc8c17813ec1b1 100644
 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
 +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
-@@ -348,7 +348,7 @@ void OmniboxPopupContentsView::UpdatePopupAppearance() {
+@@ -344,7 +344,7 @@ void OmniboxPopupContentsView::UpdatePopupAppearance() {
      if (children().size() == i) {
        AddChildView(std::make_unique<OmniboxRowView>(
            i, edit_model_,
diff --git a/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch
index 566eb35b271a..03c09fb87835 100644
--- a/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch
+++ b/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
-index a621083e6a2319f4256f2ba4c8f1011707e891cc..1e4357623b73dd20d24254c66acdb8653e609ed7 100644
+index 61db98363ffaec451bed8e7f8f9ca94812a0be27..9a6faee8a15ad1c2d31f3d42bcd4f1c447d0e927 100644
 --- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
 +++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
-@@ -512,6 +512,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const {
+@@ -513,6 +513,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const {
    if (site_settings_view_) {
      width = std::max(width, site_settings_view_->GetPreferredSize().width());
      width = std::max(width, permissions_view_->GetPreferredSize().width());
diff --git a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch
deleted file mode 100644
index d502c1eafb79..000000000000
--- a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
-index 142d0aa2196fc858cb5968207c2b3565f9a2a39b..a3c6e80bc93232b6cc8630f953b282be50558e22 100644
---- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
-+++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
-@@ -292,6 +292,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
-   for (permissions::PermissionRequest* request :
-        GetVisibleRequests(*delegate.get()))
-     AddRequestLine(request);
-+  BRAVE_PERMISSION_PROMPT_BUBBLE_VIEW
- 
-   absl::optional<std::u16string> extra_text = GetExtraText(*delegate.get());
-   if (extra_text.has_value()) {
diff --git a/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_view.cc.patch b/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_view.cc.patch
new file mode 100644
index 000000000000..833351bb3583
--- /dev/null
+++ b/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_view.cc.patch
@@ -0,0 +1,12 @@
+diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc
+index da5b906e8e6e5de10ccb30b932cc4077cc459ea9..3230fa13fc608da9f30305859bfbfc2695f13677 100644
+--- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc
++++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc
+@@ -292,6 +292,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
+   for (permissions::PermissionRequest* request :
+        GetVisibleRequests(*delegate.get()))
+     AddRequestLine(request);
++  BRAVE_PERMISSION_PROMPT_BUBBLE_VIEW
+ 
+   absl::optional<std::u16string> extra_text = GetExtraText(*delegate.get());
+   if (extra_text.has_value()) {
diff --git a/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch b/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch
index c0ce39b8c810..44f08092b1b9 100644
--- a/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc
-index 3909b5e2ab16168dffac1c3f0e9abae07634a0ce..a15ebbf4bb4315a00acc793698829c008f0d4bc4 100644
+index d916dfe8d143101dd8dfc8a569bb5505c533963e..4cc4a190be358c5b0ee11ec6e35f2459831564c7 100644
 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc
 +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc
 @@ -122,6 +122,7 @@ void SendTabToSelfDevicePickerBubbleView::Init() {
diff --git a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch
index cc8b5ff6c04d..772c6e761100 100644
--- a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch
+++ b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch
@@ -1,16 +1,16 @@
 diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
-index 1efe9453a6d271fdb118f39f95630296de13a95e..ef134beaf3bf407580e6fa84a3bbc82f6856984a 100644
+index 968b54c3d8bf6f52f6fa0cbf5ba143aca667c165..bcac2b3dac41977ec46a0aded2134d96a9b97cc2 100644
 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
 +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
-@@ -180,6 +180,7 @@ SidePanelCoordinator::~SidePanelCoordinator() {
- }
- 
- void SidePanelCoordinator::Show(absl::optional<SidePanelEntry::Id> entry_id) {
+@@ -175,6 +175,7 @@ SidePanelCoordinator::~SidePanelCoordinator() {
+ void SidePanelCoordinator::Show(
+     absl::optional<SidePanelEntry::Id> entry_id,
+     absl::optional<SidePanelUtil::SidePanelOpenTrigger> open_trigger) {
 +  BRAVE_SIDE_PANEL_COORDINATOR_SHOW
    if (!entry_id.has_value())
      entry_id = GetLastActiveEntryId().value_or(kDefaultEntry);
  
-@@ -419,6 +420,7 @@ std::unique_ptr<views::View> SidePanelCoordinator::CreateHeader() {
+@@ -483,6 +484,7 @@ std::unique_ptr<views::View> SidePanelCoordinator::CreateHeader() {
        ChromeLayoutProvider::Get()->GetDistanceMetric(
            ChromeDistanceMetric::DISTANCE_SIDE_PANEL_HEADER_VECTOR_ICON_SIZE)));
  
diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch
index d5204fdcbf80..e215967e1302 100644
--- a/patches/chrome-browser-ui-views-tabs-tab.cc.patch
+++ b/patches/chrome-browser-ui-views-tabs-tab.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
-index e0aa34c191965e9af561e38aeeeee0d9866add28..124d32f0e088979749e5ad398b8afc2a992e47bd 100644
+index 8e1238e936f948467e8cf66b04cad1432c814bb3..1eb9a0ff81cf76ea382146ea75d3d880f69ed4fe 100644
 --- a/chrome/browser/ui/views/tabs/tab.cc
 +++ b/chrome/browser/ui/views/tabs/tab.cc
 @@ -391,6 +391,7 @@ void Tab::Layout() {
diff --git a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch
index ffa79310c441..04e056dcdbb4 100644
--- a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch
+++ b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc
-index 4635a2fd158e16dbdd2f5ce6ac959026c49c6e0e..08ac6a898c0b949cc62fefcf28486267292ba13c 100644
+index 385ed3e7675d23fd274c0fd53308de059f2a9056..be396888e54f69a5a7e8c8c1b29c77a30cba7eb7 100644
 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc
 +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc
 @@ -74,6 +74,7 @@ class GM2TabStyle : public TabStyleViews {
@@ -10,7 +10,7 @@ index 4635a2fd158e16dbdd2f5ce6ac959026c49c6e0e..08ac6a898c0b949cc62fefcf28486267
    // Gets the bounds for the leading and trailing separators for a tab.
    SeparatorBounds GetSeparatorBounds(float scale) const;
  
-@@ -288,6 +289,7 @@ SkPath GM2TabStyle::GetPath(PathType path_type,
+@@ -291,6 +292,7 @@ SkPath GM2TabStyle::GetPath(PathType path_type,
    const ShapeModifier shape_modifier = GetShapeModifier(path_type);
    const bool extend_left_to_bottom = shape_modifier & kNoLowerLeftArc;
    const bool extend_right_to_bottom = shape_modifier & kNoLowerRightArc;
@@ -18,7 +18,7 @@ index 4635a2fd158e16dbdd2f5ce6ac959026c49c6e0e..08ac6a898c0b949cc62fefcf28486267
  
    SkPath path;
  
-@@ -565,7 +567,7 @@ TabStyle::SeparatorBounds GM2TabStyle::GetSeparatorBounds(float scale) const {
+@@ -567,7 +569,7 @@ TabStyle::SeparatorBounds GM2TabStyle::GetSeparatorBounds(float scale) const {
    separator_bounds.leading =
        gfx::RectF(aligned_bounds.x() + corner_radius,
                   aligned_bounds.y() +
@@ -27,7 +27,7 @@ index 4635a2fd158e16dbdd2f5ce6ac959026c49c6e0e..08ac6a898c0b949cc62fefcf28486267
                   separator_size.width(), separator_size.height());
  
    separator_bounds.trailing = separator_bounds.leading;
-@@ -935,12 +937,16 @@ void GM2TabStyle::PaintSeparators(gfx::Canvas* canvas) const {
+@@ -937,12 +939,16 @@ void GM2TabStyle::PaintSeparators(gfx::Canvas* canvas) const {
                                                     SK_AlphaOPAQUE));
    };
  
diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
index b69f9b930e77..82c1f8eb3ee1 100644
--- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
+++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-index 8499344e764b14f52fea1ace029fc4aa6bd5619a..ee822fe7723cb3c17036ef2b7d730b16c8c096fd 100644
+index ef34f041219b57493503d3dda3345f5a76cb2eec..5c421e824b43a6a497531ffbfc496c31c1fbf654 100644
 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -364,6 +364,7 @@ void ToolbarView::Init() {
+@@ -365,6 +365,7 @@ void ToolbarView::Init() {
    } else {
      // TODO(crbug.com/932818): Remove this once the
      // |kAutofillEnableToolbarStatusChip| is fully launched.
diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_controller.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_controller.cc.patch
index 54f1c6a2d558..60ce1fcbc6c0 100644
--- a/patches/chrome-browser-ui-views-translate-translate_bubble_controller.cc.patch
+++ b/patches/chrome-browser-ui-views-translate-translate_bubble_controller.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/translate/translate_bubble_controller.cc b/chrome/browser/ui/views/translate/translate_bubble_controller.cc
-index 1841b2899898bbaae66be4e24e84bfc01cd48e43..03e438e74a95506e898c013767106be70d652b43 100644
+index 70c356e404d949a52f6665894c1519f396c71dc6..c6af7ffffd614b613f400c453acbf6e29de88cff 100644
 --- a/chrome/browser/ui/views/translate/translate_bubble_controller.cc
 +++ b/chrome/browser/ui/views/translate/translate_bubble_controller.cc
 @@ -69,7 +69,7 @@ views::Widget* TranslateBubbleController::ShowTranslateBubble(
diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
index fa5251b868a1..378f1b161054 100644
--- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
+++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-index 8b770c0965aa7817d54ed61462ba2d090b2cdc7e..4b5475e05d887b664155c4cf091a12cf43795f11 100644
+index 72d811b043287157af9ce8f669ad485596b60330..680a17a45507b7bd160b837070c73ed1add3e516 100644
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -1422,6 +1422,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
+@@ -1431,6 +1431,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
  
  // static
  ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
diff --git a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch
index a64ab42250d9..b171c54a9deb 100644
--- a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch
+++ b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc
-index 02802dbc6165bb0da2e6739c93877eb0694303e2..3e103813daef49287fb030858ab3038d032ac214 100644
+index 0c6e7cb046955ba2619f2898bc09cc9cbe3431c9..74958f8f23c246a771761f71abc1b46cf48afbc6 100644
 --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
 +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
 @@ -59,6 +59,7 @@ namespace {
diff --git a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch
index c831f350d001..ca6cd2ac6acb 100644
--- a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch
+++ b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc
-index 983eb8545e8aca78d4df6d05af12327c98f3b5d1..ddbb980582a178d31e7a122fd2d6b48b9169cc3d 100644
+index 8f17a4a1123bbd98ce252e0aa4166f2e2d622da8..5806a502d6cd033effed0c667b3e17a00343cdc6 100644
 --- a/chrome/browser/ui/webui/history/history_ui.cc
 +++ b/chrome/browser/ui/webui/history/history_ui.cc
 @@ -64,6 +64,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) {
diff --git a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch
index d2f62ea3c2ef..07efe5da8db7 100644
--- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch
+++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
-index fb7235c628756c5b1b21656ffca0eb6bb7fdee5c..6965bcf5e870c9a39b1ac48e118389cdaf2d4fd2 100644
+index 6c2ec134c48c6c1811a98eb2ac71c545c8119b45..0085a999f1f8eac5dc52f4a901e4932653354f35 100644
 --- a/chrome/browser/ui/webui/settings/people_handler.cc
 +++ b/chrome/browser/ui/webui/settings/people_handler.cc
-@@ -865,6 +865,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
+@@ -856,6 +856,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
  
  void PeopleHandler::BeforeUnloadDialogCancelled() {
    // The before unload dialog is only shown during the first sync setup.
@@ -10,7 +10,7 @@ index fb7235c628756c5b1b21656ffca0eb6bb7fdee5c..6965bcf5e870c9a39b1ac48e118389cd
    DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount(
        signin::ConsentLevel::kSync));
    syncer::SyncService* service = GetSyncService();
-@@ -914,6 +915,7 @@ base::Value PeopleHandler::GetSyncStatusDictionary() const {
+@@ -905,6 +906,7 @@ base::Value PeopleHandler::GetSyncStatusDictionary() const {
        service && !disallowed_by_policy && service->IsSetupInProgress() &&
            !service->GetUserSettings()->IsFirstSetupComplete() &&
            identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync));
@@ -18,7 +18,7 @@ index fb7235c628756c5b1b21656ffca0eb6bb7fdee5c..6965bcf5e870c9a39b1ac48e118389cd
  
    const SyncStatusLabels status_labels = GetSyncStatusLabels(profile_);
    // TODO(crbug.com/1027467): Consider unifying some of the fields below to
-@@ -1080,6 +1082,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() {
+@@ -1071,6 +1073,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() {
  }
  
  bool PeopleHandler::IsProfileAuthNeededOrHasErrors() {
diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
index 0fa2e4c2fc33..60219eeaf4df 100644
--- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
+++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-index 46347927c02edbe84550f499ca0b498efb9d3e8f..5b227268ce7cf20e3b8202684e177c5fc4ebb0b4 100644
+index 29a39fe5bccbdfbb96c9f1a667af3b00759f1de4..e5c2b6a489eef0dec40cc4443bb0eb9699ca4be6 100644
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -3125,6 +3125,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -3145,6 +3145,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
    policy_indicator::AddLocalizedStrings(html_source);
    AddSecurityKeysStrings(html_source);
  
diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch
index 64b1762bf475..30d042ecf8ed 100644
--- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch
+++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
-index 45585986dcc93a0cec82fcca57ae76c934e609ec..a0a60441d3145b85cf04d453a411417c6b7e6271 100644
+index 95b5df7e355303c42e8eb540643b9ce08dfccb18..38e2408496ecfab6330d53dcfa00684a71baabae 100644
 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
 +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
-@@ -171,6 +171,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
+@@ -160,6 +160,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
      {ContentSettingsType::REQUEST_DESKTOP_SITE, nullptr},
      {ContentSettingsType::GET_DISPLAY_MEDIA_SET_SELECT_ALL_SCREENS, nullptr},
      {ContentSettingsType::NOTIFICATION_INTERACTIONS, nullptr},
@@ -10,7 +10,7 @@ index 45585986dcc93a0cec82fcca57ae76c934e609ec..a0a60441d3145b85cf04d453a411417c
  };
  
  static_assert(std::size(kContentSettingsTypeGroupNames) ==
-@@ -395,6 +396,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
+@@ -384,6 +385,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
  }
  
  ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) {
diff --git a/patches/chrome-browser-ui-webui-theme_source.cc.patch b/patches/chrome-browser-ui-webui-theme_source.cc.patch
index eea54c42419e..e484327d9995 100644
--- a/patches/chrome-browser-ui-webui-theme_source.cc.patch
+++ b/patches/chrome-browser-ui-webui-theme_source.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
-index f93be69f3134ddbc8f78ba6848f1beaff3d05493..c959d46f0044584a00024a33bea66d4ff4f38732 100644
+index f402c2fd101e86adc60fd61f6410f66021aa3694..6bfa9a806f6214eb7407552fd19d7a9045614c80 100644
 --- a/chrome/browser/ui/webui/theme_source.cc
 +++ b/chrome/browser/ui/webui/theme_source.cc
-@@ -141,7 +141,7 @@ void ThemeSource::StartDataRequest(
+@@ -124,7 +124,7 @@ void ThemeSource::StartDataRequest(
    int resource_id = -1;
    if (parsed_path == "current-channel-logo") {
      switch (chrome::GetChannel()) {
@@ -11,7 +11,7 @@ index f93be69f3134ddbc8f78ba6848f1beaff3d05493..c959d46f0044584a00024a33bea66d4f
        case version_info::Channel::CANARY:
          resource_id = IDR_PRODUCT_LOGO_32_CANARY;
          break;
-@@ -163,7 +163,10 @@ void ThemeSource::StartDataRequest(
+@@ -146,7 +146,10 @@ void ThemeSource::StartDataRequest(
          [[fallthrough]];
  #endif
        case version_info::Channel::UNKNOWN:
diff --git a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch
index 67057aae64d5..efe2d1f0c3f3 100644
--- a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch
+++ b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
-index 6b4fc626d07ffdd97e0e36fb052043a8ef088476..917c53653b877cd5c3e349c4bb81c0552dbb9762 100644
+index 350370a75679a540d57b2d339b7545ec2f84212d..808ba974bccd3bded7dd6e8d24fe473c9e547bec 100644
 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
 +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
 @@ -793,6 +793,7 @@ base::FilePath GetChromeAppsFolder() {
diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch
index 846cbf5aa1bd..774b4e5a1d19 100644
--- a/patches/chrome-common-BUILD.gn.patch
+++ b/patches/chrome-common-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
-index de183da8aeca0e2d4205afd0bc991fff1f382597..c4c0bea87f420d6c0651834c705e0abdfaf1d677 100644
+index 20b82925438f560c26e1bd32f3bd1c9a0a6345ac..6810c6412b6cdf8bc882ddb57995dad04ad75499 100644
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -87,6 +87,7 @@ source_set("channel_info") {
+@@ -89,6 +89,7 @@ source_set("channel_info") {
    } else if (is_fuchsia) {
      sources += [ "channel_info_fuchsia.cc" ]
    }
@@ -10,7 +10,7 @@ index de183da8aeca0e2d4205afd0bc991fff1f382597..c4c0bea87f420d6c0651834c705e0abd
  }
  
  source_set("ini_parser") {
-@@ -531,6 +532,7 @@ static_library("non_code_constants") {
+@@ -535,6 +536,7 @@ static_library("non_code_constants") {
      "//printing/buildflags",
      "//ui/base:buildflags",
    ]
diff --git a/patches/chrome-common-extensions-api-developer_private.idl.patch b/patches/chrome-common-extensions-api-developer_private.idl.patch
index e37a77549ae7..73531eef74d8 100644
--- a/patches/chrome-common-extensions-api-developer_private.idl.patch
+++ b/patches/chrome-common-extensions-api-developer_private.idl.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl
-index 7aeaee4665ce6b5c2a0182a2c3af9d99adbaf2a7..39a3ff317ff05e5fe5fa0760838c117d4b2123b1 100644
+index bb9b7822843468e50c85d47c2fa8adc1c1caccfc..65107aaccfbefc139bea83dd6e7050abec6ad077 100644
 --- a/chrome/common/extensions/api/developer_private.idl
 +++ b/chrome/common/extensions/api/developer_private.idl
-@@ -231,6 +231,7 @@ namespace developerPrivate {
+@@ -232,6 +232,7 @@ namespace developerPrivate {
      DOMString iconUrl;
      DOMString id;
      AccessModifier incognitoAccess;
diff --git a/patches/chrome-installer-mini_installer-BUILD.gn.patch b/patches/chrome-installer-mini_installer-BUILD.gn.patch
index ef26aa822785..c944b7043e93 100644
--- a/patches/chrome-installer-mini_installer-BUILD.gn.patch
+++ b/patches/chrome-installer-mini_installer-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
-index 51fa0d7f4cf77cd03e7332a3e3c0a22a173bf6ca..0efed0f32ae29bb2eb1b56fb81b9d1f223f6ba0f 100644
+index d7ac881770b38a25cfe0610bc7f8ed29ad3af454..7c2c6449aa3e6fc9423527b701fc2da3ac83fd28 100644
 --- a/chrome/installer/mini_installer/BUILD.gn
 +++ b/chrome/installer/mini_installer/BUILD.gn
 @@ -13,6 +13,7 @@ import("//third_party/icu/config.gni")
diff --git a/patches/chrome-installer-mini_installer-chrome.release.patch b/patches/chrome-installer-mini_installer-chrome.release.patch
index 8cbaeffb9ebb..29bc28ebec32 100644
--- a/patches/chrome-installer-mini_installer-chrome.release.patch
+++ b/patches/chrome-installer-mini_installer-chrome.release.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
-index 5cdaad05767053cf4327e7edf8c47adf473c31f2..4f3bfdc2eb7da65d778adb92225a05c9ec97be87 100644
+index 50e7498203d8ff466197d745b04b66c20cff0cc8..c4a613e87eb9394bc7f23b1ae4da607a15eb2443 100644
 --- a/chrome/installer/mini_installer/chrome.release
 +++ b/chrome/installer/mini_installer/chrome.release
 @@ -6,7 +6,7 @@
@@ -25,8 +25,8 @@ index 5cdaad05767053cf4327e7edf8c47adf473c31f2..4f3bfdc2eb7da65d778adb92225a05c9
 +chrome_child.dll.sig: %(VersionDir)s\
  chrome_elf.dll: %(VersionDir)s\
  chrome_pwa_launcher.exe: %(VersionDir)s\
- d3dcompiler_47.dll: %(VersionDir)s\
-@@ -62,6 +67,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\
+ chrome_wer.dll: %(VersionDir)s\
+@@ -63,6 +68,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\
  
  [HIDPI]
  chrome_200_percent.pak: %(VersionDir)s\
diff --git a/patches/chrome-installer-setup-BUILD.gn.patch b/patches/chrome-installer-setup-BUILD.gn.patch
index 81217a0aebfd..f6f2f4c672ce 100644
--- a/patches/chrome-installer-setup-BUILD.gn.patch
+++ b/patches/chrome-installer-setup-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn
-index a5416d1d625d00f8de11d9f9a752ff59cd3e9157..0fa20f7db7bb44c6f24d7e6b8e92ddbe6266f8b8 100644
+index a0d57f1fc1f59aec10d21673721f580b232848a2..e827d16a6f05ed35e26fd127de0d3fb990158ee5 100644
 --- a/chrome/installer/setup/BUILD.gn
 +++ b/chrome/installer/setup/BUILD.gn
 @@ -129,6 +129,7 @@ if (is_win) {
diff --git a/patches/chrome-installer-util-shell_util.cc.patch b/patches/chrome-installer-util-shell_util.cc.patch
index 0fdbd1c233d0..6305066c735c 100644
--- a/patches/chrome-installer-util-shell_util.cc.patch
+++ b/patches/chrome-installer-util-shell_util.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
-index f19a3aba8b980010bac4c1052e28e4aea1364d5d..9ff8f79151e889e306582aae3505f739be52ff27 100644
+index 2c2a0dd1060e3234ed459a4a3d2dd2e7b8554fd8..d91855a6bfcba5220c0857a47d0e8053ac91d3ff 100644
 --- a/chrome/installer/util/shell_util.cc
 +++ b/chrome/installer/util/shell_util.cc
-@@ -360,6 +360,7 @@ void GetChromeProgIdEntries(
+@@ -362,6 +362,7 @@ void GetChromeProgIdEntries(
    app_info.delegate_clsid = install_static::GetLegacyCommandExecuteImplClsid();
  
    GetProgIdEntries(app_info, entries);
@@ -10,7 +10,7 @@ index f19a3aba8b980010bac4c1052e28e4aea1364d5d..9ff8f79151e889e306582aae3505f739
  
    if (!app_info.delegate_clsid.empty()) {
      auto delegate_execute_entries =
-@@ -456,6 +457,7 @@ void GetShellIntegrationEntries(
+@@ -458,6 +459,7 @@ void GetShellIntegrationEntries(
  
    const std::wstring html_prog_id(GetBrowserProgId(suffix));
    for (int i = 0; ShellUtil::kPotentialFileAssociations[i] != nullptr; i++) {
@@ -18,7 +18,7 @@ index f19a3aba8b980010bac4c1052e28e4aea1364d5d..9ff8f79151e889e306582aae3505f739
      entries->push_back(std::make_unique<RegistryEntry>(
          capabilities + L"\\FileAssociations",
          ShellUtil::kPotentialFileAssociations[i], html_prog_id));
-@@ -480,6 +482,7 @@ void GetAppExtRegistrationEntries(
+@@ -482,6 +484,7 @@ void GetAppExtRegistrationEntries(
    std::wstring key_name =
        base::StrCat({ShellUtil::kRegClasses, kFilePathSeparator, ext,
                      kFilePathSeparator, ShellUtil::kRegOpenWithProgids});
@@ -26,7 +26,7 @@ index f19a3aba8b980010bac4c1052e28e4aea1364d5d..9ff8f79151e889e306582aae3505f739
    entries->push_back(
        std::make_unique<RegistryEntry>(key_name, prog_id, std::wstring()));
  }
-@@ -1668,8 +1671,10 @@ const wchar_t* ShellUtil::kPotentialFileAssociations[] = {
+@@ -1806,8 +1809,10 @@ const wchar_t* ShellUtil::kPotentialFileAssociations[] = {
      L".htm", L".html",  L".pdf",  L".shtml", L".svg",
      L".xht", L".xhtml", L".webp", nullptr};
  const wchar_t* ShellUtil::kBrowserProtocolAssociations[] = {L"ftp", L"http",
diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch
index 5d97d6ae6fbf..bd42b362c03e 100644
--- a/patches/chrome-renderer-BUILD.gn.patch
+++ b/patches/chrome-renderer-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
-index bd01239dcaecb503a1774343a6ae622dd0606f75..b820d99250a522c3d8c3c06b5d6e027244956f60 100644
+index 0ad8a99a23d47ebdc2806cd6fc17b391cd0a58b3..b79c2a202cee814d7eb33bfbcc9c5cbfbba53219 100644
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -213,6 +213,7 @@ static_library("renderer") {
+@@ -214,6 +214,7 @@ static_library("renderer") {
      "//v8",
    ]
  
diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch
index 861248bcb3f5..0d30313ba8ce 100644
--- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch
+++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
-index 207bc78a7adf7a6357f64101b21c644b089d6005..db73425d43a861e07059826fbd8b30dee912b8da 100644
+index 0cc423db56e007d0bfab8cd8730b6279931f8c84..2119191d85ccae969bb53b70561f41f272ac1639 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -542,7 +542,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -549,7 +549,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
        ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher());
  #endif
    content_settings::ContentSettingsAgentImpl* content_settings =
@@ -11,11 +11,11 @@ index 207bc78a7adf7a6357f64101b21c644b089d6005..db73425d43a861e07059826fbd8b30de
            render_frame, should_allow_for_content_settings,
            std::move(content_settings_delegate));
    if (chrome_observer_.get()) {
-@@ -736,6 +736,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -735,6 +735,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
          &RenderFrameFontFamilyAccessor::Bind, render_frame));
    }
  #endif
 +  BRAVE_RENDER_FRAME_CREATED
  }
  
- void ChromeContentRendererClient::WebViewCreated(blink::WebView* web_view) {
+ void ChromeContentRendererClient::WebViewCreated(blink::WebView* web_view,
diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch
index 3a68e29d5506..2d3c8488b470 100644
--- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch
+++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
-index ca2bd2bd2e6ffa7829a85a34f76b51762ce03355..18ec4feda6f1d3e27e5c4670c1bff7df4a2cf2d6 100644
+index 4ba204c360b97df2004e2ead3f41147771d3b94b..95a6f98e587172e1acd72c83cad1f8838b90b332 100644
 --- a/chrome/renderer/chrome_content_renderer_client.h
 +++ b/chrome/renderer/chrome_content_renderer_client.h
-@@ -228,6 +228,7 @@ class ChromeContentRendererClient
+@@ -229,6 +229,7 @@ class ChromeContentRendererClient
  #endif
  
   private:
diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
index f70e79844e05..f5a66333f666 100644
--- a/patches/chrome-test-BUILD.gn.patch
+++ b/patches/chrome-test-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index e791e09b43760ecc3aac9af7bac252233e6bae0b..56f6183bfbfbced03b190739a80dd9d174cf85f6 100644
+index df3163b43baeb68eaab222f64b3bc4b58c55140c..8bb8d00203ae5742ffea36aa2093ef7929ac51af 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -308,6 +308,7 @@ static_library("test_support") {
+@@ -317,6 +317,7 @@ static_library("test_support") {
      "//ui/gl",
    ]
  
@@ -10,11 +10,12 @@ index e791e09b43760ecc3aac9af7bac252233e6bae0b..56f6183bfbfbced03b190739a80dd9d1
    data_deps = []
  
    if (enable_pdf) {
-@@ -4978,6 +4979,7 @@ config("disable_thinlto_cache_flags") {
+@@ -5033,7 +5034,7 @@ if (is_android) {
+ }
  
  config("pdb_larger_than_4gb") {
-   if (is_win && symbol_level == 2 && use_thin_lto) {
-+  } if (is_win) {
+-  if (is_win && symbol_level == 2 && use_thin_lto) {
++  if (is_win) {
      # These binaries create PDBs larger than 4 GiB. Increasing the PDB page
      # size allows larger PDBs, but not all tools can handle such large PDBs
      # yet.
diff --git a/patches/chrome-tools-build-win-create_installer_archive.py.patch b/patches/chrome-tools-build-win-create_installer_archive.py.patch
index 0d3400155c89..1842e98b60c5 100644
--- a/patches/chrome-tools-build-win-create_installer_archive.py.patch
+++ b/patches/chrome-tools-build-win-create_installer_archive.py.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
-index 68e47062189905a280f11c0864601ceaaaab0814..c247f0ccc8f80a461c14e3a34b7e34f416b2b08c 100755
+index dfa3ee4f5f544e0f99543169639dd9687d03e807..1cc78c4efe33ed8ae796fbf9a087bb7f68c5680f 100755
 --- a/chrome/tools/build/win/create_installer_archive.py
 +++ b/chrome/tools/build/win/create_installer_archive.py
 @@ -42,6 +42,8 @@ SETUP_PATCH_FILE_PREFIX = "setup_patch"
diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch
index ac3a17aa8cc6..62e2d95a893f 100644
--- a/patches/chrome-utility-BUILD.gn.patch
+++ b/patches/chrome-utility-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
-index c38379320954e3548f627cf8a23c1ed5ac423f62..4b48d6a3ff08a5078e1dc75daf4433dd45f5b75e 100644
+index ba5c91ed65b5674a80bb77083cc01a92986631ce..f056853fe326af0b6eece81cfbdc9e4b03659f85 100644
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -70,6 +70,8 @@ static_library("utility") {
+@@ -72,6 +72,8 @@ static_library("utility") {
      "//ui/base:buildflags",
    ]
  
diff --git a/patches/components-bookmarks-browser-bookmark_model.h.patch b/patches/components-bookmarks-browser-bookmark_model.h.patch
index e46449be4bc1..f353a79514c0 100644
--- a/patches/components-bookmarks-browser-bookmark_model.h.patch
+++ b/patches/components-bookmarks-browser-bookmark_model.h.patch
@@ -1,8 +1,8 @@
 diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
-index 3f42c56d39190c049dd48ffceb7b2205f3cbcb78..187801088976283abf7225ca495c926d414213c6 100644
+index 6117be3c78b1a42c21fd9567962b897e4e69826f..6426e52829d58660b8a454c63d7368f17593a520 100644
 --- a/components/bookmarks/browser/bookmark_model.h
 +++ b/components/bookmarks/browser/bookmark_model.h
-@@ -311,6 +311,7 @@ class BookmarkModel : public BookmarkUndoProvider,
+@@ -326,6 +326,7 @@ class BookmarkModel : public BookmarkUndoProvider,
      return weak_factory_.GetWeakPtr();
    }
  
diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch
index 1b7aea3c4899..94bc647bd880 100644
--- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch
+++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
-index 79c85a441164d9307f34c564f7da898544a4694b..7e0b2e87204dfc52cfd4404874f7eb365609aa8e 100644
+index 22ec8feaa65c79473b5e7d0fd3d9765c1a49072e..42dd62c201b4b4d0349705d3c5058f98608aac3c 100644
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
-@@ -412,7 +412,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -420,7 +420,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              if (queryHasChanged) getInfoForOrigins();
              return true;
          }
diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsDelegate.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsDelegate.java.patch
deleted file mode 100644
index 57d297ad185d..000000000000
--- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsDelegate.java.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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
-index 5469897e04f5c7ac3a94b7bc069d3744e598f9c1..77902ae9e314a6f2ba00cadfc0f7fea13fc920fb 100644
---- 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
-@@ -124,4 +124,5 @@ public interface SiteSettingsDelegate {
-      * Dismisses the Privacy Sandbox snackbar, if active.
-      */
-     void dismissPrivacySandboxSnackbar();
-+    default void closeButton() {};
- }
diff --git a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch
index 279c3a9a7fab..b4a11ec9375c 100644
--- a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch
+++ b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc
-index 1175f143557e901948308a5afd74b8ec4310e471..b1c9a190f1056876c8e5e2acb92be04714d37691 100644
+index e0a80a54063d75f772e1db9cf0742123be778290..ab0e78fe527576aabf43ddbb46ed30deac27ad51 100644
 --- a/components/content_settings/core/browser/content_settings_pref.cc
 +++ b/components/content_settings/core/browser/content_settings_pref.cc
 @@ -162,6 +162,7 @@ void ContentSettingsPref::SetWebsiteSetting(
diff --git a/patches/components-content_settings-core-browser-cookie_settings.cc.patch b/patches/components-content_settings-core-browser-cookie_settings.cc.patch
index d8b2f8f43867..7cecc582996f 100644
--- a/patches/components-content_settings-core-browser-cookie_settings.cc.patch
+++ b/patches/components-content_settings-core-browser-cookie_settings.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
-index 6c14e1dd0ec9df4f313dd8866d88682e66edf81e..986d9e6f7e1d43e6d6e860443e0ab13f2d008218 100644
+index ccb986759151b48f871b8c1c48f163b78c2a0868..6d287391431a62045ed1b64798a548415dd97123 100644
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -192,6 +192,7 @@ ContentSetting CookieSettings::GetCookieSettingInternal(
+@@ -191,6 +191,7 @@ ContentSetting CookieSettings::GetCookieSettingInternal(
    DCHECK(value.is_int());
    ContentSetting setting = ValueToContentSetting(value);
    bool block = block_third && is_third_party_request;
diff --git a/patches/components-content_settings-core-common-cookie_settings_base.h.patch b/patches/components-content_settings-core-common-cookie_settings_base.h.patch
index d37d133e8738..dfdaba7c5f44 100644
--- a/patches/components-content_settings-core-common-cookie_settings_base.h.patch
+++ b/patches/components-content_settings-core-common-cookie_settings_base.h.patch
@@ -1,5 +1,5 @@
 diff --git a/components/content_settings/core/common/cookie_settings_base.h b/components/content_settings/core/common/cookie_settings_base.h
-index 01786694a1be87448964db3b75448244d0bf0fd1..dc707cf0af0901914d68b7dc75e3038f720f81a2 100644
+index 954be95c153ca822d3dc9f41868d82545a20b3ff..37f71e8c3b0be178dc8a928dac36f3ed7ac09c64 100644
 --- a/components/content_settings/core/common/cookie_settings_base.h
 +++ b/components/content_settings/core/common/cookie_settings_base.h
 @@ -66,12 +66,12 @@ namespace content_settings {
diff --git a/patches/components-crash-core-app-breakpad_linux.cc.patch b/patches/components-crash-core-app-breakpad_linux.cc.patch
index 76c4839a77f0..8513ca2951a9 100644
--- a/patches/components-crash-core-app-breakpad_linux.cc.patch
+++ b/patches/components-crash-core-app-breakpad_linux.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 3c28019ae3d1d8fd43e5e027fa3abe6786658885..d803b9fbad4e5a1d2ee3afbea3e3addcd8cc7e0b 100644
+index 6aa864db880408bf7021ac58673f4d8d489426b4..231f090686c3c55b276e7b962c22380d4ae75a37 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
 @@ -1462,7 +1462,7 @@ bool IsValidCrashReportId(const char* buf, size_t bytes_read,
diff --git a/patches/components-crash-core-app-crash_reporter_client.cc.patch b/patches/components-crash-core-app-crash_reporter_client.cc.patch
index 1b444f673140..a8ef1196fb29 100644
--- a/patches/components-crash-core-app-crash_reporter_client.cc.patch
+++ b/patches/components-crash-core-app-crash_reporter_client.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/crash/core/app/crash_reporter_client.cc b/components/crash/core/app/crash_reporter_client.cc
-index 82b7f241e26184240260d0b6287ded159681e15b..4d74277483d83555aeb0b4a29e288b0b1d4b68d0 100644
+index 463f92a6e547006a46119f52203482dd6695a84a..73e9b253e3642f4a66efca4439e30ae679c11acc 100644
 --- a/components/crash/core/app/crash_reporter_client.cc
 +++ b/components/crash/core/app/crash_reporter_client.cc
-@@ -190,6 +190,7 @@ void CrashReporterClient::GetSanitizationInformation(
+@@ -194,6 +194,7 @@ void CrashReporterClient::GetSanitizationInformation(
  #endif
  
  std::string CrashReporterClient::GetUploadUrl() {
diff --git a/patches/components-crash-core-browser-resources-crashes.js.patch b/patches/components-crash-core-browser-resources-crashes.js.patch
index e415da53e6d5..32e63501c1df 100644
--- a/patches/components-crash-core-browser-resources-crashes.js.patch
+++ b/patches/components-crash-core-browser-resources-crashes.js.patch
@@ -1,5 +1,5 @@
 diff --git a/components/crash/core/browser/resources/crashes.js b/components/crash/core/browser/resources/crashes.js
-index 2ee8847924549c71376a6f5580b5e37c2db2ef1b..772981687af92238a9604e5cac0dfa3d1dc5b18b 100644
+index fe07f128f1b8e5dddb2d880561f293973fe7024d..1e917aeebc5e578005fb2a79b208dd784b297b3c 100644
 --- a/components/crash/core/browser/resources/crashes.js
 +++ b/components/crash/core/browser/resources/crashes.js
 @@ -108,7 +108,7 @@ function updateCrashList({
diff --git a/patches/components-dom_distiller-content-browser-distiller_page_web_contents.cc.patch b/patches/components-dom_distiller-content-browser-distiller_page_web_contents.cc.patch
index 95b1fac159fb..76411de51b1d 100644
--- a/patches/components-dom_distiller-content-browser-distiller_page_web_contents.cc.patch
+++ b/patches/components-dom_distiller-content-browser-distiller_page_web_contents.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/dom_distiller/content/browser/distiller_page_web_contents.cc b/components/dom_distiller/content/browser/distiller_page_web_contents.cc
-index e516b97b87f99caf24d777538e900dc021c338ce..8122b1a8d80795465a97518391893fe6cb14e41f 100644
+index e2b93f4dbdf828c42f85851315da63173061621e..d5a3a6c2af16635731d8c878aa55183e771a9858 100644
 --- a/components/dom_distiller/content/browser/distiller_page_web_contents.cc
 +++ b/components/dom_distiller/content/browser/distiller_page_web_contents.cc
 @@ -164,7 +164,9 @@ void DistillerPageWebContents::ExecuteJavaScript() {
diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch
index 3c9db3c1c5c7..775dae5402ef 100644
--- a/patches/components-download-internal-common-download_item_impl.cc.patch
+++ b/patches/components-download-internal-common-download_item_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc
-index 22b5c89ec8c7fb507ce3a2281ea20629bf5c0a60..8d3b692d509b0514a974df51473eeb7aa364f85a 100644
+index 827aa517a92a97569ee23fc067b7c751f1d39cdc..552ef91857a5e294f1951c6e67ceb86d17d530bf 100644
 --- a/components/download/internal/common/download_item_impl.cc
 +++ b/components/download/internal/common/download_item_impl.cc
-@@ -2016,8 +2016,8 @@ void DownloadItemImpl::OnDownloadCompleting() {
+@@ -2013,8 +2013,8 @@ void DownloadItemImpl::OnDownloadCompleting() {
                       base::Unretained(download_file_.get()),
                       GetTargetFilePath(),
                       delegate_->GetApplicationClientIdForFileScanning(),
diff --git a/patches/components-embedder_support-user_agent_utils.cc.patch b/patches/components-embedder_support-user_agent_utils.cc.patch
index 2a6b064388de..a3ea67292fea 100644
--- a/patches/components-embedder_support-user_agent_utils.cc.patch
+++ b/patches/components-embedder_support-user_agent_utils.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc
-index acd60381a6294bb0e1868bf463845fe58a7d1f6c..04f0720a4b11da1ccd911369edfae15380b0b836 100644
+index 6eb4847667c19e51f6eb1f2126182b7e538154af..2bb58426ba1cb730b169b9b5b8c174717d28b1c9 100644
 --- a/components/embedder_support/user_agent_utils.cc
 +++ b/components/embedder_support/user_agent_utils.cc
-@@ -242,6 +242,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
+@@ -256,6 +256,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
  #if !BUILDFLAG(CHROMIUM_BRANDING)
    brand = version_info::GetProductName();
  #endif
diff --git a/patches/components-error_page-common-localized_error.cc.patch b/patches/components-error_page-common-localized_error.cc.patch
index b1d1216f81a2..b9f9031569bb 100644
--- a/patches/components-error_page-common-localized_error.cc.patch
+++ b/patches/components-error_page-common-localized_error.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/error_page/common/localized_error.cc b/components/error_page/common/localized_error.cc
-index 687605471920341c78b2480635d567601ffe1c97..ad7396dc4be86f0a80ca21b87893409350a3693f 100644
+index 2668f5ba53a3568baca247c453051cd2e45fbac1..33459618de364655f56d9ac776bcb9f5de02fcd5 100644
 --- a/components/error_page/common/localized_error.cc
 +++ b/components/error_page/common/localized_error.cc
 @@ -480,6 +480,7 @@ const LocalizedErrorMap* LookupErrorMap(const std::string& error_domain,
diff --git a/patches/components-external_intents-android-BUILD.gn.patch b/patches/components-external_intents-android-BUILD.gn.patch
index bc9d667e787a..898266707469 100644
--- a/patches/components-external_intents-android-BUILD.gn.patch
+++ b/patches/components-external_intents-android-BUILD.gn.patch
@@ -1,12 +1,12 @@
 diff --git a/components/external_intents/android/BUILD.gn b/components/external_intents/android/BUILD.gn
-index 054e7ab45846eb43d506b285b1286b40ac89abac..c81c2b6a104f3a6725e51edc51866b2fc1a48968 100644
+index 2eee9282ab6ba129e472c9ca1df8b19b7f1f578c..3a08843cb4fe76ed6e49ce602f88c92671c14280 100644
 --- a/components/external_intents/android/BUILD.gn
 +++ b/components/external_intents/android/BUILD.gn
-@@ -58,6 +58,7 @@ static_library("android") {
+@@ -68,6 +68,7 @@ static_library("android") {
      "//components/navigation_interception",
      "//content/public/browser",
    ]
 +  deps += [ "//brave/components/external_intents/android" ]
  }
  
- android_library("javatests") {
+ android_library("unit_device_javatests") {
diff --git a/patches/components-favicon-core-favicon_database.cc.patch b/patches/components-favicon-core-favicon_database.cc.patch
index 713f1567471c..ccf9ab049b64 100644
--- a/patches/components-favicon-core-favicon_database.cc.patch
+++ b/patches/components-favicon-core-favicon_database.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/core/favicon_database.cc
-index 9b9eb09b8cbb6b2058bdec18aba05dc3dda7baaf..13a63ff2891b33356115c589d3547e1dfda144ac 100644
+index a8f5b1b801c15463273b39c82d8dea56b210a6f6..e4c2770f49ebc8f374d8250e0e1870531d56d71c 100644
 --- a/components/favicon/core/favicon_database.cc
 +++ b/components/favicon/core/favicon_database.cc
-@@ -507,6 +507,7 @@ FaviconBitmapID FaviconDatabase::AddFaviconBitmap(
+@@ -508,6 +508,7 @@ FaviconBitmapID FaviconDatabase::AddFaviconBitmap(
      base::Time time,
      const gfx::Size& pixel_size) {
    DCHECK(icon_id);
@@ -10,7 +10,7 @@ index 9b9eb09b8cbb6b2058bdec18aba05dc3dda7baaf..13a63ff2891b33356115c589d3547e1d
  
    sql::Statement statement(db_.GetCachedStatement(
        SQL_FROM_HERE,
-@@ -559,8 +560,8 @@ bool FaviconDatabase::SetFaviconBitmap(
+@@ -560,8 +561,8 @@ bool FaviconDatabase::SetFaviconBitmap(
    } else {
      statement.BindNull(0);
    }
@@ -21,7 +21,7 @@ index 9b9eb09b8cbb6b2058bdec18aba05dc3dda7baaf..13a63ff2891b33356115c589d3547e1d
    statement.BindInt64(3, bitmap_id);
  
    return statement.Run();
-@@ -568,6 +569,7 @@ bool FaviconDatabase::SetFaviconBitmap(
+@@ -569,6 +570,7 @@ bool FaviconDatabase::SetFaviconBitmap(
  
  bool FaviconDatabase::SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id,
                                                       base::Time time) {
diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch
index 63d80fa2ee34..96b790c5b55a 100644
--- a/patches/components-history-core-browser-history_types.h.patch
+++ b/patches/components-history-core-browser-history_types.h.patch
@@ -1,5 +1,5 @@
 diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h
-index 5f25889794eb0811915717df193824091230668a..bb779f11b2e6cb6e9d14259be1de8ea8a485cafd 100644
+index f19f6f8d66c2cbca23155818c0c33db30f263436..06a303182c6f96966250d02de51bc7e79cb93ecd 100644
 --- a/components/history/core/browser/history_types.h
 +++ b/components/history/core/browser/history_types.h
 @@ -50,6 +50,8 @@ enum VisitSource {
diff --git a/patches/components-infobars-core-infobar_delegate.h.patch b/patches/components-infobars-core-infobar_delegate.h.patch
index 536367c7ea38..bdc61810c817 100644
--- a/patches/components-infobars-core-infobar_delegate.h.patch
+++ b/patches/components-infobars-core-infobar_delegate.h.patch
@@ -1,5 +1,5 @@
 diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h
-index 8717d40e06dc34ced1586859b74eb1d35d1bffb3..18ee5ca0cdad474448d1973db203cffe0a3d077a 100644
+index a8ba5ca4a8afb723996871dd0848311ee3703d7e..2527b69dad864a0dfd1c82a35ddfa576663966cf 100644
 --- a/components/infobars/core/infobar_delegate.h
 +++ b/components/infobars/core/infobar_delegate.h
 @@ -181,6 +181,7 @@ class InfoBarDelegate {
diff --git a/patches/components-metrics-BUILD.gn.patch b/patches/components-metrics-BUILD.gn.patch
index f910d3834d4c..1a854c9e07f0 100644
--- a/patches/components-metrics-BUILD.gn.patch
+++ b/patches/components-metrics-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn
-index 9c08e218f90bf44d5e53b40d5607534b1a0ac4f7..1e5d46bae375c2f640c14533b6d884587a68a218 100644
+index 334f527bfbefddbe19883d24d738e00a0d385d3c..03fc051ad0b2f93894827890bcf8ce3d2012fe71 100644
 --- a/components/metrics/BUILD.gn
 +++ b/components/metrics/BUILD.gn
 @@ -192,6 +192,7 @@ static_library("metrics") {
diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch
index 07a8e6820209..5061aaad7efc 100644
--- a/patches/components-omnibox-browser-BUILD.gn.patch
+++ b/patches/components-omnibox-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
-index d0dc7efb10eff3eca7c34a57ed192ddde634b60b..91ca955f9dd8ca1ddcd82e1c7ec42a5f859630da 100644
+index 53214103aa465336f9a8c013487b60cac540e613..20030780acfdf64418ae936ae2e97ce84665d0ae 100644
 --- a/components/omnibox/browser/BUILD.gn
 +++ b/components/omnibox/browser/BUILD.gn
-@@ -284,6 +284,7 @@ static_library("browser") {
+@@ -290,6 +290,7 @@ static_library("browser") {
      "//ui/base",
      "//ui/gfx",
    ]
diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch
index 3cba694927d8..5e6c131075ce 100644
--- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch
+++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch
@@ -1,20 +1,21 @@
 diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
-index fba4727d020cb21f4ebc0aefc2513aec2ba4b833..e4532527eba6ca5dfbbc103f799806e834ad635b 100644
+index f6a85f48e5743e42788c7d244dd1d7a91174c0c9..1c0c28e851fda8a107faa2180bc7b125c06f3a4f 100644
 --- a/components/omnibox/browser/autocomplete_controller.cc
 +++ b/components/omnibox/browser/autocomplete_controller.cc
-@@ -312,6 +312,7 @@ AutocompleteController::AutocompleteController(
-   if (provider_types & AutocompleteProvider::TYPE_SEARCH) {
-     search_provider_ = new SearchProvider(provider_client_.get(), this);
-     providers_.push_back(search_provider_.get());
-+    BRAVE_AUTOCOMPLETE_CONTROLLER_AUTOCOMPLETE_CONTROLLER
-   }
-   // It's important that the HistoryURLProvider gets added after SearchProvider:
-   // AutocompleteController::Start() calls each providers' Start() function
-@@ -818,6 +819,7 @@ void AutocompleteController::UpdateResult(
-     AutocompleteResult::LogUpdateMetrics(last_result_for_logging, result_,
-                                          in_start_);
-   }
-+  BRAVE_AUTOCOMPLETE_CONTROLLER_UPDATE_RESULT
+@@ -355,6 +355,7 @@ AutocompleteController::AutocompleteController(
+     if (provider_types & AutocompleteProvider::TYPE_SEARCH) {
+       search_provider_ = new SearchProvider(provider_client_.get(), this);
+       providers_.push_back(search_provider_.get());
++      BRAVE_AUTOCOMPLETE_CONTROLLER_AUTOCOMPLETE_CONTROLLER
+     }
+     // Providers run in the order they're added.  Add `HistoryURLProvider` after
+     // `SearchProvider` because:
+@@ -933,6 +934,8 @@ void AutocompleteController::UpdateResult(
+   metrics_.OnUpdateResult(last_result_for_logging,
+                           result_.GetMatchDedupComparators());
  
++  BRAVE_AUTOCOMPLETE_CONTROLLER_UPDATE_RESULT
++
    // Below are all annotations after the match list is ready.
  #if !BUILDFLAG(IS_IOS)
+   // HistoryClusters is not enabled on iOS.
diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
index 58d8c4b4fbb0..0cf7190e01b4 100644
--- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
+++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
-index 7e94059c7d620f56f987d354922a7ef6d2b7117a..dd5ec5287754973cada22877874642ce355429dd 100644
+index a7a3da64a354218b4c45349e9c9561e1b2fcac12..4f37d099cf91c264c71f257e74c1842e4f663a36 100644
 --- a/components/omnibox/browser/omnibox_edit_model.cc
 +++ b/components/omnibox/browser/omnibox_edit_model.cc
-@@ -420,6 +420,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
+@@ -415,6 +415,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
        (*text == display_text_ || *text == url_for_editing_)) {
      *url_from_text = controller()->GetLocationBarModel()->GetURL();
      *write_url = true;
diff --git a/patches/components-os_crypt-BUILD.gn.patch b/patches/components-os_crypt-BUILD.gn.patch
index 2166734734c3..572f6405c4db 100644
--- a/patches/components-os_crypt-BUILD.gn.patch
+++ b/patches/components-os_crypt-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/components/os_crypt/BUILD.gn b/components/os_crypt/BUILD.gn
-index 9d7a8ad7a54e26e3517e613a85aa2ec90f598beb..eccf5dd0e69323177a4f4b8395a15372d4cf54e9 100644
+index 124e5ae58030a2ef98e618b96c985173747e08c6..a03dfbd527e172b816f64cc2f3aafa6616343438 100644
 --- a/components/os_crypt/BUILD.gn
 +++ b/components/os_crypt/BUILD.gn
-@@ -114,6 +114,7 @@ component("os_crypt") {
+@@ -115,6 +115,7 @@ component("os_crypt") {
        defines += [ "USE_KWALLET" ]
      }
    }
diff --git a/patches/components-os_crypt-key_storage_keyring_unittest.cc.patch b/patches/components-os_crypt-key_storage_keyring_unittest.cc.patch
index 3f89d4c911b9..17309a81756e 100644
--- a/patches/components-os_crypt-key_storage_keyring_unittest.cc.patch
+++ b/patches/components-os_crypt-key_storage_keyring_unittest.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/os_crypt/key_storage_keyring_unittest.cc b/components/os_crypt/key_storage_keyring_unittest.cc
-index cbd4c72d6a451f8745267d8524be9b185ba8cf21..eea67de94dc24162eec0afaf4427607184a665d1 100644
+index 18b0763188074613ddad8c18a40482873d584b9a..c216b3fb08cc5569c8427e47278e5514093b9892 100644
 --- a/components/os_crypt/key_storage_keyring_unittest.cc
 +++ b/components/os_crypt/key_storage_keyring_unittest.cc
 @@ -18,7 +18,7 @@ namespace {
diff --git a/patches/components-os_crypt-key_storage_kwallet_unittest.cc.patch b/patches/components-os_crypt-key_storage_kwallet_unittest.cc.patch
index 86d8c3cab113..5259ed1bac06 100644
--- a/patches/components-os_crypt-key_storage_kwallet_unittest.cc.patch
+++ b/patches/components-os_crypt-key_storage_kwallet_unittest.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/os_crypt/key_storage_kwallet_unittest.cc b/components/os_crypt/key_storage_kwallet_unittest.cc
-index c87ba0e1e7ab25746a03b84113ad7ad48c3f7210..91544fa464f4048c3e188c205b599056cb8503d1 100644
+index d3a8375580b7b2a2aa085f65b6ca069494edca1c..755cdeab6f3bf9b60343086d2b73be948d5f8873 100644
 --- a/components/os_crypt/key_storage_kwallet_unittest.cc
 +++ b/components/os_crypt/key_storage_kwallet_unittest.cc
-@@ -34,8 +34,8 @@ constexpr KWalletDBus::Error CANNOT_CONTACT =
+@@ -35,8 +35,8 @@ constexpr KWalletDBus::Error CANNOT_CONTACT =
  const char kExpectedFolderName[] = "Chrome Keys";
  const char kExpectedEntryName[] = "Chrome Safe Storage";
  #else
diff --git a/patches/components-os_crypt-os_crypt_win.cc.patch b/patches/components-os_crypt-os_crypt_win.cc.patch
index c06bd2ab3d9e..5e3cf8bff05a 100644
--- a/patches/components-os_crypt-os_crypt_win.cc.patch
+++ b/patches/components-os_crypt-os_crypt_win.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/os_crypt/os_crypt_win.cc b/components/os_crypt/os_crypt_win.cc
-index 305a8caa4eb45de6782e39e32e175d9d409b2fbf..c6d21eeaa204771274e39eb04975b732c4463181 100644
+index 018a432236d79d6c54e2c8f8a2a0ec70ea5cdd94..5bd44392521654d7fb2987e78a1e2b2b666b594e 100644
 --- a/components/os_crypt/os_crypt_win.cc
 +++ b/components/os_crypt/os_crypt_win.cc
-@@ -146,6 +146,7 @@ bool OSCryptImpl::DecryptString16(const std::string& ciphertext,
+@@ -157,6 +157,7 @@ bool OSCryptImpl::DecryptString16(const std::string& ciphertext,
  
  bool OSCryptImpl::EncryptString(const std::string& plaintext,
                              std::string* ciphertext) {
@@ -10,7 +10,7 @@ index 305a8caa4eb45de6782e39e32e175d9d409b2fbf..c6d21eeaa204771274e39eb04975b732
    if (use_legacy_)
      return EncryptStringWithDPAPI(plaintext, ciphertext);
  
-@@ -171,6 +172,7 @@ bool OSCryptImpl::EncryptString(const std::string& plaintext,
+@@ -182,6 +183,7 @@ bool OSCryptImpl::EncryptString(const std::string& plaintext,
  
  bool OSCryptImpl::DecryptString(const std::string& ciphertext,
                              std::string* plaintext) {
diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch
index e3d12fcf1998..3026c59a01cf 100644
--- a/patches/components-permissions-BUILD.gn.patch
+++ b/patches/components-permissions-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn
-index ca123ef391d970a9307fc976d9e79a2353ed54ee..b7bd9cf318270bace87fe08bc70422e1179de6a6 100644
+index bd71040ecc8e76266d648e71c624758c33777f0a..17dca4dd2663c737a84f8ca3f82707ebc4849702 100644
 --- a/components/permissions/BUILD.gn
 +++ b/components/permissions/BUILD.gn
-@@ -137,6 +137,7 @@ source_set("permissions") {
+@@ -139,6 +139,7 @@ source_set("permissions") {
        "contexts/geolocation_permission_context_mac.h",
      ]
    }
diff --git a/patches/components-permissions-android-BUILD.gn.patch b/patches/components-permissions-android-BUILD.gn.patch
index becb3bd95f62..4c5c71929801 100644
--- a/patches/components-permissions-android-BUILD.gn.patch
+++ b/patches/components-permissions-android-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/components/permissions/android/BUILD.gn b/components/permissions/android/BUILD.gn
-index a0711ec39bf5607cf4ae85d6db34a034c5828e6d..c5a02bb39e3dde969346b5b73c1c8527c24ccc9c 100644
+index 633785a045d88cce3677d4e3faaccdf457b036ea..8af643d163f991da3eb12d9dc7a52e53046e997e 100644
 --- a/components/permissions/android/BUILD.gn
 +++ b/components/permissions/android/BUILD.gn
 @@ -115,6 +115,7 @@ android_library("java") {
diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch
index 1f9c77879612..13c2b91a7083 100644
--- a/patches/components-permissions-permission_uma_util.cc.patch
+++ b/patches/components-permissions-permission_uma_util.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc
-index 1b503d0249b7b2fe85c186b4343d361c186847b7..4f8663ab3691254f362036b1c4c519ad9287689f 100644
+index 4fd0e68c220b543ed4eeaee5aad5e917895af3a2..9140c778a184d675826a5cb1eea809cfba1dddf5 100644
 --- a/components/permissions/permission_uma_util.cc
 +++ b/components/permissions/permission_uma_util.cc
 @@ -110,6 +110,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) {
diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch
index c0293a4e055c..67f6be1d4445 100644
--- a/patches/components-policy-tools-generate_policy_source.py.patch
+++ b/patches/components-policy-tools-generate_policy_source.py.patch
@@ -1,5 +1,5 @@
 diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py
-index 226c91e767151a08d8556d18512a2e841fe67da0..1ece93887ff2e68afbeabb038ac6af71466c8b7c 100755
+index 7fb456b7a0a77d016c5e16ea597dc6f7831131ef..3741b89178b3e58377deb2ecf9938c6c37ea3bbc 100755
 --- a/components/policy/tools/generate_policy_source.py
 +++ b/components/policy/tools/generate_policy_source.py
 @@ -54,6 +54,7 @@ PLATFORM_STRINGS = {
@@ -10,11 +10,11 @@ index 226c91e767151a08d8556d18512a2e841fe67da0..1ece93887ff2e68afbeabb038ac6af71
  
  class PolicyDetails:
    """Parses a policy template and caches all its details."""
-@@ -370,6 +371,7 @@ def main():
+@@ -381,6 +382,7 @@ def main():
      chrome_major_version = ParseVersionFile(version_path)
  
    template_file_contents = _LoadJSONFile(template_file_name)
 +  AddBravePolicies(template_file_contents)
    risk_tags = RiskTags(template_file_contents)
    policy_details = [
-       PolicyDetails(policy, chrome_major_version, target_platform,
+       PolicyDetails(policy, chrome_major_version, deprecation_milestone_buffer,
diff --git a/patches/components-search_engines-default_search_manager.cc.patch b/patches/components-search_engines-default_search_manager.cc.patch
index f63672eae14f..96d316aa7e72 100644
--- a/patches/components-search_engines-default_search_manager.cc.patch
+++ b/patches/components-search_engines-default_search_manager.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc
-index aeb8330f6034eb416a064e633264dba836360c78..9f3aec404531d4f5c169f8e4b7d5ed2cc86f9827 100644
+index a17d1d4c3b908895acc0b9e43984766e13949b9f..e5bee77f140f024f6c2e9abc41157466c5b222d5 100644
 --- a/components/search_engines/default_search_manager.cc
 +++ b/components/search_engines/default_search_manager.cc
-@@ -309,6 +309,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() {
+@@ -312,6 +312,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() {
    // Check if default search preference is overriden by extension.
    if (pref->IsExtensionControlled()) {
      extension_default_search_ = std::move(turl_data);
diff --git a/patches/components-search_engines-prepopulated_engines.json.patch b/patches/components-search_engines-prepopulated_engines.json.patch
index 873636bf4331..f763a2ae326e 100644
--- a/patches/components-search_engines-prepopulated_engines.json.patch
+++ b/patches/components-search_engines-prepopulated_engines.json.patch
@@ -1,5 +1,5 @@
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
-index 765fe245ba192843486bfd677adc18255095036a..a54ffc9601a6980e79a207ad8629bea151641d1b 100644
+index 42bbc4b11d3a6b90819ac04d53c53587a590088c..a2393b711df2006fdf58617ea1ef212a0b21b0dc 100644
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
 @@ -91,17 +91,6 @@
diff --git a/patches/components-security_interstitials-content-cert_report_helper.cc.patch b/patches/components-security_interstitials-content-cert_report_helper.cc.patch
index 98690ec5b51e..4a56c3b9763d 100644
--- a/patches/components-security_interstitials-content-cert_report_helper.cc.patch
+++ b/patches/components-security_interstitials-content-cert_report_helper.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/security_interstitials/content/cert_report_helper.cc b/components/security_interstitials/content/cert_report_helper.cc
-index da1876ef2370fb448c3e1dade4a32ec804b00756..09d0786f7f93126455804d796108d0c426f767fa 100644
+index 4cc8a6cf7ad037d11d2270f90c9efcbe7f415acf..3362c085e89cbba15529408a3435274034469591 100644
 --- a/components/security_interstitials/content/cert_report_helper.cc
 +++ b/components/security_interstitials/content/cert_report_helper.cc
 @@ -204,6 +204,7 @@ bool CertReportHelper::ShouldShowEnhancedProtectionMessage() {
diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch
index 8929cbb53171..2e753fa3dd82 100644
--- a/patches/components-sync-protocol-proto_visitors.h.patch
+++ b/patches/components-sync-protocol-proto_visitors.h.patch
@@ -1,8 +1,8 @@
 diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h
-index 2d8bddd95d498e0f702600b827f43b739918d5f6..8402650fa065dbe2b26e45d41460a70e267cce21 100644
+index 9dd2374342d6e39cb3c2c81224335f136b6f8e31..c55eebae68a93e418cd4e4101a2e9498d5c34aab 100644
 --- a/components/sync/protocol/proto_visitors.h
 +++ b/components/sync/protocol/proto_visitors.h
-@@ -399,6 +399,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) {
+@@ -401,6 +401,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) {
    VISIT(manufacturer);
    VISIT(last_updated_timestamp);
    VISIT(feature_fields);
@@ -10,7 +10,7 @@ index 2d8bddd95d498e0f702600b827f43b739918d5f6..8402650fa065dbe2b26e45d41460a70e
    VISIT(sharing_fields);
    VISIT(invalidation_fields);
    VISIT(paask_fields);
-@@ -411,6 +412,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) {
+@@ -413,6 +414,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) {
    VISIT(send_tab_to_self_receiving_enabled);
  }
  
diff --git a/patches/components-sync-protocol-protocol_sources.gni.patch b/patches/components-sync-protocol-protocol_sources.gni.patch
index 960573c6c195..d221811b0fd9 100644
--- a/patches/components-sync-protocol-protocol_sources.gni.patch
+++ b/patches/components-sync-protocol-protocol_sources.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/components/sync/protocol/protocol_sources.gni b/components/sync/protocol/protocol_sources.gni
-index d73f98f2fd650a1f9bbab26aa7bec0163ac081c0..f28978ad8d0b9f80d1acdd9afeb0445611a264da 100644
+index 99e33100cced9a9e573bf3850ec055f60d360772..65ade753c0d8941ee3701cb63b18cabdaf2c731b 100644
 --- a/components/sync/protocol/protocol_sources.gni
 +++ b/components/sync/protocol/protocol_sources.gni
 @@ -73,3 +73,4 @@ sync_protocol_sources = [
diff --git a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch
index 0a18f4d565fe..9ac11b00dbb3 100644
--- a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch
+++ b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/sync_device_info/device_info_sync_bridge.cc b/components/sync_device_info/device_info_sync_bridge.cc
-index 3922345285ee473f786fca8a91c44118c862f212..4c3217dc41d0660ae48fa2776ea8553ef6b7a52a 100644
+index 93b280268977f7e690ad27dae30f177ddd57023d..d19f291d0a0d847efd694521617ad2c7d98ec598 100644
 --- a/components/sync_device_info/device_info_sync_bridge.cc
 +++ b/components/sync_device_info/device_info_sync_bridge.cc
 @@ -261,6 +261,7 @@ std::unique_ptr<DeviceInfoSpecifics> MakeLocalDeviceSpecifics(
@@ -27,7 +27,7 @@ index 3922345285ee473f786fca8a91c44118c862f212..4c3217dc41d0660ae48fa2776ea8553e
      }
  
      if (change->type() == EntityChange::ACTION_DELETE) {
-@@ -687,6 +689,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata(
+@@ -707,6 +709,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata(
      return;
    }
  
@@ -35,7 +35,7 @@ index 3922345285ee473f786fca8a91c44118c862f212..4c3217dc41d0660ae48fa2776ea8553e
    // In the regular case for sync being disabled, wait for MergeSyncData()
    // before initializing the LocalDeviceInfoProvider.
    if (!metadata_batch->GetModelTypeState().initial_sync_done() &&
-@@ -895,6 +898,7 @@ DeviceInfoSyncBridge::CountActiveDevicesByType() const {
+@@ -915,6 +918,7 @@ DeviceInfoSyncBridge::CountActiveDevicesByType() const {
  }
  
  void DeviceInfoSyncBridge::ExpireOldEntries() {
diff --git a/patches/content-browser-browser_main_loop.h.patch b/patches/content-browser-browser_main_loop.h.patch
index f4032bb1bd52..23aee83f2d2d 100644
--- a/patches/content-browser-browser_main_loop.h.patch
+++ b/patches/content-browser-browser_main_loop.h.patch
@@ -1,5 +1,5 @@
 diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
-index a8c8c6b5d161c5603febb9fbedc0ed652d20e6e3..02efef0b960fbb7d9c521b02c1cd6b616d881a0e 100644
+index a84921b59cd7cc4ea4179a81005a5d3170e2c0f4..edf15fd217cf4993bddaf9dfb27d7d13fcc2381b 100644
 --- a/content/browser/browser_main_loop.h
 +++ b/content/browser/browser_main_loop.h
 @@ -158,6 +158,7 @@ class CONTENT_EXPORT BrowserMainLoop {
diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch
index d1469b43312e..4a8c0139dff8 100644
--- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch
+++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
-index cf9ba610d35b2a73586daff346e8b1fd8e406a59..9e5ddbede6bc4e7e516ad91429981e0f5de65292 100644
+index 40b1947b593d1be851f1562fd1b8aad2987c33d1..fdd3b0664ebff4fb415c9050ca952d27fe397a72 100644
 --- a/content/browser/renderer_host/navigation_controller_impl.cc
 +++ b/content/browser/renderer_host/navigation_controller_impl.cc
-@@ -3404,16 +3404,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
+@@ -3421,16 +3421,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
    // Note: we intentionally leave the pending entry in place for renderer debug
    // URLs, unlike the cases below where we clear it if the navigation doesn't
    // proceed.
diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch
index 263236e688be..7aacbd4556f1 100644
--- a/patches/content-browser-renderer_host-navigation_request.cc.patch
+++ b/patches/content-browser-renderer_host-navigation_request.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index e3e73a2353312a505ffee9d7b9a801bf480dbf86..cab6855d7eab85ced7cd482c27248c2cf1221826 100644
+index d542f33b7c5cecb6e66649597bb0d50d74bb3837..9b955eebb5de683a642b8884aefa23b5bf494aa5 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -2735,6 +2735,7 @@ void NavigationRequest::OnRequestRedirected(
+@@ -2773,6 +2773,7 @@ void NavigationRequest::OnRequestRedirected(
    common_params_->url = redirect_info.new_url;
    common_params_->method = redirect_info.new_method;
    common_params_->referrer->url = GURL(redirect_info.new_referrer);
@@ -10,7 +10,7 @@ index e3e73a2353312a505ffee9d7b9a801bf480dbf86..cab6855d7eab85ced7cd482c27248c2c
    common_params_->referrer = Referrer::SanitizeForRequest(
        common_params_->url, *common_params_->referrer);
  
-@@ -4114,6 +4115,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -4158,6 +4159,7 @@ void NavigationRequest::OnStartChecksComplete(
    headers.MergeFrom(TakeModifiedRequestHeaders());
    begin_params_->headers = headers.ToString();
  
diff --git a/patches/content-browser-webui-web_ui_impl.cc.patch b/patches/content-browser-webui-web_ui_impl.cc.patch
index cbc007f75ccb..d80290a49895 100644
--- a/patches/content-browser-webui-web_ui_impl.cc.patch
+++ b/patches/content-browser-webui-web_ui_impl.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc
-index 47ef1f2983593d1224238226002b68de24c9abb4..ee2f9622b26eb8c2f0e214941de488ddf4c33ee2 100644
+index cb6c372f2cc9f25f2d3e1092427eda028e55e1b6..b47bab448584868fb612669657d0451323746ab1 100644
 --- a/content/browser/webui/web_ui_impl.cc
 +++ b/content/browser/webui/web_ui_impl.cc
 @@ -75,6 +75,7 @@ WebUIImpl::WebUIImpl(WebContentsImpl* contents, RenderFrameHostImpl* frame_host)
diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch
index a43156ac7079..ac90600b29ec 100644
--- a/patches/content-common-BUILD.gn.patch
+++ b/patches/content-common-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
-index c7291beb87ba7122f5d1dc38248e842690b850f6..0056940b6ac74ede2169e9fdeb93104c5c21592e 100644
+index 1ac4a63325dca9c8664c9bc1dacd125325d31c9d..b81f8e1eb759518a3de99d7d33b881d310823f2b 100644
 --- a/content/common/BUILD.gn
 +++ b/content/common/BUILD.gn
 @@ -42,6 +42,7 @@ source_set("common") {
diff --git a/patches/content-common-user_agent.cc.patch b/patches/content-common-user_agent.cc.patch
index 92cd85e0778a..aebd4ad66969 100644
--- a/patches/content-common-user_agent.cc.patch
+++ b/patches/content-common-user_agent.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
-index bc2f280dfcc3a2a603f8abd68274cf620e00839b..3ebe3d424c9ddcb456a92833c47cf5f4ec9e6062 100644
+index cdfbe98a2c213bee6590d67e68131673cbaeff0f..4876001036fc8469b44909e1a69c5670c5a4aa5e 100644
 --- a/content/common/user_agent.cc
 +++ b/content/common/user_agent.cc
-@@ -330,6 +330,7 @@ std::string GetAndroidOSInfo(
+@@ -353,6 +353,7 @@ std::string GetAndroidOSInfo(
  
    // Send information about the device.
    bool semicolon_inserted = false;
diff --git a/patches/content-public-browser-browser_main_parts.h.patch b/patches/content-public-browser-browser_main_parts.h.patch
index 0ec406b2e7e1..1da3dcf0074b 100644
--- a/patches/content-public-browser-browser_main_parts.h.patch
+++ b/patches/content-public-browser-browser_main_parts.h.patch
@@ -1,5 +1,5 @@
 diff --git a/content/public/browser/browser_main_parts.h b/content/public/browser/browser_main_parts.h
-index b236b8ad3057023d990bbac6cf4c20d57a753286..78af891af25888fd253778488b6442f2c82ba338 100644
+index f7b5c311ff65380d1e4f56909bcf26133573ac64..c449a9f1bc0c34bcd483ddac45155c533f058d7b 100644
 --- a/content/public/browser/browser_main_parts.h
 +++ b/content/public/browser/browser_main_parts.h
 @@ -158,6 +158,9 @@ class CONTENT_EXPORT BrowserMainParts {
diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch
index 93da981c2d77..bd3a0588fd97 100644
--- a/patches/content-public-browser-content_browser_client.h.patch
+++ b/patches/content-public-browser-content_browser_client.h.patch
@@ -1,8 +1,8 @@
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index a49794184baa977ddf03cd911f8d8d7d671df65f..59773bb998d562f153ea021b1195cf8c2ece528b 100644
+index 614766cd642efdeab96acac461c1b0482bf030f3..5c990a54f918532a61f95ce3c1ed6f435bfbe9e4 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -1997,6 +1997,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -2021,6 +2021,7 @@ class CONTENT_EXPORT ContentBrowserClient {
    virtual ui::AXMode GetAXModeForBrowserContext(
        BrowserContext* browser_context);
  
diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch
index 8fc79f80d429..a86928823767 100644
--- a/patches/content-renderer-render_frame_impl.cc.patch
+++ b/patches/content-renderer-render_frame_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 2c84b31ec771c11818e677e5d120fb965db6da86..e854d4e408e040029ba864e42857f63adc49eb61 100644
+index 207c1b54f12712a8d20a18a024c5ebfb37430d9a..2e12abffe9b76c2f1398386d70c0ab60a168d71b 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4530,6 +4530,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
+@@ -4471,6 +4471,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
    // Temporarily return early and fix properly as part of
    // https://crbug.com/426555.
    if (web_view->MainFrame()->IsWebRemoteFrame())
diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch
index 72ed0f6e9c80..147cf626b597 100644
--- a/patches/content-renderer-render_thread_impl.cc.patch
+++ b/patches/content-renderer-render_thread_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index ab74207b348f211ee78de1384c9c75f7682926fe..4903313e50f6aab46ca23cd3c02237754af08fb1 100644
+index 914ecfff4bcec204e549e7d688d898df4b55f486..2f602f21ec0146e5bfac950f741e6f06b459503b 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -931,6 +931,7 @@ void RenderThreadImpl::InitializeRenderer(
+@@ -932,6 +932,7 @@ void RenderThreadImpl::InitializeRenderer(
  }
  
  void RenderThreadImpl::RegisterSchemes() {
diff --git a/patches/extensions-browser-api-web_request-web_request_api.cc.patch b/patches/extensions-browser-api-web_request-web_request_api.cc.patch
index ec8d4a707053..56ee123e5b48 100644
--- a/patches/extensions-browser-api-web_request-web_request_api.cc.patch
+++ b/patches/extensions-browser-api-web_request-web_request_api.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
-index c2c9a707175f783078982051fbbe85132af722b7..54b749549865aa2ab54da353567bf2f8a28699f0 100644
+index 2caefc69c046a6432b66a3e98b68f24d60769504..da7c6c8a7cdb64f336e057ef791f1ea208d3dec5 100644
 --- a/extensions/browser/api/web_request/web_request_api.cc
 +++ b/extensions/browser/api/web_request/web_request_api.cc
 @@ -1367,6 +1367,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
diff --git a/patches/extensions-browser-extension_event_histogram_value.h.patch b/patches/extensions-browser-extension_event_histogram_value.h.patch
index 435f77ea1bc3..8b3cca12d170 100644
--- a/patches/extensions-browser-extension_event_histogram_value.h.patch
+++ b/patches/extensions-browser-extension_event_histogram_value.h.patch
@@ -1,11 +1,11 @@
 diff --git a/extensions/browser/extension_event_histogram_value.h b/extensions/browser/extension_event_histogram_value.h
-index 07fb305b0ebc02177e84b0b00a1b82e65e55ef6e..9e6a7b8a218bf7459a9e689581453f7596ceac9b 100644
+index 387260b4a4bb69cc32fd4ec03c022537ef6ef340..fe75f51bdec0a53d2bc73f0f1bfc24b1fc0e2216 100644
 --- a/extensions/browser/extension_event_histogram_value.h
 +++ b/extensions/browser/extension_event_histogram_value.h
-@@ -514,6 +514,20 @@ enum HistogramValue {
-   LOGIN_ON_REQUEST_EXTERNAL_LOGOUT = 492,
-   LOGIN_ON_EXTERNAL_LOGOUT_DONE = 493,
+@@ -516,6 +516,20 @@ enum HistogramValue {
    ACCESSIBILITY_PRIVATE_ON_PUMPKIN_INSTALLED = 494,
+   ENTERPRISE_REMOTE_APPS_ON_REMOTE_APP_LAUNCHED = 495,
+   INPUT_METHOD_PRIVATE_ON_CARET_BOUNDS_CHANGED = 496,
 +
 +  BRAVE_START = 600,
 +  BRAVE_AD_BLOCKED,
diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch
index 36b44c1a5ff9..3b69441900f2 100644
--- a/patches/extensions-browser-sandboxed_unpacker.cc.patch
+++ b/patches/extensions-browser-sandboxed_unpacker.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc
-index 92ed57fd370a0a800872768ea6ede09206b85452..8ab97a0bd345438df1adf450d52da80bf8163d05 100644
+index ea5fa4eeb3c56ef3e649f34a2d568608ab3041ed..c642522f2125e01f4d0b54d6c626d82900e62041 100644
 --- a/extensions/browser/sandboxed_unpacker.cc
 +++ b/extensions/browser/sandboxed_unpacker.cc
-@@ -1000,6 +1000,7 @@ absl::optional<base::Value> SandboxedUnpacker::RewriteManifestFile(
+@@ -999,6 +999,7 @@ absl::optional<base::Value> SandboxedUnpacker::RewriteManifestFile(
    DCHECK(!public_key_.empty());
    base::Value final_manifest = manifest.Clone();
    final_manifest.SetStringKey(manifest_keys::kPublicKey, public_key_);
diff --git a/patches/extensions-common-api-_api_features.json.patch b/patches/extensions-common-api-_api_features.json.patch
index ec5f27dabc49..24b4ad5a2236 100644
--- a/patches/extensions-common-api-_api_features.json.patch
+++ b/patches/extensions-common-api-_api_features.json.patch
@@ -1,8 +1,8 @@
 diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json
-index 1c418af3fe5febdfc9334f21dd5ebb729a692db9..593bd45847d85755aeddf46f7c08c430c474033f 100644
+index bb5bae5f98d790868cc3c8ec087012d80010bad3..799654228a6cb05f8bb4bf1a399958165ca6b989 100644
 --- a/extensions/common/api/_api_features.json
 +++ b/extensions/common/api/_api_features.json
-@@ -562,6 +562,7 @@
+@@ -563,6 +563,7 @@
      "matches": [
        "chrome://password-change/*",
        "chrome://file-manager/*"
diff --git a/patches/extensions-common-api-_permission_features.json.patch b/patches/extensions-common-api-_permission_features.json.patch
index a47118307c74..e111a219992b 100644
--- a/patches/extensions-common-api-_permission_features.json.patch
+++ b/patches/extensions-common-api-_permission_features.json.patch
@@ -1,8 +1,8 @@
 diff --git a/extensions/common/api/_permission_features.json b/extensions/common/api/_permission_features.json
-index 388a0fa68fad8e1ce9dde7be1b48f265ef4c9b63..a18a40f7bb0de02b03c10bb5e07bc6df1f6c7fc0 100644
+index 90245009efe6b97f0b17c96e301e5ad368a57b42..825ac408666181dad2dc1059a0bbb73277ceb6b0 100644
 --- a/extensions/common/api/_permission_features.json
 +++ b/extensions/common/api/_permission_features.json
-@@ -330,6 +330,7 @@
+@@ -314,6 +314,7 @@
        "channel": "stable",
        "extension_types": ["extension"],
        "allowlist": [
@@ -10,7 +10,7 @@ index 388a0fa68fad8e1ce9dde7be1b48f265ef4c9b63..a18a40f7bb0de02b03c10bb5e07bc6df
          "496B6890097EB6E19809ADEADD095A8721FBB2E0",  // FIDO U2F APIs
          "AD8ED80B705E1818AAD4684F9FF62B43D6D79620",  // FIDO U2F APIs (dev)
          "E24F1786D842E91E74C27929B0B3715A4689A473",  // CryptoToken
-@@ -680,6 +681,7 @@
+@@ -658,6 +659,7 @@
        "channel": "stable",
        "extension_types": ["extension"],
        "allowlist": [
@@ -18,7 +18,7 @@ index 388a0fa68fad8e1ce9dde7be1b48f265ef4c9b63..a18a40f7bb0de02b03c10bb5e07bc6df
          "496B6890097EB6E19809ADEADD095A8721FBB2E0",  // FIDO U2F APIs
          "AD8ED80B705E1818AAD4684F9FF62B43D6D79620",  // FIDO U2F APIs (dev)
          "E24F1786D842E91E74C27929B0B3715A4689A473",  // CryptoToken
-@@ -702,6 +704,7 @@
+@@ -680,6 +682,7 @@
        "channel": "stable",
        "extension_types": ["extension"],
        "allowlist": [
diff --git a/patches/ios-chrome-browser-BUILD.gn.patch b/patches/ios-chrome-browser-BUILD.gn.patch
index f4b1f2612af2..46e91de4e333 100644
--- a/patches/ios-chrome-browser-BUILD.gn.patch
+++ b/patches/ios-chrome-browser-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn
-index e69dcd5677c87e1aab3a97258cf85f9f8c7ecef7..dac2c958e831da8bfba372089af5e8db562011ca 100644
+index d1af4494cf724a8fb4e90eaea3c9d8e02964d409..b6fb0ba6866dc7a461c87bea270ebc18c173c473 100644
 --- a/ios/chrome/browser/BUILD.gn
 +++ b/ios/chrome/browser/BUILD.gn
 @@ -130,6 +130,7 @@ source_set("browser") {
diff --git a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch
index 7a0106f5e503..9fa926626d3f 100644
--- a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch
+++ b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch
@@ -1,8 +1,8 @@
 diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
-index 69e7d76abe18ffd92e9a678536804bccb72c65d0..357c0fc4cc36fe1dbddd9a17d9010c023739baf9 100644
+index c990fb5992534f4fb8004bc0e01749c050d88a46..a346934f7ce4a03679c2ceaa700b6cd3e8763e7e 100644
 --- a/ios/chrome/browser/prefs/browser_prefs.mm
 +++ b/ios/chrome/browser/prefs/browser_prefs.mm
-@@ -228,6 +228,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
+@@ -233,6 +233,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
    registry->RegisterIntegerPref(kFRETrialGroupPrefName, 0);
  
    registry->RegisterIntegerPref(kTrialGroupV3PrefName, 0);
@@ -10,7 +10,7 @@ index 69e7d76abe18ffd92e9a678536804bccb72c65d0..357c0fc4cc36fe1dbddd9a17d9010c02
  }
  
  void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
-@@ -358,6 +359,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -365,6 +366,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
        policy::policy_prefs::kUserPolicyNotificationWasShown, false);
  
    registry->RegisterIntegerPref(kAccountIdMigrationState, 0);
diff --git a/patches/ios-chrome-browser-sync-sync_service_factory.mm.patch b/patches/ios-chrome-browser-sync-sync_service_factory.mm.patch
index 5636e05cc818..c16395151492 100644
--- a/patches/ios-chrome-browser-sync-sync_service_factory.mm.patch
+++ b/patches/ios-chrome-browser-sync-sync_service_factory.mm.patch
@@ -1,8 +1,8 @@
 diff --git a/ios/chrome/browser/sync/sync_service_factory.mm b/ios/chrome/browser/sync/sync_service_factory.mm
-index 4be5148aec4fdea8404a4ed0976a4980e70f01d5..49cf2f6fe2be7af0208458eae8ae46bd5d90923d 100644
+index 46915532135a93d2c0cd5c6703a15c745ab69517..7efea632930b7868bbe68527b98e30d54758fdab 100644
 --- a/ios/chrome/browser/sync/sync_service_factory.mm
 +++ b/ios/chrome/browser/sync/sync_service_factory.mm
-@@ -155,7 +155,7 @@ std::unique_ptr<KeyedService> SyncServiceFactory::BuildServiceInstanceFor(
+@@ -157,7 +157,7 @@ std::unique_ptr<KeyedService> SyncServiceFactory::BuildServiceInstanceFor(
        policy_connector ? policy_connector->GetPolicyService() : nullptr;
  
    auto sync_service =
diff --git a/patches/media-audio-pulse-pulse_util.cc.patch b/patches/media-audio-pulse-pulse_util.cc.patch
index a501cbf7a169..8c02d9ad4b28 100644
--- a/patches/media-audio-pulse-pulse_util.cc.patch
+++ b/patches/media-audio-pulse-pulse_util.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/media/audio/pulse/pulse_util.cc b/media/audio/pulse/pulse_util.cc
-index 37cd7492c147fe9363a12ed959b51ccb0343896d..1b4975df3a42d497e79106186ba5abb83ebc79a6 100644
+index 359394cce27208b3471889d10c58c9bdcba6414a..ee7e5e24ef7f5666bca578812a2b4bc9104821d2 100644
 --- a/media/audio/pulse/pulse_util.cc
 +++ b/media/audio/pulse/pulse_util.cc
-@@ -35,7 +35,7 @@ namespace {
+@@ -37,7 +37,7 @@ namespace {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  constexpr char kBrowserDisplayName[] = "google-chrome";
  #define PRODUCT_STRING "Google Chrome"
diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch
index 12715b4dd1f1..1f498e06003c 100644
--- a/patches/net-BUILD.gn.patch
+++ b/patches/net-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/net/BUILD.gn b/net/BUILD.gn
-index c61a518dafa23300bc72c0713afd9df2fd150f26..65583d49226a9b319067a82bc851348a3a07583a 100644
+index 029d409152339f81d127b5695bbc3d3d0384b4f1..e470be2820d8fb10e44794db9a6520f063c2f2b4 100644
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1127,6 +1127,7 @@ component("net") {
+@@ -1119,6 +1119,7 @@ component("net") {
        "reporting/reporting_uploader.h",
      ]
    }
diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch
index e9ed33ea722f..26bdf8e456ea 100644
--- a/patches/net-cookies-canonical_cookie.cc.patch
+++ b/patches/net-cookies-canonical_cookie.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
-index f31ac89afbe5ada08809f4f5dec4f4720e7df75d..5ed29af5425db21f7d2f4e977b1c74ea90acfcae 100644
+index 91d210fa1683da314922a15734d4fabbde8ab873..1123de9ee42317726e3e0d8f4a37bd71a54202d7 100644
 --- a/net/cookies/canonical_cookie.cc
 +++ b/net/cookies/canonical_cookie.cc
-@@ -649,6 +649,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
+@@ -666,6 +666,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
    // Get the port, this will get a default value if a port isn't provided.
    int source_port = ValidateAndAdjustSourcePort(url.EffectiveIntPort());
  
diff --git a/patches/net-dns-host_cache.cc.patch b/patches/net-dns-host_cache.cc.patch
index 37e53b8b5c62..ff17cc35b1f3 100644
--- a/patches/net-dns-host_cache.cc.patch
+++ b/patches/net-dns-host_cache.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc
-index 4e8d6eea38b3c50f863130aa6a1e7efd1f750a68..d1237667df6148de7eddb53a4aa2117f2be292ff 100644
+index 88dbcf54c84c6e950d96db52cf355ef650884ac5..b8f9bcb1ba81210da61163683b497fc76f366841 100644
 --- a/net/dns/host_cache.cc
 +++ b/net/dns/host_cache.cc
 @@ -396,6 +396,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const {
diff --git a/patches/net-http-transport_security_state.cc.patch b/patches/net-http-transport_security_state.cc.patch
index df6c7238b32e..ea6e24fef025 100644
--- a/patches/net-http-transport_security_state.cc.patch
+++ b/patches/net-http-transport_security_state.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
-index 25c3764df23b4c435ed4817d11fac5109f0fb326..fe419826f3b43f4c4f327001084014d9b68e39bc 100644
+index cbe5d84732f08a5614c686a02011651291229afe..fbcc2984f281dde6f4781732325ae83b57f82d1c 100644
 --- a/net/http/transport_security_state.cc
 +++ b/net/http/transport_security_state.cc
 @@ -413,6 +413,7 @@ TransportSecurityState::TransportSecurityState(
diff --git a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
index 28a0816f1fc9..847d117e0bad 100644
--- a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
+++ b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc
-index 30072447d145c2633237724d0276d0f71372338b..ef795c6fc83d2eb7263b6f90c534dbf4bba97999 100644
+index d8d6fe7b4c584c431e7f65911bbae1ec31bdf285..fe6ac2816d3959fedb2838219a0028f990c8c1d6 100644
 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc
 +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
-@@ -1028,6 +1028,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously(
+@@ -976,6 +976,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously(
    config_->value().proxy_rules().Apply(url, result);
    result->set_traffic_annotation(
        MutableNetworkTrafficAnnotationTag(config_->traffic_annotation()));
diff --git a/patches/net-socket-socks_connect_job.cc.patch b/patches/net-socket-socks_connect_job.cc.patch
index e75996a19e22..9217761fe705 100644
--- a/patches/net-socket-socks_connect_job.cc.patch
+++ b/patches/net-socket-socks_connect_job.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/net/socket/socks_connect_job.cc b/net/socket/socks_connect_job.cc
-index 5436afa0da65e0bbac4016116599b7f80774c73c..a50badc1c1ce470d87ebbb1d857ada49525ebf2b 100644
+index 5bcecc50dcefd2be9505690272aceb97685f34b2..0b940f0f1108ca079c696abb16cbf0a2cf6383e5 100644
 --- a/net/socket/socks_connect_job.cc
 +++ b/net/socket/socks_connect_job.cc
 @@ -178,9 +178,11 @@ int SOCKSConnectJob::DoSOCKSConnect() {
@@ -15,5 +15,5 @@ index 5436afa0da65e0bbac4016116599b7f80774c73c..a50badc1c1ce470d87ebbb1d857ada49
 +        socks_params_->traffic_annotation(),
 +        socks_params_->transport_params()->destination());
    } else {
-     socks_socket_ptr_ = new SOCKSClientSocket(
+     auto socks_socket = std::make_unique<SOCKSClientSocket>(
          transport_connect_job_->PassSocket(), socks_params_->destination(),
diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch
index 01aef80de137..51b6bbb99e27 100644
--- a/patches/sandbox-policy-win-sandbox_win.cc.patch
+++ b/patches/sandbox-policy-win-sandbox_win.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc
-index b1ec529d260a9da35e4a4715c09fb8732eb98fe5..86030573b224731ed62d9823cbb4fc17b988b751 100644
+index 7246e7e12247f886075c419ed21bd969f3a2eeed..5dcde4653c7fba96701e4a29b05d8d08834aa5be 100644
 --- a/sandbox/policy/win/sandbox_win.cc
 +++ b/sandbox/policy/win/sandbox_win.cc
-@@ -746,6 +746,7 @@ ResultCode LaunchWithoutSandbox(
+@@ -743,6 +743,7 @@ ResultCode LaunchWithoutSandbox(
      base::Process* process) {
    base::LaunchOptions options;
    options.handles_to_inherit = handles_to_inherit;
diff --git a/patches/services-network-cookie_settings.cc.patch b/patches/services-network-cookie_settings.cc.patch
index 8d62c5e82e5b..6b3802f211c1 100644
--- a/patches/services-network-cookie_settings.cc.patch
+++ b/patches/services-network-cookie_settings.cc.patch
@@ -1,12 +1,12 @@
 diff --git a/services/network/cookie_settings.cc b/services/network/cookie_settings.cc
-index b0d1311bf71caa04016ee4b33bed383774ac4885..3777eea6bd9277390cd413c88d6b5a7006c7dd39 100644
+index 6649c65f66f0501456d3db9b3643974a5c6c40a6..8566f6c72c2a7e5ac9665f4cd51a779589c2be39 100644
 --- a/services/network/cookie_settings.cc
 +++ b/services/network/cookie_settings.cc
-@@ -206,6 +206,7 @@ CookieSettings::GetCookieSettingWithMetadata(
-         // TODO(dylancutler): Consider adding an enum variant for this case.
-         blocked_by_third_party_setting = CookieSettings::
-             ThirdPartyCookieBlockingSetting::kThirdPartyStateAllowed;
-+        BRAVE_COOKIE_SETTINGS_GET_COOKIE_SETTINGS_INTERNAL
-     }
+@@ -254,6 +254,7 @@ CookieSettings::GetCookieSettingWithMetadata(
+       match) {
+     cookie_setting = match->GetContentSetting();
+     found_explicit_setting = IsExplicitSetting(*match);
++    BRAVE_COOKIE_SETTINGS_GET_COOKIE_SETTINGS_INTERNAL
    }
  
+   if (cookie_setting != CONTENT_SETTING_BLOCK && !found_explicit_setting) {
diff --git a/patches/services-network-cors-cors_url_loader.cc.patch b/patches/services-network-cors-cors_url_loader.cc.patch
index 68b3ecb3ca93..0412eefe77e2 100644
--- a/patches/services-network-cors-cors_url_loader.cc.patch
+++ b/patches/services-network-cors-cors_url_loader.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc
-index c0ca0f5df4a02ec7207f92626d73ffe69f1301af..aadd84a2daee59c0fc0b6582d413afbb57eff7fc 100644
+index 4bec718faedbdcb2b4a15f91b686b580a7c09ad7..80a7cd8341ec1d60b89e760c6581f17cf062baf8 100644
 --- a/services/network/cors/cors_url_loader.cc
 +++ b/services/network/cors/cors_url_loader.cc
-@@ -668,6 +668,7 @@ void CorsURLLoader::StartRequest() {
+@@ -684,6 +684,7 @@ void CorsURLLoader::StartRequest() {
        (fetch_cors_flag_ ||
         (request_.method != net::HttpRequestHeaders::kGetMethod &&
          request_.method != net::HttpRequestHeaders::kHeadMethod))) {
diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch
index ec32422e8ced..151b36149820 100644
--- a/patches/services-network-public-cpp-BUILD.gn.patch
+++ b/patches/services-network-public-cpp-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn
-index 23c6ab8c99374ed35a51f5ec9c33cb30516ecb7b..9bc415afa5df1339f4c16e14dde88351f34705c1 100644
+index 97738fd4d168c5c53c74fea321e5b8c2c0ab0cf3..55482a1c512fbfb5b721d5c68b57b39a55176735 100644
 --- a/services/network/public/cpp/BUILD.gn
 +++ b/services/network/public/cpp/BUILD.gn
 @@ -180,6 +180,7 @@ component("cpp") {
diff --git a/patches/third_party-blink-common-client_hints-client_hints.cc.patch b/patches/third_party-blink-common-client_hints-client_hints.cc.patch
index 2153cd035286..44e10f55ffc1 100644
--- a/patches/third_party-blink-common-client_hints-client_hints.cc.patch
+++ b/patches/third_party-blink-common-client_hints-client_hints.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc
-index 7de1dbd637cb3d3e028e884894f9f8103cd24aaa..da606ea33c760346eb33d61d7bb057ca6c4b80e9 100644
+index 0d7256656f6753dee77cf948f17e24fdc5493238..50cffe933b01a48ade914582a8d1f7d6a5ed35ba 100644
 --- a/third_party/blink/common/client_hints/client_hints.cc
 +++ b/third_party/blink/common/client_hints/client_hints.cc
-@@ -116,6 +116,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount =
+@@ -111,6 +111,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount =
      std::size(kWebEffectiveConnectionTypeMapping);
  
  bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) {
diff --git a/patches/third_party-blink-public-devtools_protocol-browser_protocol.pdl.patch b/patches/third_party-blink-public-devtools_protocol-browser_protocol.pdl.patch
index 70ede8a97adf..5ea8dc336155 100644
--- a/patches/third_party-blink-public-devtools_protocol-browser_protocol.pdl.patch
+++ b/patches/third_party-blink-public-devtools_protocol-browser_protocol.pdl.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
-index 9f91968bd89a024f6269dfcbdd82b29011001ade..54ecee20944f47bdc8abf4c5b4aa825b3187b6dd 100644
+index 73feffdbb21001f6672d0987228018aaa3c4a0da..c41050934ffd322bcca8441b5ba17022c167c856 100644
 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
-@@ -7079,6 +7079,8 @@ domain Page
+@@ -7131,6 +7131,8 @@ domain Page
        web-share
        window-placement
        xr-spatial-tracking
diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch
index e7976e0b5b00..13c5c6927d16 100644
--- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch
+++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni
-index 9bc4f70bae16526a260601a9c86e67da7a919b66..f2bd035bf3e7857780063f9e9baa39ff569825c4 100644
+index 514327ecc6761464522babb36c7e278fd120adad..db2ac06b4d637e0d2406c0b1f396cca66ca53c15 100644
 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni
 +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
-@@ -2562,6 +2562,7 @@ generated_interface_sources_in_modules = [
+@@ -2566,6 +2566,7 @@ generated_interface_sources_in_modules = [
    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc",
    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.h",
  ]
diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch
index aa30a5816a94..2655471a7980 100644
--- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch
+++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni
-index efb65ac542ec4060edd912024a74fcd1e89379be..8718a3902bae6b7073bfc8ade4242fda792d3cf1 100644
+index be41d9799aa1e9c953919327700a12184877918a..21e7b44bb48964ad8ae7d4a7c080fe042f512c72 100644
 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni
 +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
-@@ -1165,6 +1165,7 @@ static_idl_files_in_modules = get_path_info(
+@@ -1169,6 +1169,7 @@ static_idl_files_in_modules = get_path_info(
            "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl",
          ],
          "abspath")
diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch
index 9d84d6a53884..f1bb0d3b026e 100644
--- a/patches/third_party-blink-renderer-core-BUILD.gn.patch
+++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
-index ae6cd5618db32f7f12b969b5fb44da5cb5f674b8..fd4e49d244dc4b4e432ce89251386e702fd0cdef 100644
+index 67e1ab84f4e4d395f8de8225786b7688ac9397e5..c2f7515aad1a3762bdf223534c0576f235e8f509 100644
 --- a/third_party/blink/renderer/core/BUILD.gn
 +++ b/third_party/blink/renderer/core/BUILD.gn
-@@ -362,6 +362,7 @@ component("core") {
+@@ -365,6 +365,7 @@ component("core") {
        "Carbon.framework",
      ]
    }
diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch
index b470159085ac..5b50e439387c 100644
--- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch
+++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
-index 0e7de0b094ca47770a01bc4da1a04d139316b2ce..d3e0c93ecbe92ca1a4946094f0c41e7a46fe4761 100644
+index 9bcc47f685bd746d9fe06c84d1dd6e1987ed8e87..977fdca8b4f112643d9359743a0729c610413b0b 100644
 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
 +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
-@@ -1010,6 +1010,7 @@ String HTMLCanvasElement::ToDataURLInternal(
+@@ -1011,6 +1011,7 @@ String HTMLCanvasElement::ToDataURLInternal(
      if (!data_buffer)
        return String("data:,");
  
diff --git a/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch b/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch
index 09bddf0160fa..84663e4fcb1f 100644
--- a/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch
+++ b/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
-index 26f86b20c42f124a43c03942bf52cdfbf6c3efaa..61fc53cd63870e6f1cbf6f46170445628b93b277 100644
+index 16ba1fe4ec2c55bd97c9862248dc15c28cb682bf..2b206834a689ecda4ab492eb96abc278d2670dfb 100644
 --- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
 +++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
-@@ -383,5 +383,13 @@
+@@ -394,5 +394,13 @@
        permissions_policy_name: "local-fonts",
        depends_on: ["FontAccess"],
      },
diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
index a3b4f636704a..31bae207d530 100644
--- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch
+++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn
-index 724185cca4cacc2526046e036592f569cad1b200..b31c1a4e4407abe72ece782b886d2779c7a5dd8c 100644
+index 4c0c050b35877cffab6e4dab2c54a4060bb518e7..b5ad2bb4db99b095632df664d777fe9677fb8bb6 100644
 --- a/third_party/blink/renderer/modules/BUILD.gn
 +++ b/third_party/blink/renderer/modules/BUILD.gn
 @@ -15,6 +15,7 @@ if (is_android) {
diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
index 8336d86ac3b4..ec8e2cd4a78b 100644
--- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
+++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
@@ -1,8 +1,8 @@
 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
-index b7c5e74c9792cd8dcd4cb38009cf22a000592387..62123730f9fef2a21004c2f03209507b34c48a41 100644
+index a179affbcde238675a269d4fd54e58669d82638b..5adfd4e1fa3290f91a7390bafccbe7bdc2f0583b 100644
 --- 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
-@@ -1937,6 +1937,7 @@ ImageData* BaseRenderingContext2D::getImageData(
+@@ -1938,6 +1938,7 @@ ImageData* BaseRenderingContext2D::getImageData(
  }
  
  ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -10,7 +10,7 @@ index b7c5e74c9792cd8dcd4cb38009cf22a000592387..62123730f9fef2a21004c2f03209507b
      int sx,
      int sy,
      int sw,
-@@ -2047,6 +2048,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
+@@ -2048,6 +2049,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
        DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
      }
    }
diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch
index 1a34689f0ba9..747433c98777 100644
--- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch
+++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch
@@ -1,5 +1,5 @@
 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
-index 5f1e9e2180912313c02c46a42fe2e6d07c11e561..e3a9d34d5b81428dbb545f2e347ee2410fe4db2b 100644
+index 69d4834c61b93160529b477c923ec4360e115130..4f03bdb834b30dd612bfc28341d386adc4568fae 100644
 --- 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
 @@ -913,6 +913,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch
index a20aaa63e131..4ad8765f1bf2 100644
--- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch
+++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl
-index 34e7bbadb132f2c411764a00c6ae7ddb0e94fb74..1b7090bb928129b6ef8b80d542b62c42f46bed73 100644
+index 5cbe19cc34e9e42fdb5c044695b3b26b61692f46..f9c33f022efe1cad076fd0fe3cc3e3f8f7671342 100644
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl
 @@ -112,9 +112,13 @@ interface CanvasRenderingContext2D {
@@ -19,11 +19,11 @@ index 34e7bbadb132f2c411764a00c6ae7ddb0e94fb74..1b7090bb928129b6ef8b80d542b62c42
 @@ -134,8 +138,8 @@ interface CanvasRenderingContext2D {
      [RaisesException] ImageData createImageData(ImageData imagedata);
      [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh);
-     [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
+     [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
 -    [RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh);
--    [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
+-    [RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
 +    [CallWith=ScriptState, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh);
-+    [CallWith=ScriptState, RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
++    [CallWith=ScriptState, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
      [RaisesException] void putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy);
      [RaisesException] void putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy, [EnforceRange] long dirtyX, [EnforceRange] long dirtyY, [EnforceRange] long dirtyWidth, [EnforceRange] long dirtyHeight);
  
diff --git a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch
index 49f2b732e456..46047a1bbf85 100644
--- a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch
+++ b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch
@@ -1,17 +1,15 @@
 diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl
-index 42badc9beabd2d22198ec770f4d55c38d97c26ec..a4f04bb818a8e35d520ef3888e478c49d42e6eb7 100644
+index 7e409b3c37a95e6b6950d4d760c9ce953aeb49d8..3c73ee21bc4f0c68df38aba10ae559bdff30b7a0 100644
 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl
 +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl
-@@ -68,10 +68,16 @@
+@@ -68,10 +68,10 @@
      void stroke(Path2D path);
      void clip(optional CanvasFillRule winding);
      void clip(Path2D path, optional CanvasFillRule winding);
-+    /*
-     [HighEntropy, MeasureAs=OffscreenCanvasIsPointInPath] boolean isPointInPath(unrestricted double x, unrestricted double y, optional CanvasFillRule winding);
-     [HighEntropy, MeasureAs=OffscreenCanvasIsPointInPath] boolean isPointInPath(Path2D path, unrestricted double x, unrestricted double y, optional CanvasFillRule winding);
-     [HighEntropy, MeasureAs=OffscreenCanvasIsPointInStroke] boolean isPointInStroke(unrestricted double x, unrestricted double y);
-     [HighEntropy, MeasureAs=OffscreenCanvasIsPointInStroke] boolean isPointInStroke(Path2D path, unrestricted double x, unrestricted double y);
-+    */
+-    [HighEntropy, MeasureAs=OffscreenCanvasIsPointInPath] boolean isPointInPath(unrestricted double x, unrestricted double y, optional CanvasFillRule winding);
+-    [HighEntropy, MeasureAs=OffscreenCanvasIsPointInPath] boolean isPointInPath(Path2D path, unrestricted double x, unrestricted double y, optional CanvasFillRule winding);
+-    [HighEntropy, MeasureAs=OffscreenCanvasIsPointInStroke] boolean isPointInStroke(unrestricted double x, unrestricted double y);
+-    [HighEntropy, MeasureAs=OffscreenCanvasIsPointInStroke] boolean isPointInStroke(Path2D path, unrestricted double x, unrestricted double y);
 +    [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasIsPointInPath] boolean isPointInPath(unrestricted double x, unrestricted double y, optional CanvasFillRule winding);
 +    [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasIsPointInPath] boolean isPointInPath(Path2D path, unrestricted double x, unrestricted double y, optional CanvasFillRule winding);
 +    [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasIsPointInStroke] boolean isPointInStroke(unrestricted double x, unrestricted double y);
@@ -19,16 +17,14 @@ index 42badc9beabd2d22198ec770f4d55c38d97c26ec..a4f04bb818a8e35d520ef3888e478c49
  
      // text (see also the CanvasDrawingStyles interface)
      void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
-@@ -87,8 +93,12 @@
+@@ -87,8 +87,8 @@
      [RaisesException] ImageData createImageData(ImageData imagedata);
      [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh);
-     [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
-+    /*
-     [HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh);
-     [HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
-+    */
+     [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
+-    [HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh);
+-    [HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
 +    [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh);
-+    [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
++    [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings);
      [RaisesException] void putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy);
      [RaisesException] void putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy, [EnforceRange] long dirtyX, [EnforceRange] long dirtyY, [EnforceRange] long dirtyWidth, [EnforceRange] long dirtyHeight);
  
diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
index 53d3e521ab20..5fc5726d1d7b 100644
--- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
+++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc
-index 4057d2f914bad50e8e8880731b62f9068b457649..810eaccdf2e73d968dd7016721a798cd1dfb1d4a 100644
+index f3642a928e9b0429b98098e760d3259ee68bb8b3..a3b4ee285c1e7451f8f623e0883e636718da9b42 100644
 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
 +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
-@@ -664,6 +664,8 @@ void MediaDevices::DevicesEnumerated(
+@@ -688,6 +688,8 @@ void MediaDevices::DevicesEnumerated(
      }
    }
  
diff --git a/patches/third_party-blink-renderer-modules-plugins-dom_plugin_array.cc.patch b/patches/third_party-blink-renderer-modules-plugins-dom_plugin_array.cc.patch
index 74d85337d097..1f788fbf509d 100644
--- a/patches/third_party-blink-renderer-modules-plugins-dom_plugin_array.cc.patch
+++ b/patches/third_party-blink-renderer-modules-plugins-dom_plugin_array.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc b/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc
-index 8f4d9db3ee6ec9061c542dadb85e65e13da974fd..864933cfb0438ec698db71b2b3b753df52ed2b64 100644
+index 294f40934f1feeb774615d6de1564d7cdca60006..24f00d1a71500dbb9681880fcc3540a2055f1640 100644
 --- a/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc
 +++ b/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc
-@@ -195,6 +195,7 @@ void DOMPluginArray::UpdatePluginData() {
+@@ -193,6 +193,7 @@ void DOMPluginArray::UpdatePluginData() {
      }
      return;
    }
@@ -10,7 +10,7 @@ index 8f4d9db3ee6ec9061c542dadb85e65e13da974fd..864933cfb0438ec698db71b2b3b753df
    PluginData* data = GetPluginData();
    if (!data) {
      dom_plugins_.clear();
-@@ -216,6 +217,7 @@ void DOMPluginArray::UpdatePluginData() {
+@@ -214,6 +215,7 @@ void DOMPluginArray::UpdatePluginData() {
        }
      }
    }
diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch
index 86aa25d44a0b..0a2098a8337c 100644
--- a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch
+++ b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
-index 354c476ad8a04bd613235241bb1825409d1a4d38..8c014c87fb4a4854b5249d6e0cdee661b0277cd9 100644
+index 1184d008cc029c48aeb83fdc79dd10351e20ae53..7b7e6ed4c8bf097d48abdf2cf7f71fdfc406780f 100644
 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
-@@ -5304,6 +5304,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
+@@ -5260,6 +5260,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
                                                       GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -10,7 +10,7 @@ index 354c476ad8a04bd613235241bb1825409d1a4d38..8c014c87fb4a4854b5249d6e0cdee661
    switch (pname) {
      case GL_SHADING_LANGUAGE_VERSION: {
        return WebGLAny(
-@@ -5847,6 +5848,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter(
+@@ -5803,6 +5804,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter(
    if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc(
                               kFunctionName, target, attachment))
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -18,7 +18,7 @@ index 354c476ad8a04bd613235241bb1825409d1a4d38..8c014c87fb4a4854b5249d6e0cdee661
  
    WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target);
    DCHECK(!framebuffer_binding || framebuffer_binding->Object());
-@@ -6059,6 +6061,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter(
+@@ -6021,6 +6023,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter(
      GLenum pname) {
    if (isContextLost() || !ValidateTextureBinding("getTexParameter", target))
      return ScriptValue::CreateNull(script_state->GetIsolate());
diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch
index 27dcf9e553d7..dffcc6db728a 100644
--- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch
+++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5eb0ec1e3 100644
+index 94d2dfc96fa599e7b2ae2993d1cd0ccbd38acb5f..2077cb74b44957551293aa2ae4325b62f5b1bd5d 100644
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -3034,6 +3034,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
+@@ -3012,6 +3012,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
      GLuint index) {
    if (!ValidateWebGLProgramOrShader("getActiveAttrib", program))
      return nullptr;
@@ -10,7 +10,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    GLuint program_id = ObjectNonZero(program);
    GLint max_name_length = -1;
    ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH,
-@@ -3065,6 +3066,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform(
+@@ -3043,6 +3044,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform(
      GLuint index) {
    if (!ValidateWebGLProgramOrShader("getActiveUniform", program))
      return nullptr;
@@ -18,7 +18,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    GLuint program_id = ObjectNonZero(program);
    GLint max_name_length = -1;
    ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH,
-@@ -3095,6 +3097,7 @@ absl::optional<HeapVector<Member<WebGLShader>>>
+@@ -3073,6 +3075,7 @@ absl::optional<HeapVector<Member<WebGLShader>>>
  WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) {
    if (!ValidateWebGLProgramOrShader("getAttachedShaders", program))
      return absl::nullopt;
@@ -26,7 +26,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
  
    HeapVector<Member<WebGLShader>> shader_objects;
    for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) {
-@@ -3109,6 +3112,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program,
+@@ -3087,6 +3090,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program,
                                                     const String& name) {
    if (!ValidateWebGLProgramOrShader("getAttribLocation", program))
      return -1;
@@ -34,7 +34,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    if (!ValidateLocationLength("getAttribLocation", name))
      return -1;
    if (!ValidateString("getAttribLocation", name))
-@@ -3142,6 +3146,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter(
+@@ -3120,6 +3124,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter(
      GLenum pname) {
    if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target))
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -42,7 +42,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
  
    switch (pname) {
      case GL_BUFFER_USAGE: {
-@@ -3275,6 +3280,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter(
+@@ -3260,6 +3265,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter(
                                           target, attachment))
      return ScriptValue::CreateNull(script_state->GetIsolate());
  
@@ -50,7 +50,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    if (!framebuffer_binding_ || !framebuffer_binding_->Object()) {
      SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter",
                        "no framebuffer bound");
-@@ -3675,6 +3681,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
+@@ -3660,6 +3666,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
            "invalid parameter name, OES_standard_derivatives not enabled");
        return ScriptValue::CreateNull(script_state->GetIsolate());
      case WebGLDebugRendererInfo::kUnmaskedRendererWebgl:
@@ -58,7 +58,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
        if (ExtensionEnabled(kWebGLDebugRendererInfoName)) {
          if (IdentifiabilityStudySettings::Get()->ShouldSampleType(
                  blink::IdentifiableSurface::Type::kWebGLParameter)) {
-@@ -3690,6 +3697,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
+@@ -3675,6 +3682,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
            "invalid parameter name, WEBGL_debug_renderer_info not enabled");
        return ScriptValue::CreateNull(script_state->GetIsolate());
      case WebGLDebugRendererInfo::kUnmaskedVendorWebgl:
@@ -66,7 +66,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
        if (ExtensionEnabled(kWebGLDebugRendererInfoName)) {
          if (IdentifiabilityStudySettings::Get()->ShouldSampleType(
                  blink::IdentifiableSurface::Type::kWebGLParameter)) {
-@@ -3782,6 +3790,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
+@@ -3767,6 +3775,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
    // intended to prevent applications from entering an infinite polling loop.
    if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR)
      return WebGLAny(script_state, true);
@@ -74,7 +74,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) {
      return ScriptValue::CreateNull(script_state->GetIsolate());
    }
-@@ -3837,6 +3846,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
+@@ -3822,6 +3831,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
  String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) {
    if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program))
      return String();
@@ -82,7 +82,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    GLStringQuery query(ContextGL());
    return query.Run<GLStringQuery::ProgramInfoLog>(ObjectNonZero(program));
  }
-@@ -3847,6 +3857,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter(
+@@ -3832,6 +3842,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter(
      GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -90,7 +90,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    if (target != GL_RENDERBUFFER) {
      SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter",
                        "invalid target");
-@@ -3898,6 +3909,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
+@@ -3883,6 +3894,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
    // intended to prevent applications from entering an infinite polling loop.
    if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR)
      return WebGLAny(script_state, true);
@@ -98,7 +98,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) {
      return ScriptValue::CreateNull(script_state->GetIsolate());
    }
-@@ -3929,6 +3941,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
+@@ -3914,6 +3926,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
  String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) {
    if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader))
      return String();
@@ -106,7 +106,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    GLStringQuery query(ContextGL());
    return query.Run<GLStringQuery::ShaderInfoLog>(ObjectNonZero(shader));
  }
-@@ -3959,6 +3972,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
+@@ -3944,6 +3957,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
    GLint precision = 0;
    ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range,
                                          &precision);
@@ -114,7 +114,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    auto* result = MakeGarbageCollected<WebGLShaderPrecisionFormat>(
        range[0], range[1], precision);
    if (IdentifiabilityStudySettings::Get()->ShouldSampleType(
-@@ -3971,6 +3985,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
+@@ -3956,6 +3970,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
  String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) {
    if (!ValidateWebGLProgramOrShader("getShaderSource", shader))
      return String();
@@ -122,7 +122,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    return EnsureNotNull(shader->Source());
  }
  
-@@ -3996,6 +4011,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter(
+@@ -3981,6 +3996,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter(
      GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -130,7 +130,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    if (!ValidateTextureBinding("getTexParameter", target))
      return ScriptValue::CreateNull(script_state->GetIsolate());
    switch (pname) {
-@@ -4030,6 +4046,7 @@ ScriptValue WebGLRenderingContextBase::getUniform(
+@@ -4015,6 +4031,7 @@ ScriptValue WebGLRenderingContextBase::getUniform(
      const WebGLUniformLocation* uniform_location) {
    if (!ValidateWebGLProgramOrShader("getUniform", program))
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -138,7 +138,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    DCHECK(uniform_location);
    if (uniform_location->Program() != program) {
      SynthesizeGLError(GL_INVALID_OPERATION, "getUniform",
-@@ -4289,6 +4306,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation(
+@@ -4274,6 +4291,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation(
      const String& name) {
    if (!ValidateWebGLProgramOrShader("getUniformLocation", program))
      return nullptr;
@@ -146,7 +146,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    if (!ValidateLocationLength("getUniformLocation", name))
      return nullptr;
    if (!ValidateString("getUniformLocation", name))
-@@ -4313,6 +4331,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib(
+@@ -4298,6 +4316,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib(
      GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -154,7 +154,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    if (index >= max_vertex_attribs_) {
      SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib",
                        "index out of range");
-@@ -4390,6 +4409,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index,
+@@ -4375,6 +4394,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index,
                                                           GLenum pname) {
    if (isContextLost())
      return 0;
@@ -162,7 +162,7 @@ index 96905adea200bc337cccf642de35e55d89fab339..eafddaf9e801862e98e1623cd0c97cb5
    GLvoid* result = nullptr;
    // NOTE: If pname is ever a value that returns more than 1 element
    // this will corrupt memory.
-@@ -4737,6 +4757,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x,
+@@ -4722,6 +4742,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x,
                                                   int64_t offset) {
    if (isContextLost())
      return;
diff --git a/patches/third_party-blink-renderer-platform-fonts-font_fallback_list.cc.patch b/patches/third_party-blink-renderer-platform-fonts-font_fallback_list.cc.patch
index 1ca71bd9a1a9..6e362671822c 100644
--- a/patches/third_party-blink-renderer-platform-fonts-font_fallback_list.cc.patch
+++ b/patches/third_party-blink-renderer-platform-fonts-font_fallback_list.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/platform/fonts/font_fallback_list.cc b/third_party/blink/renderer/platform/fonts/font_fallback_list.cc
-index f6a360913eb603c17e9cb5edf27c419c49ecfaed..221fa5f0fb0ba06d7a9c747855b7dc6bc2b2551c 100644
+index 5dc3da69afe9bede13a4d66efa41b8aafbd32bfe..8f069a54bd9c31d0170395f2a1be860343144500 100644
 --- a/third_party/blink/renderer/platform/fonts/font_fallback_list.cc
 +++ b/third_party/blink/renderer/platform/fonts/font_fallback_list.cc
-@@ -178,6 +178,7 @@ scoped_refptr<FontData> FontFallbackList::GetFontData(
+@@ -176,6 +176,7 @@ scoped_refptr<FontData> FontFallbackList::GetFontData(
          GetFontSelector()->ReportFontLookupByUniqueOrFamilyName(
              curr_family->FamilyName(), font_description,
              DynamicTo<SimpleFontData>(result.get()));
diff --git a/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch b/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch
index e9dbb55ebd28..c27aaf7640a6 100644
--- a/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch
+++ b/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc
-index f1a20b5d7dfa15327a0059a45785f99804707d70..4fd2b0a1d69c87467bc8cda7e577d0637da6825a 100644
+index 844986db59e34d478367cf5284a25bfccbcb3f29..ea3c59777a209c69210bc182ce7c3e82a2224767 100644
 --- a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc
 +++ b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc
-@@ -520,6 +520,7 @@ void ProcessSnapshotWin::AddMemorySnapshotForLdrLIST_ENTRY(
+@@ -519,6 +519,7 @@ void ProcessSnapshotWin::AddMemorySnapshotForLdrLIST_ENTRY(
  
  WinVMSize ProcessSnapshotWin::DetermineSizeOfEnvironmentBlock(
      WinVMAddress start_of_environment_block) {
diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch
index 0a5bff630c8e..6e968ee8f915 100644
--- a/patches/tools-gritsettings-resource_ids.spec.patch
+++ b/patches/tools-gritsettings-resource_ids.spec.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 70a1901dc65dc01f7d0a2c46095d93ae8b0fc68f..ea68e4676ea49d0369ee89ca9a481e643f6e7be0 100644
+index 70c5134c185bf725783d19a6cb37881515f9003a..1d39b491ee82067448d208fa04df653c3f79f568 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
 @@ -41,6 +41,9 @@
@@ -12,16 +12,16 @@ index 70a1901dc65dc01f7d0a2c46095d93ae8b0fc68f..ea68e4676ea49d0369ee89ca9a481e64
    "chrome/app/google_chrome_strings.grd": {
      "messages": [400],
    },
-@@ -185,7 +188,7 @@
+@@ -193,7 +196,7 @@
      "includes": [1600],
    },
-   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/history/history_resources.grd": {
+   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/history/resources.grd": {
 -    "META": {"sizes": {"includes": [40]}},
 +    "META": {"sizes": {"includes": [44]}},
      "includes": [1620],
    },
    "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/identity_internals/resources.grd": {
-@@ -629,6 +632,9 @@
+@@ -645,6 +648,9 @@
    "components/components_chromium_strings.grd": {
      "messages": [3520],
    },
diff --git a/patches/tools-json_schema_compiler-feature_compiler.py.patch b/patches/tools-json_schema_compiler-feature_compiler.py.patch
index 511d327a3a83..42e387edb096 100644
--- a/patches/tools-json_schema_compiler-feature_compiler.py.patch
+++ b/patches/tools-json_schema_compiler-feature_compiler.py.patch
@@ -1,8 +1,8 @@
 diff --git a/tools/json_schema_compiler/feature_compiler.py b/tools/json_schema_compiler/feature_compiler.py
-index c6b8ebf87a995684b6a8df34561f93289ce22c42..ccd834bfe5e34f407b30d4de85ecdb5630996b78 100644
+index 3882abb0243c90a141211443209049d5342a7695..c5685dedfcfa337ce7b5f960a6aba5a066edf4ab 100644
 --- a/tools/json_schema_compiler/feature_compiler.py
 +++ b/tools/json_schema_compiler/feature_compiler.py
-@@ -773,6 +773,7 @@ class FeatureCompiler(object):
+@@ -774,6 +774,7 @@ class FeatureCompiler(object):
                    abs_source_file)
          raise
        dupes = set(f_json) & set(self._json)
diff --git a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch
index 6718b50bd197..83a90a6ae446 100644
--- a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch
+++ b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
-index 98bc1bb668dcf8ab90f5b6b10f6fd7ecef1b364a..a70ca12501220e7ce54a4c986ba2bbe8b5fbccb3 100644
+index 35758acdf659783e9b7d84acc3b26744d34be18f..1d69fc57b851d36f49ec7934523447d02e401c9d 100644
 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
 +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
-@@ -7344,6 +7344,7 @@ chromium-metrics-reviews@google.com.
+@@ -7292,6 +7292,7 @@ chromium-metrics-reviews@google.com.
    <suffix name="ProtectedMedia" label="Protected media permission"/>
    <suffix name="PushMessaging" label="Push messaging permission"/>
    <suffix name="Quota" label="Quota permission"/>
diff --git a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch
index d3c51e1ba72c..824201c63a1d 100644
--- a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch
+++ b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm
-index 84fa4180d2fa57e880ef83a91e48308d50d243b6..465612663da6cb0fbd15a6376a1b67f94e799185 100644
+index 426b6ce73e2e3b68251803769b6f2f2fcfc8f7b3..987ec3cc30d58cebafc03c69e09aa818f90ef4a2 100644
 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm
 +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm
-@@ -2082,6 +2082,7 @@ bool IsAXSetter(SEL selector) {
+@@ -2083,6 +2083,7 @@ bool IsAXSetter(SEL selector) {
    if (!_node)
      return nil;
  
diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch
index 8839761f9a84..5594a83d7e73 100644
--- a/patches/ui-base-BUILD.gn.patch
+++ b/patches/ui-base-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index c5b1287e4b7bca6a35eef15ae165f39307a90ad6..8262a596d25dc2821a41b26da9a73bd9f9439937 100644
+index 012ab83bb9f4887646decb030b4a18f6b21e0d01..c58cde9ad185136bc6843df94dde1068a901b8c9 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
 @@ -487,6 +487,7 @@ component("base") {
diff --git a/patches/ui-webui-resources-BUILD.gn.patch b/patches/ui-webui-resources-BUILD.gn.patch
index d74475ce02d5..614be0337a98 100644
--- a/patches/ui-webui-resources-BUILD.gn.patch
+++ b/patches/ui-webui-resources-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn
-index 8c979f9612518787eb324a4466aac37941ecfcda..58530c64d7f1b91f1c8c01bf6b63a4b87ca98545 100644
+index 483defefa69d971e6c8f369263c445ac248297f5..d9cd2023dfc8f468dfff82d66b4a3aa7f18c9fdb 100644
 --- a/ui/webui/resources/BUILD.gn
 +++ b/ui/webui/resources/BUILD.gn
-@@ -378,7 +378,7 @@ ts_library("library") {
+@@ -394,7 +394,7 @@ ts_library("library") {
        "js/web_ui_listener_mixin.ts",
      ]
  
diff --git a/patches/ui-webui-resources-cr_elements-BUILD.gn.patch b/patches/ui-webui-resources-cr_elements-BUILD.gn.patch
index 17196685b35e..300e25b62c79 100644
--- a/patches/ui-webui-resources-cr_elements-BUILD.gn.patch
+++ b/patches/ui-webui-resources-cr_elements-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/webui/resources/cr_elements/BUILD.gn b/ui/webui/resources/cr_elements/BUILD.gn
-index 9a0313f63c318ee137424a9616c420add1dede5d..351453f65a40161c411aab31597748fd263faa86 100644
+index cb8f7cbc8e1e4a6bbe19c83fd59f9d252a784005..f1d38635832805a6943ddc1d0994570fd1c5d704 100644
 --- a/ui/webui/resources/cr_elements/BUILD.gn
 +++ b/ui/webui/resources/cr_elements/BUILD.gn
-@@ -111,7 +111,7 @@ preprocess_if_expr("preprocess_src_ts") {
+@@ -114,7 +114,7 @@ preprocess_if_expr("preprocess_src_ts") {
        "mouse_hoverable_mixin.ts",
      ]
  
@@ -11,7 +11,7 @@ index 9a0313f63c318ee137424a9616c420add1dede5d..351453f65a40161c411aab31597748fd
        in_files += [ "cr_searchable_drop_down/cr_searchable_drop_down.ts" ]
      }
    }
-@@ -274,7 +274,7 @@ preprocess_if_expr("preprocess_generated_ts") {
+@@ -277,7 +277,7 @@ preprocess_if_expr("preprocess_generated_ts") {
        "search_highlight_style.css.ts",
      ]
  
@@ -20,7 +20,7 @@ index 9a0313f63c318ee137424a9616c420add1dede5d..351453f65a40161c411aab31597748fd
        in_files += [ "cr_searchable_drop_down/cr_searchable_drop_down.html.ts" ]
      }
    }
-@@ -498,7 +498,7 @@ if (include_polymer) {
+@@ -503,7 +503,7 @@ if (include_polymer) {
        "mwb_shared_icons.html",
      ]
  
diff --git a/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch b/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch
index 0f5d25ec9b06..a07d4673c271 100644
--- a/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch
+++ b/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/webui/resources/cr_elements/shared_vars_css.html b/ui/webui/resources/cr_elements/shared_vars_css.html
-index 6a5718479763647c7d585a5d85968f6fe7d0420c..f0aedb4031a32fdbeffd3ea86ff8278d75c8870c 100644
+index 92c54ddc141646aa3d2a11cb064c277411739507..17681857d5c49e9d9c65cebcf994cbb6c19cae2d 100644
 --- a/ui/webui/resources/cr_elements/shared_vars_css.html
 +++ b/ui/webui/resources/cr_elements/shared_vars_css.html
 @@ -1,6 +1,7 @@
diff --git a/renderer/test/digital_goods_api_browsertest.cc b/renderer/test/digital_goods_api_browsertest.cc
index 007cce7a1947..28d9834d0747 100644
--- a/renderer/test/digital_goods_api_browsertest.cc
+++ b/renderer/test/digital_goods_api_browsertest.cc
@@ -59,8 +59,8 @@ class DigitalGoodsAPIBrowserTest : public InProcessBrowserTest,
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
-  content::RenderFrameHost* main_frame() {
-    return web_contents()->GetMainFrame();
+  content::RenderFrameHost* primary_main_frame() {
+    return web_contents()->GetPrimaryMainFrame();
   }
 
  protected:
@@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_P(DigitalGoodsAPIBrowserTest, DigitalGoods) {
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
 
   auto result =
-      content::EvalJs(main_frame(), "window.getDigitalGoodsService()");
+      content::EvalJs(primary_main_frame(), "window.getDigitalGoodsService()");
   if (IsDigitalGoodsAPIEnabled()) {
     EXPECT_TRUE(result.error.find(
                     "Failed to execute 'getDigitalGoodsService' on "
diff --git a/renderer/test/file_system_access_browsertest.cc b/renderer/test/file_system_access_browsertest.cc
index bc55f4911ee6..a3b5705cd3f6 100644
--- a/renderer/test/file_system_access_browsertest.cc
+++ b/renderer/test/file_system_access_browsertest.cc
@@ -56,8 +56,8 @@ class FileSystemAccessBrowserTest : public InProcessBrowserTest,
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
-  content::RenderFrameHost* main_frame() {
-    return web_contents()->GetMainFrame();
+  content::RenderFrameHost* primary_main_frame() {
+    return web_contents()->GetPrimaryMainFrame();
   }
 
  protected:
@@ -75,10 +75,11 @@ IN_PROC_BROWSER_TEST_P(FileSystemAccessBrowserTest, FilePicker) {
 
   if (IsFileSystemAccessAPIEnabled()) {
     auto result =
-        content::EvalJs(main_frame(), "typeof self.showOpenFilePicker");
+        content::EvalJs(primary_main_frame(), "typeof self.showOpenFilePicker");
     EXPECT_EQ(result.value.GetString(), "function");
   } else {
-    auto result = content::EvalJs(main_frame(), "self.showOpenFilePicker()");
+    auto result =
+        content::EvalJs(primary_main_frame(), "self.showOpenFilePicker()");
     EXPECT_TRUE(base::Contains(result.error,
                                "self.showOpenFilePicker is not a function"))
         << result.error;
diff --git a/renderer/test/js_ethereum_provider_browsertest.cc b/renderer/test/js_ethereum_provider_browsertest.cc
index bc20acfb9bae..c0fa6d1d4308 100644
--- a/renderer/test/js_ethereum_provider_browsertest.cc
+++ b/renderer/test/js_ethereum_provider_browsertest.cc
@@ -91,8 +91,8 @@ class JSEthereumProviderBrowserTest : public InProcessBrowserTest {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
-  content::RenderFrameHost* main_frame() {
-    return web_contents()->GetMainFrame();
+  content::RenderFrameHost* primary_main_frame() {
+    return web_contents()->GetPrimaryMainFrame();
   }
 
   void ReloadAndWaitForLoadStop() {
@@ -119,7 +119,7 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, AttachOnReload) {
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
 
   std::string command = "window.ethereum.isMetaMask";
-  EXPECT_TRUE(content::EvalJs(main_frame(), command)
+  EXPECT_TRUE(content::EvalJs(primary_main_frame(), command)
                   .error.find("Cannot read properties of undefined") !=
               std::string::npos);
   EXPECT_EQ(browser()->tab_strip_model()->GetTabCount(), 1);
@@ -127,20 +127,21 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, AttachOnReload) {
       browser()->profile()->GetPrefs(),
       brave_wallet::mojom::DefaultWallet::BraveWallet);
   ReloadAndWaitForLoadStop();
-  auto result = content::EvalJs(main_frame(), command);
+  auto result = content::EvalJs(primary_main_frame(), command);
   EXPECT_EQ(result.error, "");
   ASSERT_TRUE(result.ExtractBool());
   EXPECT_EQ(browser()->tab_strip_model()->GetTabCount(), 1);
   // unable to overwrite
   std::string overwrite = "window.ethereum = ['test'];window.ethereum[0]";
-  EXPECT_EQ(content::EvalJs(main_frame(), overwrite).error, "");
-  ASSERT_TRUE(content::EvalJs(main_frame(), command).ExtractBool());
+  EXPECT_EQ(content::EvalJs(primary_main_frame(), overwrite).error, "");
+  ASSERT_TRUE(content::EvalJs(primary_main_frame(), command).ExtractBool());
   brave_wallet::SetDefaultEthereumWallet(
       browser()->profile()->GetPrefs(),
       brave_wallet::mojom::DefaultWallet::BraveWalletPreferExtension);
   ReloadAndWaitForLoadStop();
   // overwrite successfully
-  EXPECT_EQ(content::EvalJs(main_frame(), overwrite).ExtractString(), "test");
+  EXPECT_EQ(content::EvalJs(primary_main_frame(), overwrite).ExtractString(),
+            "test");
 }
 
 IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest,
@@ -152,7 +153,7 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest,
       ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab/")));
 
   std::string command = "window.ethereum.isMetaMask";
-  EXPECT_TRUE(content::EvalJs(main_frame(), command,
+  EXPECT_TRUE(content::EvalJs(primary_main_frame(), command,
                               content::EXECUTE_SCRIPT_DEFAULT_OPTIONS,
                               ISOLATED_WORLD_ID_TRANSLATE)
                   .error.find("Cannot read properties of undefined") !=
@@ -162,7 +163,7 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest,
       browser()->profile()->GetPrefs(),
       brave_wallet::mojom::DefaultWallet::BraveWallet);
   ReloadAndWaitForLoadStop();
-  EXPECT_TRUE(content::EvalJs(main_frame(), command,
+  EXPECT_TRUE(content::EvalJs(primary_main_frame(), command,
                               content::EXECUTE_SCRIPT_DEFAULT_OPTIONS,
                               ISOLATED_WORLD_ID_TRANSLATE)
                   .error.find("Cannot read properties of undefined") !=
@@ -208,7 +209,7 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, IsMetaMaskWritable) {
   std::string overwrite =
       "window.ethereum.isMetaMask = false;"
       "window.ethereum.isMetaMask";
-  EXPECT_FALSE(content::EvalJs(main_frame(), overwrite).ExtractBool());
+  EXPECT_FALSE(content::EvalJs(primary_main_frame(), overwrite).ExtractBool());
 }
 
 IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, NonConfigurable) {
@@ -226,7 +227,7 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, NonConfigurable) {
        window.ethereum = 42;
        typeof window.ethereum === 'object'
     )";
-  EXPECT_TRUE(content::EvalJs(main_frame(), overwrite).ExtractBool());
+  EXPECT_TRUE(content::EvalJs(primary_main_frame(), overwrite).ExtractBool());
 }
 
 IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, OnlyWriteOwnProperty) {
@@ -238,20 +239,22 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, OnlyWriteOwnProperty) {
 
   const std::string get_chain_id = "window.ethereum.chainId";
 
-  ASSERT_EQ(content::EvalJs(main_frame(), get_chain_id).ExtractString(), "0x1");
+  ASSERT_EQ(content::EvalJs(primary_main_frame(), get_chain_id).ExtractString(),
+            "0x1");
 
   GetJsonRpcService()->SetNetwork("0x3", brave_wallet::mojom::CoinType::ETH,
                                   false);
   // Needed so ChainChangedEvent observers run
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(content::EvalJs(main_frame(), get_chain_id).ExtractString(), "0x3");
+  EXPECT_EQ(content::EvalJs(primary_main_frame(), get_chain_id).ExtractString(),
+            "0x3");
 
   brave_wallet::SetDefaultEthereumWallet(
       browser()->profile()->GetPrefs(),
       brave_wallet::mojom::DefaultWallet::BraveWalletPreferExtension);
   ReloadAndWaitForLoadStop();
   ASSERT_EQ(content::EvalJs(
-                main_frame(),
+                primary_main_frame(),
                 "window.ethereum = {chainId: '0x89'}; window.ethereum.chainId")
                 .ExtractString(),
             "0x89");
@@ -260,7 +263,7 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, OnlyWriteOwnProperty) {
                                   false);
   // Needed so ChainChangedEvent observers run
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(content::EvalJs(main_frame(), get_chain_id).ExtractString(),
+  EXPECT_EQ(content::EvalJs(primary_main_frame(), get_chain_id).ExtractString(),
             "0x89");
 }
 
@@ -384,20 +387,20 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, Iframe3P) {
   for (auto& c : ethereum_undefined_cases) {
     SCOPED_TRACE(testing::Message() << c.script << c.top_url << c.iframe_url);
     ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), c.top_url));
-    EXPECT_TRUE(content::EvalJs(main_frame(), c.script).ExtractBool());
+    EXPECT_TRUE(content::EvalJs(primary_main_frame(), c.script).ExtractBool());
     EXPECT_TRUE(NavigateIframeToURL(web_contents(), "test", c.iframe_url));
-    EXPECT_TRUE(
-        content::EvalJs(ChildFrameAt(main_frame(), 0), kEvalEthereumUndefined)
-            .ExtractBool());
+    EXPECT_TRUE(content::EvalJs(ChildFrameAt(primary_main_frame(), 0),
+                                kEvalEthereumUndefined)
+                    .ExtractBool());
   }
   for (auto& c : ethereum_defined_cases) {
     SCOPED_TRACE(testing::Message() << c.script << c.top_url << c.iframe_url);
     ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), c.top_url));
-    EXPECT_TRUE(content::EvalJs(main_frame(), c.script).ExtractBool());
+    EXPECT_TRUE(content::EvalJs(primary_main_frame(), c.script).ExtractBool());
     EXPECT_TRUE(NavigateIframeToURL(web_contents(), "test", c.iframe_url));
-    EXPECT_FALSE(
-        content::EvalJs(ChildFrameAt(main_frame(), 0), kEvalEthereumUndefined)
-            .ExtractBool());
+    EXPECT_FALSE(content::EvalJs(ChildFrameAt(primary_main_frame(), 0),
+                                 kEvalEthereumUndefined)
+                     .ExtractBool());
   }
 }
 
@@ -406,20 +409,24 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest, SecureContextOnly) {
   GURL url = https_server_.GetURL("a.com", "/simple.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
   constexpr char kEvalEthereum[] = "typeof window.ethereum !== 'undefined'";
-  EXPECT_TRUE(content::EvalJs(main_frame(), kEvalEthereum).ExtractBool());
+  EXPECT_TRUE(
+      content::EvalJs(primary_main_frame(), kEvalEthereum).ExtractBool());
 
   // Insecure context
   url = embedded_test_server()->GetURL("a.com", "/empty.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
-  EXPECT_FALSE(content::EvalJs(main_frame(), kEvalEthereum).ExtractBool());
+  EXPECT_FALSE(
+      content::EvalJs(primary_main_frame(), kEvalEthereum).ExtractBool());
 
   // Secure context localhost HTTP
   url = embedded_test_server()->GetURL("localhost", "/empty.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
-  EXPECT_TRUE(content::EvalJs(main_frame(), kEvalEthereum).ExtractBool());
+  EXPECT_TRUE(
+      content::EvalJs(primary_main_frame(), kEvalEthereum).ExtractBool());
 
   // Secure context 127.0.0.1 HTTP
   url = embedded_test_server()->GetURL("localhost", "/empty.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
-  EXPECT_TRUE(content::EvalJs(main_frame(), kEvalEthereum).ExtractBool());
+  EXPECT_TRUE(
+      content::EvalJs(primary_main_frame(), kEvalEthereum).ExtractBool());
 }
diff --git a/renderer/test/navigator_connection_attribute_browsertest.cc b/renderer/test/navigator_connection_attribute_browsertest.cc
index 17778c2ffdb2..3a7e221db87f 100644
--- a/renderer/test/navigator_connection_attribute_browsertest.cc
+++ b/renderer/test/navigator_connection_attribute_browsertest.cc
@@ -55,8 +55,8 @@ class NavigatorConnectionAttributeBrowserTest
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
-  content::RenderFrameHost* main_frame() {
-    return web_contents()->GetMainFrame();
+  content::RenderFrameHost* primary_main_frame() {
+    return web_contents()->GetPrimaryMainFrame();
   }
 
  protected:
@@ -73,7 +73,8 @@ IN_PROC_BROWSER_TEST_P(NavigatorConnectionAttributeBrowserTest,
   const GURL url = https_server_.GetURL("/simple.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
 
-  auto result = content::EvalJs(main_frame(), "'connection' in navigator");
+  auto result =
+      content::EvalJs(primary_main_frame(), "'connection' in navigator");
   EXPECT_EQ(IsNavigatorConnectionAttributeEnabled(), result);
 }
 
diff --git a/renderer/test/serial_api_browsertest.cc b/renderer/test/serial_api_browsertest.cc
index 6a73a222119e..7ab3ddc2d706 100644
--- a/renderer/test/serial_api_browsertest.cc
+++ b/renderer/test/serial_api_browsertest.cc
@@ -43,8 +43,8 @@ class SerialAPIBrowserTest : public InProcessBrowserTest {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
-  content::RenderFrameHost* main_frame() {
-    return web_contents()->GetMainFrame();
+  content::RenderFrameHost* primary_main_frame() {
+    return web_contents()->GetPrimaryMainFrame();
   }
 
  protected:
@@ -55,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(SerialAPIBrowserTest, SerialAPIDisabled) {
   const GURL url = https_server_.GetURL("/simple.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
 
-  auto result = content::EvalJs(main_frame(), R"((async () => {
+  auto result = content::EvalJs(primary_main_frame(), R"((async () => {
         let ports = await navigator.serial.getPorts();
         return ports.length;
       })())");
diff --git a/renderer/test/subresource_web_bundles_browsertest.cc b/renderer/test/subresource_web_bundles_browsertest.cc
index ec12ddbaebe6..e87b72d2e861 100644
--- a/renderer/test/subresource_web_bundles_browsertest.cc
+++ b/renderer/test/subresource_web_bundles_browsertest.cc
@@ -181,8 +181,8 @@ class SubresourceWebBundlesBrowserTest
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
-  content::RenderFrameHost* main_frame() {
-    return web_contents()->GetMainFrame();
+  content::RenderFrameHost* primary_main_frame() {
+    return web_contents()->GetPrimaryMainFrame();
   }
 
  protected:
@@ -201,10 +201,10 @@ IN_PROC_BROWSER_TEST_P(SubresourceWebBundlesBrowserTest,
   if (IsSubresourceWebBundlesEnabled()) {
     std::u16string expected_title(u"script loaded");
     content::TitleWatcher title_watcher(web_contents(), expected_title);
-    EXPECT_EQ(true, content::EvalJs(main_frame(), kLoadPassJs));
+    EXPECT_EQ(true, content::EvalJs(primary_main_frame(), kLoadPassJs));
     EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
   } else {
-    EXPECT_EQ(false, content::EvalJs(main_frame(), kLoadPassJs));
+    EXPECT_EQ(false, content::EvalJs(primary_main_frame(), kLoadPassJs));
   }
 }
 
diff --git a/script/lib/l10n/grd_string_replacements.py b/script/lib/l10n/grd_string_replacements.py
index 360a7470bd85..3566ff878512 100644
--- a/script/lib/l10n/grd_string_replacements.py
+++ b/script/lib/l10n/grd_string_replacements.py
@@ -65,6 +65,7 @@
     (r'Brave Pay', r'Google Pay'),
     (r'Brave Photos', r'Google Photos'),
     (r'Brave Projects', r'Chromium Projects'),
+    (r'BraveVox', r'ChromeVox'),
 ]
 
 
diff --git a/script/policy_source_helper.py b/script/policy_source_helper.py
index 4dac05658124..8f8030bd89c2 100644
--- a/script/policy_source_helper.py
+++ b/script/policy_source_helper.py
@@ -16,7 +16,9 @@ def AddBravePolicies(template_file_contents):
             'name': 'TorDisabled',
             'type': 'main',
             'schema': {'type': 'boolean'},
-            'supported_on': ['chrome.win:78-', 'chrome.mac:93-', 'chrome.linux:93-'],
+            'supported_on': ['chrome.win:78-',
+                             'chrome.mac:93-',
+                             'chrome.linux:93-'],
             'features': {
                 'dynamic_refresh': False,
                 'per_profile': False,
@@ -27,14 +29,15 @@ def AddBravePolicies(template_file_contents):
             'id': 0,
             'caption': '''Disables the tor feature.''',
             'tags': [],
-            'desc': '''This policy allows an admin to specify that tor feature must be disabled
-                    at startup.''',
+            'desc': ('''This policy allows an admin to specify that tor '''
+                     '''must be disabled at startup.'''),
         },
         {
             'name': 'IPFSEnabled',
             'type': 'main',
             'schema': {'type': 'boolean'},
             'supported_on': ['chrome.*:87-'],
+            'future_on': ['android'],
             'features': {
                 'dynamic_refresh': False,
                 'per_profile': True,
@@ -45,8 +48,8 @@ def AddBravePolicies(template_file_contents):
             'id': 1,
             'caption': '''Enable IPFS feature''',
             'tags': [],
-            'desc': '''This policy allows an admin to specify whether IPFS feature can be
-                    enabled.''',
+            'desc': ('''This policy allows an admin to specify whether IPFS '''
+                     '''feature can be enabled.'''),
         }
     ]
 
diff --git a/script/repack-archive.py b/script/repack-archive.py
index 1c3350f05017..e00a0080d416 100644
--- a/script/repack-archive.py
+++ b/script/repack-archive.py
@@ -12,7 +12,7 @@ def GetLZMAExec():
         root_src_dir = os.path.abspath(os.path.join(
             os.path.dirname(__file__), *[os.pardir] * 2))
         lzma_exec = os.path.join(root_src_dir, "third_party",
-                                 "lzma_sdk", "Executable", "7za.exe")
+                                 "lzma_sdk", "bin", "7za.exe")
     else:
         lzma_exec = '7zr'  # Use system 7zr.
     return lzma_exec
diff --git a/test/BUILD.gn b/test/BUILD.gn
index a69dd1da4cbc..1bfdc95b1d60 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -83,7 +83,7 @@ static_library("brave_test_support_unit") {
 test("brave_unit_tests") {
   testonly = true
 
-  configs += [ "//chrome/test:disable_thinlto_cache_flags" ]
+  configs += [ "//chrome:disable_thinlto_cache_flags" ]
 
   sources = [
     "//brave/browser/brave_ads/search_result_ad/search_result_ad_service_unittest.cc",
@@ -435,7 +435,7 @@ test("brave_unit_tests") {
       "//chrome:chrome_android_core",
       "//chrome/android:chrome_apk_paks",
       "//chrome/android:delegate_public_impl_java",
-      "//chrome/test/android:chrome_java_test_support",
+      "//chrome/test/android:chrome_java_test_support_common",
       "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
     ]
     if (enable_brave_vpn) {
@@ -636,7 +636,7 @@ if (!is_android) {
       "//brave/vendor/bat-native-ads:internal_config",
       "//brave/vendor/bat-native-ledger:internal_config",
       "//build/config:precompiled_headers",
-      "//chrome/test:disable_thinlto_cache_flags",
+      "//chrome:disable_thinlto_cache_flags",
     ]
 
     sources = [
@@ -835,6 +835,7 @@ if (!is_android) {
       "//brave/vendor/bat-native-ledger:publishers_proto",
       "//chrome/browser",
       "//chrome/browser/enterprise/connectors/analysis:features",
+      "//chrome/browser/ui/color:color_headers",
       "//chrome/browser/ui/color:mixers",
       "//components/commerce/core:feature_list",
       "//components/gcm_driver:gcm_buildflags",
@@ -943,6 +944,7 @@ if (!is_android) {
       deps += [
         "//brave/browser/renderer_context_menu",
         "//components/language/core/browser",
+        "//components/spellcheck/common",
       ]
     }
 
@@ -1050,7 +1052,7 @@ if (!is_android) {
     # We need to disable the ThinLTO cache or the linker will die with
     # a "Resource temporarily unavailable" error due to the linking
     # reaching the vm.max_map_count limit of 65530 memory mappings.
-    configs += [ "//chrome/test:disable_thinlto_cache_flags" ]
+    configs += [ "//chrome:disable_thinlto_cache_flags" ]
 
     sources = [
       "//brave/browser/net/brave_network_audit_allowed_lists.h",
@@ -1295,7 +1297,8 @@ if (is_android) {
       "//chrome/browser/ui/android/toolbar:java",
       "//chrome/browser/ui/messages/android:java",
       "//chrome/browser/user_education:java",
-      "//chrome/test/android:chrome_java_test_support",
+      "//chrome/test/android:chrome_java_integration_test_support",
+      "//chrome/test/android:chrome_java_test_support_common",
       "//components/browser_ui/bottomsheet/android:java",
       "//components/browser_ui/settings/android:java",
       "//components/browser_ui/site_settings/android:java",
diff --git a/test/filters/browser_tests-windows.filter b/test/filters/browser_tests-windows.filter
index 0c362e07d097..197417361f5c 100644
--- a/test/filters/browser_tests-windows.filter
+++ b/test/filters/browser_tests-windows.filter
@@ -71,6 +71,9 @@
 -PushSubscriptionWithoutExpirationTimeTest.SubscribeDocumentExpirationTimeNull
 -PWAMixedContentBrowserTestWithAutoupgradesDisabled.MixedContentReparentWebContentsIntoAppBrowser
 -SaveCardBubbleViewsFullFormBrowserTest.*
+-SaveCardBubbleViewsFullFormBrowserTestForManageCard.Local_ClickingIconShowsManageCards
+-SaveCardBubbleViewsFullFormBrowserTestForManageCard.Local_ClickingSaveClosesBubble
+-SaveCardBubbleViewsFullFormBrowserTestForManageCard.Local_ManageCardsDoneButtonClosesBubble
 -ScriptingAPITest.*
 -ServiceWorker/ExtensionI18nTest.*
 -ServiceWorker/ExtensionManagementApiTest.*
diff --git a/test/filters/browser_tests.filter b/test/filters/browser_tests.filter
index 6bb692e9ef45..7ccfc4c955fd 100644
--- a/test/filters/browser_tests.filter
+++ b/test/filters/browser_tests.filter
@@ -17,6 +17,7 @@
 -All/ClickToCallPolicyTest.*
 -All/ClientHintsAllowThirdPartyBrowserTest.*
 -All/ClientHintsBrowserTest.*
+-All/ClientHintsBrowserTestForMetaTagTypes.*
 -All/CookieSettingsTest.*
 -All/DataSaverHoldbackBrowserTest.*
 -All/DeclarativeNetRequestBackForwardCacheBrowserTest.*
@@ -53,6 +54,7 @@
 -All/PDFExtensionTestWithTestGuestViewManager.*
 -All/PDFExtensionWebUICodeCacheJSTest.*
 -All/PrerenderingChangePasswordNavigationThrottleBrowserTest.*
+-All/PrerenderOmniboxSearchSuggestionReloadBrowserTest.*
 -All/PrintPreviewDialogControllerBrowserTest.*
 -All/ProcessManagementExtensionIsolationTest.*
 -All/ProfileNetworkContextServiceCertVerifierBuiltinPermissionsPolicyTest.*
@@ -104,6 +106,7 @@
 -AllRedirectCodes/CriticalClientHintsRedirectBrowserTest.*
 -AnchorElementPreloaderBrowserTest.*
 -AnchorElementPreloaderHoldbackBrowserTest.PreconnectHoldbackTest
+-AnchorElementPreloaderLimitedBrowserTest.LimitExceeded
 -AppApiTest.*
 -AppBannerManagerPrerenderBrowserTest.*
 -AppControllerProfilePickerBrowserTest.*
@@ -115,6 +118,7 @@
 -AppSessionRestoreTest.NoAppRestore
 -AppSessionRestoreTest.OpeningAppDoesNotAffectBrowserSession
 -AutofillServerTest.*
+-AvatarMenuBrowserTest.EditProfile_NotLoaded
 -AvatarToolbarButtonBrowserTest.*
 -BackForwardCacheFileSystemAccessBrowserTest.*
 -BackForwardCachePageLoadMetricsObserverBrowserTest.*
@@ -164,6 +168,9 @@
 -ChromeSitePerProcessTest.*
 -ChromeURLDataManagerTest.*
 -ChromeURLDataManagerWebUITrustedTypesTest.*
+-Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/0
+-Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/6
+-Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/7
 -ClickToCallBrowserTest.*
 -ClientHintsAcceptCHFrameObserverBrowserTest.*
 -ClientHintsBrowserTest.*
@@ -202,6 +209,7 @@
 -CookiePolicyBrowserTest.*
 -CookieStoreSameParty*Test.*
 -CredentialManagerBrowserTest.*
+-CredentialManagerPrerenderBrowserTest.*
 -CriticalClientHintsBrowserTest.*
 -CrossProfileDebuggerApiTest.GetTargets
 -DataSaverWebAPIsBrowserTest.*
@@ -225,6 +233,7 @@
 -DiceManageAccountBrowserTest.*
 -DiceSigninUiUtilBrowserTest.*
 -DiceWebSigninInterceptionBubbleBrowserTest.*
+-DiceWebSigninInterceptionBubbleV2BrowserTest.OpenLearnMoreLinkInNewTab
 -DiceWebSigninInterceptorBrowserTest.*
 -DiceWebSigninInterceptorEnterpriseBrowserTest.*
 -DIPSBounceDetectorBrowserTest.DetectStatefulRedirect_Client_IgnoreThirdPartySubresource
@@ -254,12 +263,14 @@
 -EnterpriseReportingPrivateGetContextInfoBrowserTest.AffiliationIDs/*
 -ErrorPageOfflineTestWithAllowDinosaurTrue.*
 -EventPage/CookiesApiTest.*
+-EventPage/DeclarativeNetRequestApiPrerenderingTest.*
 -EventPage/DeclarativeNetRequestLazyApiTest.TestMatchOutcome/0
 -EventPage/ExtensionContextMenuLazyTest.*
 -EventPage/ExtensionPreferenceApiTest.*
 -ExitTypeServiceTest.*
 -ExplicitlyAllowedNetworkPortsBackgroundFetchBrowserTest.*
 -ExtensionApiNewTabTest.*
+-ExtensionApiTabPrerenderingTest.Prerendering
 -ExtensionApiTabTest.*
 -ExtensionApiTest.*
 -ExtensionBindingsApiTest.*
@@ -283,6 +294,7 @@
 -ExtensionUninstallDialogViewInteractiveBrowserTest.*
 -ExtensionURLRewriteBrowserTest.*
 -ExtensionWebRequestApiFencedFrameTest/ExtensionWebRequestApiFencedFrameTest.*
+-ExtensionWebRequestApiPrerenderingTest.Load
 -ExtensionWebRequestApiTest.*
 -ExtensionWebstorePrivateApiAllowlistEnforcementTest.*
 -ExtensionWebstorePrivateApiTest.*
@@ -318,6 +330,7 @@
 -GlobalMediaControlsDialogTest.*
 -GooglePFTest.*
 -GreaseEnterprisePolicyTest.*
+-GreaseFeatureParamOptOutTest.UpdatedGreaseFeatureParamOptOutTest
 -GuestStartupBrowserCreatorPickerTest.*
 -HangoutServicesBrowserTest.*
 -HintsFetcherBrowserTest.*
@@ -332,9 +345,12 @@
 -HTMLCSSSyncScriptFontNoStatePrefetchBrowserTest.*
 -HTMLCSSSyncScriptNoStatePrefetchBrowserTest.*
 -HTMLOnlyNoStatePrefetchBrowserTest.*
+-HTTPCacheSearchPreloadUnifiedBrowserTest.BackwardHitHttpCache
 -IdentityGetAccountsFunctionTest.*
 -IdentityGetProfileUserInfoFunctionTest.*
 -ImageUtilTest.CheckDefaultToolbarColor
+-Incognito/ExtensionWebRequestApiAuthRequiredTest.WebRequestAuthRequired/0
+-Incognito/ExtensionWebRequestApiAuthRequiredTest.WebRequestAuthRequiredAsync/0
 -IncognitoBrowsingDataBrowserTest.*
 -IncognitoProfileMainNetworkContext/NetworkContextConfigurationBrowserTest.*
 -IncognitoProfileMainNetworkContext/NetworkContextConfigurationReportingAndNelBrowserTest.*
@@ -361,6 +377,7 @@
 -InspectUITest.*
 -InstallableManagerInPrerenderingBrowserTest.*
 -IntentChipButtonBrowserTest.*
+-IntentChipButtonSkipIntentPickerBrowserTest.ShowsIntentChipCollapsed
 -InterestGroupFledgeOnBrowserTest.*
 -InterestGroupPermissionsBrowserTest.*
 -IsolatedAppsDeveloperModeAllowedPolicyTest.*
@@ -368,6 +385,7 @@
 -JavascriptFrameworksUkmObserverBrowserTest.*
 -KeepAliveDevToolsTest.*
 -KnownInterceptionDisclosureInfobarTest.*
+-LatencyAblationEnabledBrowserTest.DontAblatePrerender
 -LazyBackgroundPageApiTest.*
 -LazyLoadPrerenderBrowserTest.*
 -LiveCaptionSpeechRecognitionHostTest.*
@@ -396,6 +414,7 @@
 -MediaRouterUIBrowserTest.*
 -MessagingApiFencedFrameTest/MessagingApiFencedFrameTest.*
 -MetadataCheckAndDeepScanningBrowserTest.*
+-MetricsLogBrowserTest.CommandLineKeyHash
 -MetricsServiceBrowserDoUploadTest.*
 -MetricsServiceBrowserTest.*
 -MetricsServiceUserDemographicsBrowserTest.*
@@ -403,9 +422,7 @@
 -Mode/BackgroundColorChangeWebAppBrowserTest.*
 -MojoFileSystemAccessBrowserTest.CanResolveFilePath
 -MojoJSInterfaceBrokerBrowserTest.*
--MultiOriginSessionRestoreTest.BackToAboutBlank1
--MultiOriginSessionRestoreTest.BackToAboutBlank2
--MultiOriginSessionRestoreTest.SecFetchSite
+-MultiOriginSessionRestoreTest.*
 -MultiPageBrowserTest.*
 -MultipleTabSharingUIViewsBrowserTest.*
 -MultiTabLoadingPageLoadMetricsBrowserTest.MultiTabForeground
@@ -482,6 +499,7 @@
 -PageLoadTrackerDecoratorTest.*
 -PageTextObserverSingleProcessBrowserTest.*
 -PasswordBubbleBrowserTest.*
+-PasswordManagerAnonymousIframeTest.DisablePasswordManagerOnAnonymousIframe
 -PasswordManagerBackForwardCacheBrowserTest.*
 -PasswordManagerBrowserTest.*
 -PasswordManagerInternalsWebUIBrowserTest.*
@@ -507,6 +525,7 @@
 -PerformanceHintsObserverPrerenderTest.*
 -PermissionRequestManagerWithBackForwardCacheBrowserTest.*
 -PermissionRequestManagerWithPrerenderingTest.*
+-PersistentBackground/DeclarativeNetRequestApiPrerenderingTest.*
 -PersistentBackground/DeclarativeNetRequestLazyApiTest.TestMatchOutcome/0
 -PersistentBackground/ExtensionI18nTest.*
 -PersistentBackground/ExtensionManagementApiTest.*
@@ -516,6 +535,7 @@
 -PersistentScriptingAPITest.*
 -PictureInPictureWindowControllerPrerenderBrowserTest.*
 -PlatformAppBrowserTest.*
+-PlatformAppNavigationRedirectorPrerenderingBrowserTest.*
 -PolicyPrefsTest.*
 -PolicyPrefsTestCoverageTest.*
 -PolicyTest.*
@@ -541,9 +561,12 @@
 -PrerenderBrowserTest.*
 -PrerenderDownloadTest.*
 -PrerenderFileSystemAccessBrowserTest.*
+-PrerenderOmniboxSearchSuggestionBrowserTest.*
+-PrerenderOmniboxSearchSuggestionExpiryBrowserTest.*
 -PrerenderPageLoadMetricsBrowserTest.*
 -PrerenderPageLoadMetricsObserverBrowserTest.*
 -PrerenderSiteDetailsBrowserTest.*
+-PrerenderTaskBrowserTest.*
 -PresentationReceiverWindowControllerBrowserTest.*
 -PrintPrerenderBrowserTest.*
 -PrintPreviewDialogControllerBrowserTest.NavigateFromInitiatorTab
@@ -551,6 +574,7 @@
 -PrivacyBudgetBrowserTest.*
 -PrivacyBudgetBrowserTestWithScopedConfig.*
 -PrivacyBudgetBrowserTestWithTestRecorder.*
+-PrivacyBudgetBrowserTestWithUkmRecording.*
 -PrivacySandboxDialogHelperTestWithParamInstance/PrivacySandboxDialogHelperTestWithParam.*
 -PrivacySandboxSettingsBrowserTest.*
 -PrivateNetworkAccessWithFeatureEnabledBrowserTest.*
@@ -559,6 +583,7 @@
 -ProfileBrowserTest.*
 -ProfileBrowserTestWithoutDestroyProfile.*
 -ProfileCustomizationBubbleBrowserTest.*
+-ProfileCustomizationDialogBrowserTest.*
 -ProfileKeyedServiceBrowserTest.SystemProfileOTR_NeededServices
 -ProfileKeyedServiceBrowserTest.SystemProfileParent_NeededServices
 -ProfileListDesktopBrowserTest.*
@@ -621,6 +646,7 @@
 -SafeBrowsingPolicyTest.*
 -SafeBrowsingTriggeredPopupBlockerBrowserTest.*
 -SafeBrowsingTriggeredPopupBlockerPrerenderingBrowserTest.*
+-SafetyTipPageInfoBubbleViewBrowserTest.DoesntTriggerOnComboSquatting
 -SafetyTipPageInfoBubbleViewPrerenderBrowserTest.*
 -SameOriginPartitionedCookiesOriginTrialBrowserTest.*
 -SameOriginUaReducedOriginTrialBrowserTest.*
@@ -632,6 +658,7 @@
 -SavePageBrowserTest.*
 -SBNavigationObserverBrowserTest.PrerenderReferrerChains
 -SCTReportingServiceBrowserTest.ReportsSentAfterNetworkServiceRestart
+-ScriptingAPIPrerenderingTest.Basic
 -SearchApiTest.*
 -SearchByImageBrowserTest.*
 -SearchEnginePreconnectorDesktopAutoStartBrowserTest.*
@@ -642,14 +669,16 @@
 -SearchPrefetchServiceBFCacheTest.*
 -SearchPrefetchServiceHeadStartTest.*
 -SearchPrefetchServiceHeadStartTooLongTest.*
+-SearchPrefetchServiceNavigationPrefetchBrowserTest.*
 -SearchPrefetchServiceZeroCacheTimeBrowserTest.*
 -SearchPrefetchServiceZeroErrorTimeBrowserTest.*
--SearchPreloadUnifiedBrowserTest.PrerenderBeTriggered
+-SearchPreloadUnifiedBrowserTest.*
 -SecurityStatePageLoadMetricsBrowserTest.*
 -SecurityStatePageLoadMetricsPrerenderBrowserTest.*
 -SecurityStateTabHelperPrerenderTest.*
 -SensorsPolicyTest.*
 -ServiceWorker/CookiesApiTest.*
+-ServiceWorker/DeclarativeNetRequestApiPrerenderingTest.*
 -ServiceWorker/ExtensionContextMenuLazyTest.*
 -ServiceWorker/ExtensionContextMenuSWTest.*
 -ServiceWorker/ExtensionPreferenceApiTest.*
@@ -662,6 +691,7 @@
 -SessionRestoreSilentLaunchTest.*
 -SessionRestoreTest.*
 -SessionServiceLogTest.*
+-SetIconAPIPrerenderingTest.Overview
 -SettingsOverriddenParamsProvidersBrowserTest.*
 -SharedClipboardBrowserTest.*
 -SharedClipboardUIFeatureDisabledBrowserTest.*
@@ -697,6 +727,8 @@
 -StartupBrowserWithWebAppTest.*
 -StartupHelperBrowserTest.*
 -StorageAccessAPIBrowserTest.*
+-StorageAccessAPIStorageBrowserTest.NestedThirdPartyIFrameStorage/*
+-StorageAccessAPIStorageBrowserTest.ThirdPartyIFrameStorageRequestsAccess/*
 -SubframeTaskBrowserTest.*
 -SubresourceFilterPrerenderingBrowserTest.*
 -SyncAwareCounterTest.*
@@ -736,6 +768,7 @@
 -TabUsageScenarioTrackerBrowserTest.FullScreenVideoCrash
 -TaskManagerBrowserTest.*
 -TemplateURLScraperTest.*
+-ThemeServiceBrowserTest.GetColorForToolbarButton
 -ThirdPartyAcceptChUaReducedOriginTrialBrowserTest.*
 -ThirdPartyDataRemoverFallbackTest.*
 -ThirdPartyDataRemoverTest.*
@@ -759,6 +792,8 @@
 -UpdateServiceTest.*
 -UseCounterPageLoadMetricsObserverBrowserTest.*
 -UserPolicySigninServiceSyncNotRequiredTest.*
+-UserProfile/ExtensionWebRequestApiAuthRequiredTest.WebRequestAuthRequired/0
+-UserProfile/ExtensionWebRequestApiAuthRequiredTest.WebRequestAuthRequiredAsync/0
 -UserPolicySigninServiceTest.*
 -UserScriptListenerTest.*
 -VariationsHttpHeadersBrowserTest.*
@@ -779,6 +814,7 @@
 -WebAppLaunchHandlerBrowserTest.*
 -WebAppLaunchHandlerDisabledBrowserTest.*
 -WebAppMoverBadPatternBrowsertest.*
+-WebAppNavigatePrerenderingBrowserTest.*
 -WebAppOfflineDarkModeTest.*
 -WebAppTabStripLinkCapturingBrowserTest.*
 -WebBluetoothTestWithNewPermissionsBackendEnabledInPrerendering.*
@@ -834,6 +870,7 @@
 -WebViewTests/WebViewTest.Shim_TestRendererNavigationRedirectWhileUnattached/SiteIsolationForGuestsEnabled
 -WebViewTests/WebViewTest.TestContextMenu/SiteIsolationForGuestsDisabled
 -WebViewTests/WebViewTest.TestContextMenu/SiteIsolationForGuestsEnabled
+-WebViewWithDefaultSiteInstanceTest.IsolatedOrigin
 -WithAndWithoutReset/SessionRestoreTabGroupsTest.*
 -ZeroSuggestPrefetchTabHelperBrowserTest.*
 -ZoomControllerForPrerenderingTest.*
diff --git a/test/filters/unit_tests.filter b/test/filters/unit_tests.filter
index 781ee1d3b351..f57528c320b3 100644
--- a/test/filters/unit_tests.filter
+++ b/test/filters/unit_tests.filter
@@ -28,9 +28,11 @@
 -All/TabSharingInfoBarDelegateTest.*
 -All/TabStripTest.*
 -All/WebstorePrivateBeginInstallWithManifest3FrictionDialogTest.*
+-ApcScrimManagerImplTest.UpdatesVisibilityOnWebcontentsVisibilityChanged
 -AppInfoDialogViewsTest.*
 -AppLauncherHandlerTest.*
 -AssistantSidePanelCoordinatorImplTest.*
+-AutofillContextMenuTest/RenderViewContestMenuAutofillTest.ShowAutofillOptions/*
 -AvatarToolbarButtonTest.*
 -BackFwdMenuModelIncognitoTest.*
 -BackFwdMenuModelTest.*
@@ -88,6 +90,8 @@
 -ChromePingManagerTest.*
 -ChromeRuntimeAPIDelegateReloadTest.*
 -ChromeRuntimeAPIDelegateTest.*
+-ChromeTailoredSecurityServiceTest.*
+-ChromeUsbDelegateTest.*
 -ChromeWebContentsMenuHelperUnitTest.*
 -ChromeWebContentsViewDelegateViewsTest.*
 -Chromium/ChannelInfoTest.*
@@ -96,6 +100,7 @@
 -ClientSideDetectionHostTest.*
 -CloudBinaryUploadServiceTest.*
 -CloudPrintProxyPolicyTest.*
+-ColorProviderTest.OmniboxContrast/*
 -CommanderEntityMatchTest.*
 -ComponentLoaderTest.*
 -ConfigParserTest.*
@@ -200,6 +205,7 @@
 -InstallVerifierTest.*
 -InstantNTPURLRewriteTest.*
 -InstantServiceTest.*
+-IntentPickerBubbleViewGridLayoutTest.*
 -IntentPickerBubbleViewTest.*
 -InvalidSearchProviderTest.*
 -KeywordEditorControllerNoWebDataTest.*
@@ -247,7 +253,9 @@
 -PermissionMessageCombinationsUnittest.*
 -PermissionMessagesUnittest.*
 -PermissionsAPIUnitTest.*
+-PermissionsManagerUnitTest.FaviconPermissionsAreNotWithheld
 -PermissionsTest.*
+-PermissionsUpdaterTest.*
 -PinnedTabCodecTest.*
 -PinnedTabServiceTest.*
 -PinnedTabsResetTest.*
@@ -280,7 +288,9 @@
 -ProfileManagerTest.*
 -ProfileResetterTest.*
 -ProfileSigninConfirmationHelperTest.*
+-ReadAnythingControllerTest.*
 -ReadAnythingCoordinatorTest.*
+-ReadAnythingModelTest.*
 -RelaunchNotificationControllerPlatformImplTest.*
 -RenameHandlerOpenDownloadTest.*
 -RenderViewContextMenuExtensionsTest.*
@@ -313,12 +323,15 @@
 -SettingsResetPromptModelTest.*
 -SharedModuleServiceUnitTest.*
 -SharingDialogViewTest.*
+-SidePanelCoordinatorLoadingContentTest.*
 -SidePanelCoordinatorTest.*
 -SidePanelToolbarButtonTest.*
 -SigninErrorHandlerTest.*
 -SigninManagerTest.*
 -SigninUiUtilTest.*
 -SitePermissionsHelperUnitTest.*
+-SitePermissionsHelperWithUserHostControlsUnitTest.DowngradingFromAllSitesToOnClickAppliesUserPermittedSites
+-SideSearchTabContentsHelperTest.*
 -SiteSettingsCounterTest.*
 -SiteSettingsHandlerInfobarTest.*
 -SiteSettingsHandlerTest.*
@@ -341,6 +354,7 @@
 -TabLoaderTest.*
 -TabLoadTrackerTest.*
 -TabManagerTest.*
+-TabMatcherDesktopTest.*
 -TabMenuModelTest.*
 -TabMetricsLoggerTest.*
 -TabMetricsTest.*
@@ -366,6 +380,7 @@
 -UkmPageLoadMetricsObserverTest.*
 -UpdateInstallGateTest.*
 -UpdateServiceCanUpdateFeatureEnabledNonDefaultUpdateUrl.*
+-UserNoteServiceDelegateImplTest.*
 -UserNoteUICoordinatorTest.*
 -UserScriptListenerTest.*
 -VideoOverlayWindowViewsTest.*
diff --git a/third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.cc b/third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.cc
index 54e30f114169..352b5c4a1cb9 100644
--- a/third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.cc
+++ b/third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.cc
@@ -85,7 +85,7 @@ ResourcePoolLimiter::IssueResourceInUseTracker(
   String resource_id = GetResourceIdInUse(
       GetTopFrameOrContextSecurityOrigin(context), resource_type);
 
-  MutexLocker locker(resources_in_use_lock_);
+  base::AutoLock locker(resources_in_use_lock_);
   // `insert` doesn't change the value if it already exists.
   int& resource_in_use_count =
       resources_in_use_.insert(resource_id, 0).stored_value->value;
@@ -99,7 +99,7 @@ ResourcePoolLimiter::IssueResourceInUseTracker(
 
 void ResourcePoolLimiter::DropResourceInUse(
     const ResourceInUseTracker* resource_in_use_tracker) {
-  MutexLocker locker(resources_in_use_lock_);
+  base::AutoLock locker(resources_in_use_lock_);
   auto resource_in_use_it =
       resources_in_use_.find(resource_in_use_tracker->resource_id());
   DCHECK(resource_in_use_it != resources_in_use_.end());
diff --git a/third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.h b/third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.h
index ebc994629da8..e1303354e725 100644
--- a/third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.h
+++ b/third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.h
@@ -9,11 +9,11 @@
 #include <memory>
 #include <utility>
 
+#include "base/synchronization/lock.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/platform/wtf/hash_map.h"
 #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
-#include "third_party/blink/renderer/platform/wtf/threading_primitives.h"
 
 namespace blink {
 
@@ -51,8 +51,8 @@ class CORE_EXPORT ResourcePoolLimiter {
 
   void DropResourceInUse(const ResourceInUseTracker* resource_in_use_tracker);
 
-  Mutex resources_in_use_lock_;
-  HashMap<String, int> resources_in_use_;
+  base::Lock resources_in_use_lock_;
+  HashMap<String, int> resources_in_use_ GUARDED_BY(resources_in_use_lock_);
 };
 
 }  // namespace blink
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/account/utility/redeem_unblinded_token/create_confirmation_util.cc b/vendor/bat-native-ads/src/bat/ads/internal/account/utility/redeem_unblinded_token/create_confirmation_util.cc
index b31c2871a2d8..fdfb719d48cb 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/account/utility/redeem_unblinded_token/create_confirmation_util.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/account/utility/redeem_unblinded_token/create_confirmation_util.cc
@@ -46,7 +46,7 @@ std::string CreateConfirmationRequestDTO(const ConfirmationInfo& confirmation) {
     confirmation_request_dto.Set("publicKey", *value);
   }
 
-  const absl::optional<base::Value> user_data =
+  absl::optional<base::Value> user_data =
       base::JSONReader::Read(confirmation.user_data);
   if (user_data && user_data->is_dict()) {
     confirmation_request_dto.Merge(std::move(user_data->GetDict()));
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/resources/behavioral/purchase_intent/purchase_intent_info.cc b/vendor/bat-native-ads/src/bat/ads/internal/resources/behavioral/purchase_intent/purchase_intent_info.cc
index a65091e2f69d..dfc632832c5c 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/resources/behavioral/purchase_intent/purchase_intent_info.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/resources/behavioral/purchase_intent/purchase_intent_info.cc
@@ -24,12 +24,13 @@ std::unique_ptr<PurchaseIntentInfo> PurchaseIntentInfo::CreateFromValue(
   DCHECK(error_message);
   auto purchase_intent = std::make_unique<PurchaseIntentInfo>();
 
-  if (!resource_value.is_dict()) {
+  base::Value::Dict* resource = resource_value.GetIfDict();
+  if (!resource) {
     *error_message = "Failed to load from JSON, json is not a dictionary";
     return {};
   }
 
-  if (absl::optional<int> version = resource_value.FindIntPath("version")) {
+  if (absl::optional<int> version = resource->FindInt("version")) {
     if (targeting::features::GetPurchaseIntentResourceVersion() != *version) {
       *error_message = "Failed to load from JSON, version missing";
       return {};
@@ -39,25 +40,14 @@ std::unique_ptr<PurchaseIntentInfo> PurchaseIntentInfo::CreateFromValue(
   }
 
   // Parsing field: "segments"
-  base::Value* incoming_segments = resource_value.FindListPath("segments");
+  base::Value::List* incoming_segments = resource->FindList("segments");
   if (!incoming_segments) {
     *error_message = "Failed to load from JSON, segments missing";
     return {};
   }
 
-  if (!incoming_segments->is_list()) {
-    *error_message = "Failed to load from JSON, segments is not of type list";
-    return {};
-  }
-
-  base::ListValue* list3;
-  if (!incoming_segments->GetAsList(&list3)) {
-    *error_message = "Failed to load from JSON, get segments as list";
-    return {};
-  }
-
   std::vector<std::string> segments;
-  for (const auto& item : list3->GetList()) {
+  for (const auto& item : *incoming_segments) {
     const std::string& segment = item.GetString();
     if (segment.empty()) {
       *error_message = "Failed to load from JSON, empty segment found";
@@ -67,30 +57,18 @@ std::unique_ptr<PurchaseIntentInfo> PurchaseIntentInfo::CreateFromValue(
   }
 
   // Parsing field: "segment_keywords"
-  base::Value* incoming_segment_keywords =
-      resource_value.FindDictPath("segment_keywords");
+  base::Value::Dict* incoming_segment_keywords =
+      resource->FindDict("segment_keywords");
   if (!incoming_segment_keywords) {
     *error_message = "Failed to load from JSON, segment keywords missing";
     return {};
   }
 
-  if (!incoming_segment_keywords->is_dict()) {
-    *error_message =
-        "Failed to load from JSON, segment keywords not of type dict";
-    return {};
-  }
-
-  base::DictionaryValue* dict2;
-  if (!incoming_segment_keywords->GetAsDictionary(&dict2)) {
-    *error_message = "Failed to load from JSON, get segment keywords as dict";
-    return {};
-  }
-
-  for (base::DictionaryValue::Iterator it(*dict2); !it.IsAtEnd();
-       it.Advance()) {
+  for (const auto item : *incoming_segment_keywords) {
     PurchaseIntentSegmentKeywordInfo info;
-    info.keywords = it.key();
-    for (const auto& segment_ix : it.value().GetList()) {
+    info.keywords = item.first;
+    for (const auto& segment_ix : item.second.GetList()) {
+      DCHECK(segment_ix.is_int());
       if (static_cast<size_t>(segment_ix.GetInt()) >= segments.size()) {
         *error_message =
             "Failed to load from JSON, segment keywords are ill-formed";
@@ -103,81 +81,58 @@ std::unique_ptr<PurchaseIntentInfo> PurchaseIntentInfo::CreateFromValue(
   }
 
   // Parsing field: "funnel_keywords"
-  base::Value* incoming_funnel_keywords =
-      resource_value.FindDictPath("funnel_keywords");
+  base::Value::Dict* incoming_funnel_keywords =
+      resource->FindDict("funnel_keywords");
   if (!incoming_funnel_keywords) {
     *error_message = "Failed to load from JSON, funnel keywords missing";
     return {};
   }
 
-  if (!incoming_funnel_keywords->is_dict()) {
-    *error_message =
-        "Failed to load from JSON, funnel keywords not of type dict";
-    return {};
-  }
-
-  base::DictionaryValue* dict;
-  if (!incoming_funnel_keywords->GetAsDictionary(&dict)) {
-    *error_message = "Failed to load from JSON, get funnel keywords as dict";
-    return {};
-  }
-
-  for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
+  for (const auto item : *incoming_funnel_keywords) {
     PurchaseIntentFunnelKeywordInfo info;
-    info.keywords = it.key();
-    info.weight = it.value().GetInt();
+    info.keywords = item.first;
+    info.weight = item.second.GetInt();
     purchase_intent->funnel_keywords.push_back(info);
   }
 
   // Parsing field: "funnel_sites"
-  base::Value* incoming_funnel_sites =
-      resource_value.FindListPath("funnel_sites");
+  base::Value::List* incoming_funnel_sites = resource->FindList("funnel_sites");
   if (!incoming_funnel_sites) {
     *error_message = "Failed to load from JSON, sites missing";
     return {};
   }
 
-  if (!incoming_funnel_sites->is_list()) {
-    *error_message = "Failed to load from JSON, sites not of type dict";
-    return {};
-  }
-
-  base::ListValue* list1;
-  if (!incoming_funnel_sites->GetAsList(&list1)) {
-    *error_message = "Failed to load from JSON, get sites as dict";
-    return {};
-  }
-
   // For each set of sites and segments
-  for (auto& set : list1->GetList()) {
-    if (!set.is_dict()) {
+  for (auto& item : *incoming_funnel_sites) {
+    if (!item.is_dict()) {
       *error_message = "Failed to load from JSON, site set not of type dict";
       return {};
     }
+    auto& set = item.GetDict();
 
     // Get all segments...
-    base::ListValue* seg_list;
-    base::Value* seg_value = set.FindListPath("segments");
-    if (!seg_value->GetAsList(&seg_list)) {
+    base::Value::List* seg_list = set.FindList("segments");
+    if (!seg_list) {
       *error_message =
           "Failed to load from JSON, get site segment list as dict";
       return {};
     }
 
     std::vector<std::string> site_segments;
-    for (auto& seg : seg_list->GetList()) {
+    for (auto& seg : *seg_list) {
+      DCHECK(seg.is_int());
       site_segments.push_back(segments.at(seg.GetInt()));
     }
 
     // ...and for each site create info with appended segments
-    base::ListValue* site_list;
-    base::Value* site_value = set.FindListPath("sites");
-    if (!site_value->GetAsList(&site_list)) {
+    base::Value::List* site_list = set.FindList("sites");
+    if (!site_list) {
       *error_message = "Failed to load from JSON, get site list as dict";
       return {};
     }
 
-    for (const auto& site : site_list->GetList()) {
+    for (const auto& site : *site_list) {
+      DCHECK(site.is_string());
       PurchaseIntentSiteInfo info;
       info.segments = site_segments;
       info.url_netloc = GURL(site.GetString());
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/gemini/post_balance/post_balance_gemini.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/gemini/post_balance/post_balance_gemini.cc
index fa2fcfda0046..269d807f1998 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/gemini/post_balance/post_balance_gemini.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/gemini/post_balance/post_balance_gemini.cc
@@ -40,19 +40,16 @@ type::Result PostBalance::ParseBody(const std::string& body,
     return type::Result::LEDGER_ERROR;
   }
 
-  base::ListValue* balances = nullptr;
-  if (!value->GetAsList(&balances)) {
-    BLOG(0, "Invalid JSON");
-    return type::Result::LEDGER_ERROR;
-  }
-
-  for (auto&& balance : balances->GetList()) {
-    const auto* currency_code = balance.FindStringKey("currency");
+  auto& balances = value->GetList();
+  for (auto& item : balances) {
+    DCHECK(item.is_dict());
+    auto& balance = item.GetDict();
+    const auto* currency_code = balance.FindString("currency");
     if (!currency_code || *currency_code != "BAT") {
       continue;
     }
 
-    const auto* available_value = balance.FindStringKey("available");
+    const auto* available_value = balance.FindString("available");
     if (!available_value) {
       BLOG(0, "Missing available");
       return type::Result::LEDGER_ERROR;
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/uphold/get_capabilities/get_capabilities.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/uphold/get_capabilities/get_capabilities.cc
index 0db93dece8ce..87cae49341f4 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/uphold/get_capabilities/get_capabilities.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/uphold/get_capabilities/get_capabilities.cc
@@ -73,27 +73,26 @@ GetCapabilities::ProcessResponse(const type::UrlResponse& response) {
 
 GetCapabilities::CapabilityMap GetCapabilities::ParseBody(
     const std::string& body) {
-  std::map<std::string, Capability> capability_map;
-
   const auto value = base::JSONReader::Read(body);
-  const base::ListValue* list_value = nullptr;
-
-  if (value && value->GetAsList(&list_value)) {
-    DCHECK(list_value);
-
-    for (const auto& item : list_value->GetList()) {
-      const auto* key = item.FindStringKey("key");
-      const auto enabled = item.FindBoolKey("enabled");
-      const auto* requirements = item.FindListKey("requirements");
-
-      if (!key || !enabled || !requirements) {
-        capability_map.clear();
-        break;
-      }
+  if (!value || !value->is_list()) {
+    BLOG(0, "Invalid body format!");
+    return {};
+  }
 
-      capability_map.emplace(
-          *key, Capability{*enabled, requirements->GetList().empty()});
+  std::map<std::string, Capability> capability_map;
+  for (const auto& item : value->GetList()) {
+    DCHECK(item.is_dict());
+    const auto& dict = item.GetDict();
+    const auto* key = dict.FindString("key");
+    const auto enabled = dict.FindBool("enabled");
+    const auto* requirements = dict.FindList("requirements");
+
+    if (!key || !enabled || !requirements) {
+      capability_map.clear();
+      break;
     }
+
+    capability_map.emplace(*key, Capability{*enabled, requirements->empty()});
   }
 
   if (capability_map.empty()) {
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/uphold/get_cards/get_cards.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/uphold/get_cards/get_cards.cc
index ddace0a9ced3..404736644801 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/uphold/get_cards/get_cards.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/uphold/get_cards/get_cards.cc
@@ -54,20 +54,17 @@ type::Result GetCards::ParseBody(
     return type::Result::LEDGER_ERROR;
   }
 
-  base::ListValue* list = nullptr;
-  if (!value->GetAsList(&list)) {
-    BLOG(0, "Invalid JSON");
-    return type::Result::LEDGER_ERROR;
-  }
-
-  for (const auto& it : list->GetList()) {
-    const auto* label = it.FindStringKey("label");
+  auto& list = value->GetList();
+  for (const auto& it : list) {
+    DCHECK(it.is_dict());
+    const auto& dict = it.GetDict();
+    const auto* label = dict.FindString("label");
     if (!label) {
       continue;
     }
 
     if (*label == ::ledger::uphold::kCardName) {
-      const auto* id_str = it.FindStringKey("id");
+      const auto* id_str = dict.FindString("id");
       if (!id_str) {
         continue;
       }
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/client_properties.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/client_properties.cc
index ad5d8fc2efe7..fb2f571cde0a 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/client_properties.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/client_properties.cc
@@ -183,15 +183,15 @@ bool ClientProperties::FromJson(const std::string& json) {
       json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
                 base::JSONParserOptions::JSON_PARSE_RFC);
 
-  if (!document.value.has_value()) {
+  if (!document.has_value()) {
     LOG(ERROR) << "Invalid client property. json=" << json
-               << ", error line=" << document.error_line
-               << ", error column=" << document.error_column
-               << ", error message=" << document.error_message;
+               << ", error line=" << document.error().line
+               << ", error column=" << document.error().column
+               << ", error message=" << document.error().message;
     return false;
   }
 
-  const base::Value::Dict* root = document.value->GetIfDict();
+  const base::Value::Dict* root = document->GetIfDict();
   if (!root) {
     LOG(ERROR) << "Invalid client property. json=" << json;
     return false;
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/publisher_settings_properties.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/publisher_settings_properties.cc
index 0385fa79068a..e55f83c5d8ca 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/publisher_settings_properties.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/publisher_settings_properties.cc
@@ -198,15 +198,15 @@ bool PublisherSettingsProperties::FromJson(const std::string& json) {
       json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
                 base::JSONParserOptions::JSON_PARSE_RFC);
 
-  if (!document.value.has_value()) {
+  if (!document.has_value()) {
     LOG(ERROR) << "Invalid client property. json=" << json
-               << ", error line=" << document.error_line
-               << ", error column=" << document.error_column
-               << ", error message=" << document.error_message;
+               << ", error line=" << document.error().line
+               << ", error column=" << document.error().column
+               << ", error message=" << document.error().message;
     return false;
   }
 
-  const base::Value::Dict* root = document.value->GetIfDict();
+  const base::Value::Dict* root = document->GetIfDict();
   if (!root) {
     LOG(ERROR) << "Invalid client property. json=" << json;
     return false;
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/report_balance_properties.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/report_balance_properties.cc
index 0df1c786733d..6f358ed6fb08 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/report_balance_properties.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/report_balance_properties.cc
@@ -144,15 +144,15 @@ bool ReportBalanceProperties::FromJson(const std::string& json) {
       json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
                 base::JSONParserOptions::JSON_PARSE_RFC);
 
-  if (!document.value.has_value()) {
+  if (!document.has_value()) {
     LOG(ERROR) << "Invalid report balance properties. json=" << json
-               << ", error line=" << document.error_line
-               << ", error column=" << document.error_column
-               << ", error message=" << document.error_message;
+               << ", error line=" << document.error().line
+               << ", error column=" << document.error().column
+               << ", error message=" << document.error().message;
     return false;
   }
 
-  const base::Value::Dict* root = document.value->GetIfDict();
+  const base::Value::Dict* root = document->GetIfDict();
   if (!root) {
     LOG(ERROR) << "Invalid report balance properties. json=" << json;
     return false;
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/wallet_info_properties.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/wallet_info_properties.cc
index 464bfa07870e..7bff89eca761 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/wallet_info_properties.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/wallet_info_properties.cc
@@ -104,15 +104,15 @@ bool WalletInfoProperties::FromJson(const std::string& json) {
       json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
                 base::JSONParserOptions::JSON_PARSE_RFC);
 
-  if (!document.value.has_value()) {
+  if (!document.has_value()) {
     LOG(ERROR) << "Invalid wallet info property. json=" << json
-               << ", error line=" << document.error_line
-               << ", error column=" << document.error_column
-               << ", error message=" << document.error_message;
+               << ", error line=" << document.error().line
+               << ", error column=" << document.error().column
+               << ", error message=" << document.error().message;
     return false;
   }
 
-  const base::Value::Dict* root = document.value->GetIfDict();
+  const base::Value::Dict* root = document->GetIfDict();
   if (!root) {
     LOG(ERROR) << "Invalid wallet info property. json=" << json;
     return false;
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/state/state.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/state/state.cc
index 4e0f49f2a9fb..c124995f4fc2 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/state/state.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/state/state.cc
@@ -38,13 +38,9 @@ std::vector<double> StringToVectorDouble(const std::string& items_string) {
     return {};
   }
 
-  base::ListValue* list_value = nullptr;
-  if (!list->GetAsList(&list_value)) {
-    return {};
-  }
-
+  auto& list_value = list->GetList();
   std::vector<double> items;
-  for (auto& item : list_value->GetList()) {
+  for (auto& item : list_value) {
     if (!item.is_double()) {
       continue;
     }
@@ -69,15 +65,14 @@ std::string PayoutStatusToString(
 
 base::flat_map<std::string, std::string> StringToPayoutStatus(
     const std::string& payout_status_string) {
-  base::DictionaryValue* dictionary_value = nullptr;
-  auto dict = base::JSONReader::Read(payout_status_string);
-  if (!dict || !dict->GetAsDictionary(&dictionary_value)) {
+  auto json = base::JSONReader::Read(payout_status_string);
+  if (!json || !json->is_dict()) {
     return {};
   }
-  DCHECK(dictionary_value);
 
+  auto& dict = json->GetDict();
   base::flat_map<std::string, std::string> payout_status;
-  for (const auto [key, value] : dictionary_value->GetDict()) {
+  for (const auto [key, value] : dict) {
     if (!value.is_string()) {
       continue;
     }