diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index fb39b515cd42..73a9d5fdbf23 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -129,11 +129,13 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/download/settings/BraveDownloadSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java",
   "../../brave/android/java/org/chromium/chrome/browser/feedback/BraveHelpAndFeedbackLauncherImpl.java",
+  "../../brave/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java",
   "../../brave/android/java/org/chromium/chrome/browser/firstrun/BraveFreIntentCreator.java",
   "../../brave/android/java/org/chromium/chrome/browser/firstrun/P3aOnboardingActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedbackLauncher.java",
   "../../brave/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java",
+  "../../brave/android/java/org/chromium/chrome/browser/infobar/BraveInfoBarIdentifier.java",
   "../../brave/android/java/org/chromium/chrome/browser/informers/BraveAndroidSyncDisabledInformer.java",
   "../../brave/android/java/org/chromium/chrome/browser/language/settings/BraveLanguageSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/local_database/BraveStatsTable.java",
diff --git a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java
index 9e3db24df395..46e892d994af 100644
--- a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java
+++ b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java
@@ -13,16 +13,17 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
-import org.chromium.chrome.browser.feed.shared.FeedSurfaceDelegate;
+import org.chromium.chrome.browser.feed.hooks.FeedHooks;
+import org.chromium.chrome.browser.feed.sections.SectionHeaderView;
+import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher;
 import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate;
 import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
-import org.chromium.chrome.browser.ntp.SnapScrollHelper;
-import org.chromium.chrome.browser.ntp.snippets.SectionHeaderView;
 import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.share.ShareDelegate;
@@ -42,10 +43,9 @@ public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator {
 
     public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarManager,
             WindowAndroid windowAndroid, @Nullable SnapScrollHelper snapScrollHelper,
-            @Nullable View ntpHeader, @Nullable SectionHeaderView sectionHeaderView,
-            boolean showDarkBackground, FeedSurfaceDelegate delegate,
-            @Nullable NativePageNavigationDelegate pageNavigationDelegate, Profile profile,
-            boolean isPlaceholderShownInitially, BottomSheetController bottomSheetController,
+            @Nullable View ntpHeader, @Px int toolbarHeight, boolean showDarkBackground,
+            FeedSurfaceDelegate delegate, Profile profile, boolean isPlaceholderShownInitially,
+            BottomSheetController bottomSheetController,
             Supplier<ShareDelegate> shareDelegateSupplier,
             @Nullable ScrollableContainerDelegate externalScrollableContainerDelegate,
             @NewTabPageLaunchOrigin int launchOrigin,
@@ -53,13 +53,14 @@ public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarMa
             @NonNull Supplier<Toolbar> toolbarSupplier,
             FeedLaunchReliabilityLoggingState launchReliabilityLoggingState,
             @Nullable FeedSwipeRefreshLayout swipeRefreshLayout, boolean overScrollDisabled,
-            @Nullable ViewGroup viewportView, @NonNull BookmarkBridge bookmarkBridge) {
-        super(activity, snackbarManager, windowAndroid, snapScrollHelper, ntpHeader,
-                sectionHeaderView, showDarkBackground, delegate, pageNavigationDelegate, profile,
-                isPlaceholderShownInitially, bottomSheetController, shareDelegateSupplier,
-                externalScrollableContainerDelegate, launchOrigin, privacyPreferencesManager,
-                toolbarSupplier, launchReliabilityLoggingState, swipeRefreshLayout,
-                overScrollDisabled, viewportView, bookmarkBridge);
+            @Nullable ViewGroup viewportView, FeedActionDelegate actionDelegate,
+            HelpAndFeedbackLauncher helpAndFeedbackLauncher, FeedHooks feedHooks) {
+        super(activity, snackbarManager, windowAndroid, snapScrollHelper, ntpHeader, toolbarHeight,
+                showDarkBackground, delegate, profile, isPlaceholderShownInitially,
+                bottomSheetController, shareDelegateSupplier, externalScrollableContainerDelegate,
+                launchOrigin, privacyPreferencesManager, toolbarSupplier,
+                launchReliabilityLoggingState, swipeRefreshLayout, overScrollDisabled, viewportView,
+                actionDelegate, helpAndFeedbackLauncher, feedHooks);
     }
 
     @Override
diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
index 229b1645524a..916705eca14e 100644
--- a/android/java/apk_for_test.flags
+++ b/android/java/apk_for_test.flags
@@ -50,8 +50,10 @@
 
 -keep class org.chromium.chrome.browser.ntp.NewTabPage {
     public <init>(...);
+    *** mBrowserControlsStateProvider;
     *** mNewTabPageLayout;
     *** mFeedSurfaceProvider;
+    *** mToolbarSupplier;
 }
 
 -keep class org.chromium.chrome.browser.ntp.BraveNewTabPage {
@@ -136,7 +138,6 @@
     *** mOverviewModeBehaviorSupplier;
     *** mSnackbarManager;
     *** onOrientationChange(...);
-    *** updateButtonStatus(...);
     *** updateBookmarkButtonStatus(...);
     *** updateReloadState(...);
 }
diff --git a/android/java/org/chromium/chrome/browser/BraveSyncInformers.java b/android/java/org/chromium/chrome/browser/BraveSyncInformers.java
index 692dd549db34..67e1eac4c93a 100644
--- a/android/java/org/chromium/chrome/browser/BraveSyncInformers.java
+++ b/android/java/org/chromium/chrome/browser/BraveSyncInformers.java
@@ -15,7 +15,7 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveSyncWorker;
 import org.chromium.chrome.browser.app.BraveActivity;
-import org.chromium.chrome.browser.infobar.InfoBarIdentifier;
+import org.chromium.chrome.browser.infobar.BraveInfoBarIdentifier;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.settings.BraveSyncScreensPreference;
 import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
@@ -81,15 +81,11 @@ public boolean onInfoBarLinkClicked() {
                         return false;
                     }
                 },
-                // must be SYNC_V2_MIGRATE_INFOBAR_DELEGATE, but now it is introduced through
-                // src/brave/chromium_src/components/infobars/core/infobar_delegate.h and
-                // java enums are generated by //components/infobars/core:infobar_generated_enums
-                // who does not understand `brave/chromium_src`
-                InfoBarIdentifier.INLINE_UPDATE_READY_INFOBAR_ANDROID,
-                activity,
+                BraveInfoBarIdentifier.SYNC_V2_MIGRATE_INFOBAR_DELEGATE, activity,
                 R.drawable.sync_icon /* drawableId */,
                 activity.getString(R.string.brave_sync_v2_migrate_infobar_message) /* message */,
-                activity.getString(R.string.brave_sync_v2_migrate_infobar_command) /* primaryText */,
+                activity.getString(
+                        R.string.brave_sync_v2_migrate_infobar_command) /* primaryText */,
                 null /* secondaryText */, null /* linkText */, false /* autoExpire */);
         BraveSyncWorker.get().setSyncV2MigrateNoticeDismissed(true);
     }
diff --git a/android/java/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java b/android/java/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java
index e4c9db1a66d0..4f14846f032a 100644
--- a/android/java/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java
+++ b/android/java/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java
@@ -116,7 +116,8 @@ private void updateBookmarkMenuItem(BookmarkBridge bookmarkBridge, Tab currentTa
             mBookmarkButton.setImageResource(R.drawable.btn_star_filled);
             mBookmarkButton.setContentDescription(getContext().getString(R.string.edit_bookmark));
             ApiCompatibilityUtils.setImageTintList(mBookmarkButton,
-                    AppCompatResources.getColorStateList(getContext(), R.color.blue_mode_tint));
+                    AppCompatResources.getColorStateList(
+                            getContext(), R.color.default_icon_color_accent1_tint_list));
         } else {
             mBookmarkButton.setImageResource(R.drawable.btn_star);
             mBookmarkButton.setContentDescription(
diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
index 14b5888ec66c..6de4955bf150 100644
--- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
+++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
@@ -47,7 +47,8 @@
 
 public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertiesDelegate {
     private Menu mMenu;
-    AppMenuDelegate mAppMenuDelegate;
+    private AppMenuDelegate mAppMenuDelegate;
+    private ObservableSupplier<BookmarkBridge> mBookmarkBridgeSupplier;
 
     public BraveTabbedAppMenuPropertiesDelegate(Context context,
             ActivityTabProvider activityTabProvider,
@@ -65,6 +66,7 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context,
                 snackbarManager);
 
         mAppMenuDelegate = appMenuDelegate;
+        mBookmarkBridgeSupplier = bookmarkBridgeSupplier;
     }
 
     @Override
@@ -158,11 +160,11 @@ public void prepareMenu(Menu menu, AppMenuHandler handler) {
             shareItem.setIcon(AppCompatResources.getDrawable(mContext, R.drawable.share_icon));
         }
 
-        // By this we forcibly initialize mBookmarkBridge
+        // By this we forcibly initialize BookmarkBridge
         MenuItem bookmarkItem = menu.findItem(R.id.bookmark_this_page_id);
         Tab currentTab = mActivityTabProvider.get();
         if (bookmarkItem != null && currentTab != null) {
-            updateBookmarkMenuItem(bookmarkItem, currentTab);
+            updateBookmarkMenuItemShortcut(bookmarkItem, currentTab);
         }
     }
 
@@ -181,7 +183,7 @@ public void onMenuDismissed() {
     @Override
     public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
         // If it's still null, just hide the whole view
-        if (mBookmarkBridge == null) {
+        if (mBookmarkBridgeSupplier.get() == null) {
             if (view != null) {
                 view.setVisibility(View.GONE);
             }
@@ -193,8 +195,8 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
 
         if (view instanceof AppMenuIconRowFooter) {
             ((AppMenuIconRowFooter) view)
-                    .initialize(appMenuHandler, mBookmarkBridge, mActivityTabProvider.get(),
-                            mAppMenuDelegate);
+                    .initialize(appMenuHandler, mBookmarkBridgeSupplier.get(),
+                            mActivityTabProvider.get(), mAppMenuDelegate);
         }
 
         // Hide bookmark button if bottom toolbar is enabled
diff --git a/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java b/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java
new file mode 100644
index 000000000000..54e82ac86e8a
--- /dev/null
+++ b/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java
@@ -0,0 +1,19 @@
+/* Copyright (c) 2021 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/. */
+
+package org.chromium.chrome.browser.firstrun;
+
+import android.app.Activity;
+
+public abstract class BraveFirstRunFlowSequencer extends FirstRunFlowSequencer {
+    public BraveFirstRunFlowSequencer(Activity activity) {
+        super(activity);
+    }
+
+    @Override
+    public void start() {
+        super.start();
+    }
+}
diff --git a/android/java/org/chromium/chrome/browser/infobar/BraveInfoBarIdentifier.java b/android/java/org/chromium/chrome/browser/infobar/BraveInfoBarIdentifier.java
new file mode 100644
index 000000000000..6efd4dadf819
--- /dev/null
+++ b/android/java/org/chromium/chrome/browser/infobar/BraveInfoBarIdentifier.java
@@ -0,0 +1,27 @@
+/* Copyright (c) 2021 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/. */
+
+package org.chromium.chrome.browser.infobar;
+
+import androidx.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+// Reflects enum items from chromium_src/components/infobars/core/infobar_delegate.h
+
+@IntDef({BraveInfoBarIdentifier.INVALID, BraveInfoBarIdentifier.BRAVE_CONFIRM_P3A_INFOBAR_DELEGATE,
+        BraveInfoBarIdentifier.WAYBACK_MACHINE_INFOBAR_DELEGATE,
+        BraveInfoBarIdentifier.SYNC_V2_MIGRATE_INFOBAR_DELEGATE,
+        BraveInfoBarIdentifier.ANDROID_SYSTEM_SYNC_DISABLED_INFOBAR})
+
+@Retention(RetentionPolicy.SOURCE)
+public @interface BraveInfoBarIdentifier {
+    int INVALID = -1;
+    int BRAVE_CONFIRM_P3A_INFOBAR_DELEGATE = 500;
+    int WAYBACK_MACHINE_INFOBAR_DELEGATE = 502;
+    int SYNC_V2_MIGRATE_INFOBAR_DELEGATE = 503;
+    int ANDROID_SYSTEM_SYNC_DISABLED_INFOBAR = 504;
+}
diff --git a/android/java/org/chromium/chrome/browser/informers/BraveAndroidSyncDisabledInformer.java b/android/java/org/chromium/chrome/browser/informers/BraveAndroidSyncDisabledInformer.java
index a6d08ffc59d9..039629bd1645 100644
--- a/android/java/org/chromium/chrome/browser/informers/BraveAndroidSyncDisabledInformer.java
+++ b/android/java/org/chromium/chrome/browser/informers/BraveAndroidSyncDisabledInformer.java
@@ -15,7 +15,7 @@
 import org.chromium.base.Log;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.app.BraveActivity;
-import org.chromium.chrome.browser.infobar.InfoBarIdentifier;
+import org.chromium.chrome.browser.infobar.BraveInfoBarIdentifier;
 import org.chromium.chrome.browser.sync.SyncService;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.ui.messages.infobar.BraveSimpleConfirmInfoBarBuilder;
@@ -92,11 +92,7 @@ public boolean onInfoBarLinkClicked() {
                         return false;
                     }
                 },
-                // must be enum from
-                // src/brave/chromium_src/components/infobars/core/infobar_delegate.h and java enums
-                // are generated by //components/infobars/core:infobar_generated_enums who does not
-                // understand `brave/chromium_src`
-                InfoBarIdentifier.INLINE_UPDATE_READY_INFOBAR_ANDROID, activity,
+                BraveInfoBarIdentifier.ANDROID_SYSTEM_SYNC_DISABLED_INFOBAR, activity,
                 R.drawable.ic_warning_circle,
                 activity.getString(R.string.brave_sync_android_sync_disabled),
                 activity.getString(R.string.brave_open_system_sync_settings),
diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java
index f87b39885eec..dfa985e3754c 100644
--- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java
+++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java
@@ -17,9 +17,12 @@
 import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator;
+import org.chromium.chrome.browser.feed.FeedFeatures;
+import org.chromium.chrome.browser.feed.FeedLaunchReliabilityLoggingState;
+import org.chromium.chrome.browser.feed.FeedSurfaceProvider;
 import org.chromium.chrome.browser.feed.FeedSwipeRefreshLayout;
-import org.chromium.chrome.browser.feed.shared.FeedFeatures;
-import org.chromium.chrome.browser.feed.shared.FeedSurfaceProvider;
+import org.chromium.chrome.browser.feed.hooks.FeedHooksImpl;
+import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -29,13 +32,16 @@
 import org.chromium.chrome.browser.toolbar.top.Toolbar;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.native_page.NativePageHost;
+import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.SurfaceType;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.ui.base.WindowAndroid;
 
 public class BraveNewTabPage extends NewTabPage {
-    private Supplier<Toolbar> mToolbarSupplier;
+    // To delete in bytecode, members from parent class will be used instead.
+    private BrowserControlsStateProvider mBrowserControlsStateProvider;
     private NewTabPageLayout mNewTabPageLayout;
     private FeedSurfaceProvider mFeedSurfaceProvider;
+    private Supplier<Toolbar> mToolbarSupplier;
 
     public BraveNewTabPage(Activity activity,
             BrowserControlsStateProvider browserControlsStateProvider,
@@ -55,8 +61,6 @@ public BraveNewTabPage(Activity activity,
         if (mNewTabPageLayout instanceof BraveNewTabPageLayout) {
             ((BraveNewTabPageLayout) mNewTabPageLayout).setTab(tab);
         }
-
-        mToolbarSupplier = toolbarSupplier;
     }
 
     @Override
@@ -71,16 +75,17 @@ protected void initializeMainView(Activity activity, WindowAndroid windowAndroid
 
         assert !FeedFeatures.isFeedEnabled();
         mFeedSurfaceProvider = new BraveFeedSurfaceCoordinator(activity, snackbarManager,
-                windowAndroid, new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout),
-                mNewTabPageLayout, null, isInNightMode, this,
-                mNewTabPageManager.getNavigationDelegate(), profile,
+                windowAndroid, new SnapScrollHelperImpl(mNewTabPageManager, mNewTabPageLayout),
+                mNewTabPageLayout, mBrowserControlsStateProvider.getTopControlsHeight(),
+                isInNightMode, this, profile,
                 /* isPlaceholderShownInitially= */ false, bottomSheetController,
                 shareDelegateSupplier, /* externalScrollableContainerDelegate= */ null,
                 NewTabPageUtils.decodeOriginFromNtpUrl(url),
                 PrivacyPreferencesManagerImpl.getInstance(), mToolbarSupplier,
-                /* FeedLaunchReliabilityLoggingState */ null,
+                new FeedLaunchReliabilityLoggingState(SurfaceType.NEW_TAB_PAGE, mConstructedTimeNs),
                 FeedSwipeRefreshLayout.create(activity, R.id.toolbar_container),
-                /* overScrollDisabled= */ false,
-                /* viewportView= */ null, new BookmarkBridge(profile));
+                /* overScrollDisabled= */ false, /* viewportView= */ null,
+                /* actionDelegate= */ null, HelpAndFeedbackLauncherImpl.getInstance(),
+                FeedHooksImpl.getInstance());
     }
 }
diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
index f1237ffd8bfb..2628af71bb72 100644
--- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
+++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
@@ -89,6 +89,7 @@
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.custom_layout.VerticalViewPager;
 import org.chromium.chrome.browser.explore_sites.ExploreSitesBridge;
+import org.chromium.chrome.browser.feed.FeedSurfaceScrollDelegate;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.local_database.DatabaseHelper;
@@ -1215,7 +1216,7 @@ private void processFeed() {
     @Override
     public void initialize(NewTabPageManager manager, Activity activity,
             TileGroup.Delegate tileGroupDelegate, boolean searchProviderHasLogo,
-            boolean searchProviderIsGoogle, ScrollDelegate scrollDelegate,
+            boolean searchProviderIsGoogle, FeedSurfaceScrollDelegate scrollDelegate,
             ContextMenuManager contextMenuManager, UiConfig uiConfig, Supplier<Tab> tabProvider,
             ActivityLifecycleDispatcher lifecycleDispatcher, NewTabPageUma uma, boolean isIncognito,
             WindowAndroid windowAndroid) {
diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
index ee3f70a741ad..42d1558cb9b3 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
@@ -145,7 +145,7 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont
             ObservableSupplier<Boolean> omniboxFocusStateSupplier,
             OneshotSupplier<ToolbarIntentMetadata> intentMetadataOneshotSupplier,
             OneshotSupplier<Boolean> promoShownOneshotSupplier, WindowAndroid windowAndroid,
-            Supplier<Boolean> isInOverviewModeSupplier,
+            Supplier<Boolean> isInOverviewModeSupplier, boolean shouldShowOverviewPageOnStart,
             Supplier<ModalDialogManager> modalDialogManagerSupplier,
             StatusBarColorController statusBarColorController, AppMenuDelegate appMenuDelegate,
             ActivityLifecycleDispatcher activityLifecycleDispatcher,
@@ -168,12 +168,12 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont
                 layoutStateProviderSupplier, appMenuCoordinatorSupplier, shouldShowUpdateBadge,
                 tabModelSelectorSupplier, startSurfaceSupplier, omniboxFocusStateSupplier,
                 intentMetadataOneshotSupplier, promoShownOneshotSupplier, windowAndroid,
-                isInOverviewModeSupplier, modalDialogManagerSupplier, statusBarColorController,
-                appMenuDelegate, activityLifecycleDispatcher, startSurfaceParentTabSupplier,
-                bottomSheetController, isWarmOnResumeSupplier, tabContentManager, tabCreatorManager,
-                overviewModeBehaviorSupplier, snackbarManager, jankTracker,
-                merchantTrustSignalsCoordinatorSupplier, tabReparentingControllerSupplier,
-                initializeWithIncognitoColors);
+                isInOverviewModeSupplier, shouldShowOverviewPageOnStart, modalDialogManagerSupplier,
+                statusBarColorController, appMenuDelegate, activityLifecycleDispatcher,
+                startSurfaceParentTabSupplier, bottomSheetController, isWarmOnResumeSupplier,
+                tabContentManager, tabCreatorManager, overviewModeBehaviorSupplier, snackbarManager,
+                jankTracker, merchantTrustSignalsCoordinatorSupplier,
+                tabReparentingControllerSupplier, initializeWithIncognitoColors);
         mOmniboxFocusStateSupplier = omniboxFocusStateSupplier;
         mLayoutStateProviderSupplier = layoutStateProviderSupplier;
         mActivity = activity;
@@ -297,21 +297,6 @@ protected void onOrientationChange(int newOrientation) {
         }
     }
 
-    protected void updateButtonStatus() {
-        Tab currentTab = mLocationBarModel.getTab();
-        boolean tabCrashed = currentTab != null && SadTab.isShowing(currentTab);
-
-        mToolbar.updateButtonVisibility();
-        mToolbar.updateBackButtonVisibility(currentTab != null && currentTab.canGoBack());
-        mToolbar.updateForwardButtonVisibility(currentTab != null && currentTab.canGoForward());
-        updateReloadState(tabCrashed);
-        updateBookmarkButtonStatus();
-
-        if (mToolbar.getMenuButtonWrapper() != null && !isBottomToolbarVisible()) {
-            mToolbar.getMenuButtonWrapper().setVisibility(View.VISIBLE);
-        }
-    }
-
     protected void updateBookmarkButtonStatus() {
         Tab currentTab = mLocationBarModel.getTab();
         BookmarkBridge bridge = mBookmarkBridgeSupplier.get();
@@ -345,10 +330,6 @@ private void setBottomToolbarVisible(boolean visible) {
         }
     }
 
-    public boolean isBottomToolbarVisible() {
-        return mIsBottomToolbarVisible;
-    }
-
     private void updateBottomToolbarVisibility() {
         boolean isBottomToolbarVisible = BottomToolbarConfiguration.isBottomToolbarEnabled()
                 && mActivity.getResources().getConfiguration().orientation
diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java
index 01d2d9cd281a..b652a324ab85 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java
@@ -62,7 +62,9 @@ public void onTintChanged(ColorStateList tint, boolean useLight) {
     public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) {
         if (isBookmarked) {
             setImageResource(R.drawable.btn_bookmark_fill);
-            ApiCompatibilityUtils.setImageTintList(this, AppCompatResources.getColorStateList(getContext(), R.color.blue_mode_tint));
+            ApiCompatibilityUtils.setImageTintList(this,
+                    AppCompatResources.getColorStateList(
+                            getContext(), R.color.default_icon_color_accent1_tint_list));
             setContentDescription(getContext().getString(R.string.edit_bookmark));
         } else {
             setImageResource(R.drawable.btn_bookmark);
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 235efb5604d5..dc093c84049d 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java
@@ -21,6 +21,7 @@
 import org.chromium.chrome.browser.toolbar.ButtonDataProvider;
 import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
 import org.chromium.chrome.browser.toolbar.ToolbarTabController;
+import org.chromium.chrome.browser.toolbar.menu_button.MenuButton;
 import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator;
 import org.chromium.chrome.browser.toolbar.top.NavigationPopup.HistoryDelegate;
 import org.chromium.chrome.browser.toolbar.top.ToolbarTablet.OfflineDownloader;
@@ -36,6 +37,8 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
     private TabSwitcherModeTTCoordinatorPhone mTabSwitcherModeCoordinatorPhone;
     private OptionalBrowsingModeButtonController mOptionalButtonController;
     private ToolbarLayout mBraveToolbarLayout;
+    private MenuButtonCoordinator mBraveMenuButtonCoordinator;
+    private boolean mIsBottomToolbarVisible;
 
     public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
             ToolbarLayout toolbarLayout, ToolbarDataProvider toolbarDataProvider,
@@ -59,7 +62,7 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
             boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled,
             boolean isTabGroupsAndroidContinuationEnabled, HistoryDelegate historyDelegate,
             BooleanSupplier partnerHomepageEnabledSupplier, OfflineDownloader offlineDownloader,
-            boolean initializeWithIncognitoColors) {
+            boolean initializeWithIncognitoColors, boolean shouldHideToolbarLayoutOnStart) {
         super(controlContainer, toolbarLayout, toolbarDataProvider, tabController,
                 userEducationHelper, buttonDataProviders, layoutStateProviderSupplier,
                 normalThemeColorProvider, overviewThemeColorProvider,
@@ -71,9 +74,11 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
                 isIncognitoModeEnabledSupplier, isGridTabSwitcherEnabled,
                 isTabToGtsAnimationEnabled, isStartSurfaceEnabled,
                 isTabGroupsAndroidContinuationEnabled, historyDelegate,
-                partnerHomepageEnabledSupplier, offlineDownloader, initializeWithIncognitoColors);
+                partnerHomepageEnabledSupplier, offlineDownloader, initializeWithIncognitoColors,
+                shouldHideToolbarLayoutOnStart);
 
         mBraveToolbarLayout = toolbarLayout;
+        mBraveMenuButtonCoordinator = browsingModeMenuButtonCoordinator;
 
         if (isToolbarPhone()) {
             if (!isStartSurfaceEnabled) {
@@ -87,6 +92,7 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
     }
 
     public void onBottomToolbarVisibilityChanged(boolean isVisible) {
+        mIsBottomToolbarVisible = isVisible;
         if (mBraveToolbarLayout instanceof BraveToolbarLayout) {
             ((BraveToolbarLayoutImpl) mBraveToolbarLayout)
                     .onBottomToolbarVisibilityChanged(isVisible);
@@ -101,4 +107,10 @@ public void onBottomToolbarVisibilityChanged(boolean isVisible) {
     public boolean isToolbarPhone() {
         return mBraveToolbarLayout instanceof ToolbarPhone;
     }
+
+    @Override
+    public MenuButton getMenuButtonWrapper() {
+        // We consider that there is no top toolbar menu button, if bottom toolbar is visible.
+        return mIsBottomToolbarVisible ? null : mBraveMenuButtonCoordinator.getMenuButton();
+    }
 }
diff --git a/android/java/org/chromium/chrome/browser/vpn/BraveVpnPlansActivity.java b/android/java/org/chromium/chrome/browser/vpn/BraveVpnPlansActivity.java
index 7dc5a55f1260..d6a28ef87c91 100644
--- a/android/java/org/chromium/chrome/browser/vpn/BraveVpnPlansActivity.java
+++ b/android/java/org/chromium/chrome/browser/vpn/BraveVpnPlansActivity.java
@@ -25,14 +25,14 @@
 
 import org.chromium.base.Log;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
+import org.chromium.chrome.browser.firstrun.BraveFirstRunFlowSequencer;
 import org.chromium.chrome.browser.vpn.BraveVpnParentActivity;
 import org.chromium.chrome.browser.vpn.BraveVpnPlanPagerAdapter;
 import org.chromium.chrome.browser.vpn.BraveVpnUtils;
 import org.chromium.chrome.browser.vpn.InAppPurchaseWrapper;
 
 public class BraveVpnPlansActivity extends BraveVpnParentActivity {
-    private FirstRunFlowSequencer mFirstRunFlowSequencer;
+    private BraveFirstRunFlowSequencer mFirstRunFlowSequencer;
     private ProgressBar mPlanProgress;
     private LinearLayout mPlanLayout;
     private boolean mShouldShowRestoreMenu;
@@ -152,7 +152,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     protected void triggerLayoutInflation() {
-        mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) {
+        mFirstRunFlowSequencer = new BraveFirstRunFlowSequencer(this) {
             @Override
             public void onFlowIsKnown(Bundle freProperties) {
                 initializeViews();
diff --git a/android/java/org/chromium/chrome/browser/vpn/BraveVpnProfileActivity.java b/android/java/org/chromium/chrome/browser/vpn/BraveVpnProfileActivity.java
index 0440d1e62cea..a72aecf1e32b 100644
--- a/android/java/org/chromium/chrome/browser/vpn/BraveVpnProfileActivity.java
+++ b/android/java/org/chromium/chrome/browser/vpn/BraveVpnProfileActivity.java
@@ -21,13 +21,13 @@
 
 import org.chromium.base.Log;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
+import org.chromium.chrome.browser.firstrun.BraveFirstRunFlowSequencer;
 import org.chromium.chrome.browser.vpn.BraveVpnNativeWorker;
 import org.chromium.chrome.browser.vpn.BraveVpnProfileUtils;
 import org.chromium.chrome.browser.vpn.BraveVpnUtils;
 
 public class BraveVpnProfileActivity extends BraveVpnParentActivity {
-    private FirstRunFlowSequencer mFirstRunFlowSequencer;
+    private BraveFirstRunFlowSequencer mFirstRunFlowSequencer;
     private TextView mProfileTitle;
     private TextView mProfileText;
     private Button mInstallVpnButton;
@@ -91,7 +91,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     protected void triggerLayoutInflation() {
-        mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) {
+        mFirstRunFlowSequencer = new BraveFirstRunFlowSequencer(this) {
             @Override
             public void onFlowIsKnown(Bundle freProperties) {
                 initializeViews();
diff --git a/android/java/org/chromium/chrome/browser/vpn/BraveVpnSupportActivity.java b/android/java/org/chromium/chrome/browser/vpn/BraveVpnSupportActivity.java
index 169b4afe40e8..279c86fc4c83 100644
--- a/android/java/org/chromium/chrome/browser/vpn/BraveVpnSupportActivity.java
+++ b/android/java/org/chromium/chrome/browser/vpn/BraveVpnSupportActivity.java
@@ -28,14 +28,14 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.about_settings.AboutChromeSettings;
 import org.chromium.chrome.browser.about_settings.AboutSettingsBridge;
-import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
+import org.chromium.chrome.browser.firstrun.BraveFirstRunFlowSequencer;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
 import org.chromium.chrome.browser.vpn.BraveVpnPrefUtils;
 
 import java.util.TimeZone;
 
 public class BraveVpnSupportActivity extends AsyncInitializationActivity {
-    private FirstRunFlowSequencer mFirstRunFlowSequencer;
+    private BraveFirstRunFlowSequencer mFirstRunFlowSequencer;
 
     private void initializeViews() {
         setContentView(R.layout.activity_brave_vpn_support);
@@ -135,7 +135,7 @@ public void onClick(View v) {
 
     @Override
     protected void triggerLayoutInflation() {
-        mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) {
+        mFirstRunFlowSequencer = new BraveFirstRunFlowSequencer(this) {
             @Override
             public void onFlowIsKnown(Bundle freProperties) {
                 initializeViews();
diff --git a/android/java/res/layout/brave_rewards_panel.xml b/android/java/res/layout/brave_rewards_panel.xml
index eab7e881a121..b6394face967 100644
--- a/android/java/res/layout/brave_rewards_panel.xml
+++ b/android/java/res/layout/brave_rewards_panel.xml
@@ -207,7 +207,7 @@
                             android:orientation="vertical"
                             android:visibility="gone"/>
 
-                        <Button
+                        <android.widget.Button
                             android:id="@+id/send_a_tip"
                             android:layout_height="50dp"
                             android:layout_width="fill_parent"
@@ -227,7 +227,7 @@
 
                     </GridLayout>
 
-                    <Button
+                    <android.widget.Button
                         android:id="@+id/rewards_summary"
                         android:layout_height="50dp"
                         android:layout_width="fill_parent"
diff --git a/android/java/res/layout/brave_rewards_panel_header.xml b/android/java/res/layout/brave_rewards_panel_header.xml
index 0f37060bcc5c..2b3aec29b62e 100644
--- a/android/java/res/layout/brave_rewards_panel_header.xml
+++ b/android/java/res/layout/brave_rewards_panel_header.xml
@@ -40,7 +40,7 @@
                 android:layout_columnSpan="2"
                 android:visibility="visible"/>
 
-            <Button
+            <android.widget.Button
                     android:id="@+id/btn_verify_wallet"
                     android:layout_height="25dp"
                     android:layout_width="wrap_content"
@@ -165,7 +165,7 @@
                     android:gravity="center"
                     android:layout_gravity="center">
 
-                    <Button
+                    <android.widget.Button
                         android:id="@+id/br_add_funds"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
@@ -184,7 +184,7 @@
                         android:visibility="gone"
                         tools:ignore="ButtonStyle"/>
 
-                    <Button
+                    <android.widget.Button
                         android:id="@+id/br_rewards_settings"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index 5fd1fd22cf34..b872ac8cbdd2 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -261,8 +261,6 @@ public void testMethodsExist() throws Exception {
                 "runMenuItemEnterAnimations", false, null));
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/toolbar/ToolbarManager",
                 "onOrientationChange", false, null));
-        Assert.assertTrue(methodExists("org/chromium/chrome/browser/toolbar/ToolbarManager",
-                "updateButtonStatus", false, null));
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/toolbar/ToolbarManager",
                 "updateBookmarkButtonStatus", false, null));
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/toolbar/ToolbarManager",
@@ -434,8 +432,8 @@ public void testConstructorsExistAndMatch() throws Exception {
                 ObservableSupplier.class, Supplier.class, OneshotSupplier.class,
                 OneshotSupplier.class, boolean.class, ObservableSupplier.class,
                 OneshotSupplier.class, ObservableSupplier.class, OneshotSupplier.class,
-                OneshotSupplier.class, WindowAndroid.class, Supplier.class, Supplier.class,
-                StatusBarColorController.class, AppMenuDelegate.class,
+                OneshotSupplier.class, WindowAndroid.class, Supplier.class, boolean.class,
+                Supplier.class, StatusBarColorController.class, AppMenuDelegate.class,
                 ActivityLifecycleDispatcher.class, Supplier.class, BottomSheetController.class,
                 Supplier.class, TabContentManager.class, TabCreatorManager.class,
                 OneshotSupplier.class, SnackbarManager.class, JankTracker.class, Supplier.class,
@@ -501,7 +499,7 @@ public void testConstructorsExistAndMatch() throws Exception {
                 ObservableSupplier.class, ObservableSupplier.class, Callback.class, Supplier.class,
                 Supplier.class, ObservableSupplier.class, BooleanSupplier.class, boolean.class,
                 boolean.class, boolean.class, boolean.class, HistoryDelegate.class,
-                BooleanSupplier.class, OfflineDownloader.class, boolean.class));
+                BooleanSupplier.class, OfflineDownloader.class, boolean.class, boolean.class));
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator",
                 "org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator",
@@ -538,10 +536,14 @@ public void testFieldsExist() throws Exception {
                 "org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mNtpHeader"));
         Assert.assertTrue(fieldExists(
                 "org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mRootView"));
+        Assert.assertTrue(fieldExists(
+                "org/chromium/chrome/browser/ntp/NewTabPage", "mBrowserControlsStateProvider"));
         Assert.assertTrue(
                 fieldExists("org/chromium/chrome/browser/ntp/NewTabPage", "mNewTabPageLayout"));
         Assert.assertTrue(
                 fieldExists("org/chromium/chrome/browser/ntp/NewTabPage", "mFeedSurfaceProvider"));
+        Assert.assertTrue(
+                fieldExists("org/chromium/chrome/browser/ntp/NewTabPage", "mToolbarSupplier"));
         Assert.assertTrue(fieldExists(
                 "org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor",
                 "mHasClearedOmniboxForFocus"));
diff --git a/app/bookmarks_strings.grdp b/app/bookmarks_strings.grdp
index 8d074901f475..24ac9c3d33d8 100644
--- a/app/bookmarks_strings.grdp
+++ b/app/bookmarks_strings.grdp
@@ -377,9 +377,6 @@
   <message name="IDS_BOOKMARK_MANAGER_MENU_COPY" desc="Title of the bookmark dropdown menu item that copies one or more bookmarks.">
     Copy
   </message>
-  <message name="IDS_BOOKMARK_MANAGER_MENU_COPY_URL" desc="Title of the bookmark dropdown menu item that copies the url of the bookmark.">
-    Copy URL
-  </message>
   <message name="IDS_BOOKMARK_MANAGER_MENU_PASTE" desc="Title of the bookmark dropdown menu item that pastes one or more bookmarks.">
     Paste
   </message>
@@ -469,9 +466,6 @@
       =1 {1 bookmark deleted}
       other {{COUNT} bookmarks deleted}}
   </message>
-  <message name="IDS_BOOKMARK_MANAGER_TOAST_URL_COPIED" desc="Label displayed in toast popup message when a URL is copied.">
-    URL copied
-  </message>
   <message name="IDS_BOOKMARK_MANAGER_TOAST_ITEM_COPIED" desc="Label displayed in toast popup message when a single item is copied.">
     '<ph name="COPIED_ITEM_NAME">$1<ex>Bookmark X</ex></ph>' copied
   </message>
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
index 3ef11245570c..510dd92384f4 100644
--- a/app/brave_main_delegate_browsertest.cc
+++ b/app/brave_main_delegate_browsertest.cc
@@ -15,6 +15,7 @@
 #include "components/language/core/common/language_experiments.h"
 #include "components/network_time/network_time_tracker.h"
 #include "components/omnibox/common/omnibox_features.h"
+#include "components/optimization_guide/core/optimization_guide_features.h"
 #include "components/password_manager/core/common/password_manager_features.h"
 #include "components/reading_list/features/reading_list_switches.h"
 #include "components/security_state/core/features.h"
@@ -37,6 +38,7 @@
 #include "chrome/browser/ui/profile_picker.h"
 #include "chrome/browser/ui/ui_features.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "components/translate/core/common/translate_util.h"
 #endif
 
 using BraveMainDelegateBrowserTest = PlatformBrowserTest;
@@ -84,6 +86,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
   const base::Feature* disabled_features[] = {
 #if !defined(OS_ANDROID)
     &apps::kAppDiscoveryRemoteUrlSearch,
+    &translate::kTFLiteLanguageDetectionEnabled,
 #endif
     &autofill::features::kAutofillEnableAccountWalletStorage,
     &autofill::features::kAutofillServerCommunication,
@@ -98,7 +101,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &blink::features::kNavigatorPluginsFixed,
     &blink::features::kParakeet,
     &blink::features::kPrerender2,
-    &blink::features::kReportAllJavaScriptFrameworks,
     &blink::features::kSpeculationRulesPrefetchProxy,
     &blink::features::kTextFragmentAnchor,
     &blink::features::kWebSQLInThirdPartyContextEnabled,
@@ -117,6 +119,10 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &net::features::kFirstPartySets,
     &network::features::kTrustTokens,
     &network_time::kNetworkTimeServiceQuerying,
+    &optimization_guide::features::kOptimizationHints,
+    &optimization_guide::features::kRemoteOptimizationGuideFetching,
+    &optimization_guide::features::
+        kRemoteOptimizationGuideFetchingAnonymousDataConsent,
     &reading_list::switches::kReadLater,
   };
 
@@ -127,12 +133,11 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
 IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, EnabledFeatures) {
   const base::Feature* enabled_features[] = {
     &blink::features::kPrefetchPrivacyChanges,
-    &password_manager::features::kPasswordImport,
     &blink::features::kReducedReferrerGranularity,
 #if defined(OS_WIN)
     &features::kWinrtGeolocationImplementation,
 #endif
-    &net::features::kLegacyTLSEnforced,
+    &password_manager::features::kPasswordImport,
     &security_state::features::kSafetyTipUI,
   };
 
diff --git a/app/brave_strings.grd b/app/brave_strings.grd
index e7cca8f5250c..56d716e50e4b 100644
--- a/app/brave_strings.grd
+++ b/app/brave_strings.grd
@@ -95,6 +95,92 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
     <output filename="chromium_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
     <output filename="chromium_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
 
+    <!-- On Android, output some strings into Android's xml string format.
+         These strings are tagged with formatter_data="android_java" -->
+    <if expr="is_android">
+      <output filename="java/res/values-af/chromium_strings.xml" lang="af" type="android" context="android_java" />
+      <output filename="java/res/values-am/chromium_strings.xml" lang="am" type="android" context="android_java" />
+      <output filename="java/res/values-ar/chromium_strings.xml" lang="ar" type="android" context="android_java" />
+      <output filename="java/res/values-as/chromium_strings.xml" lang="as" type="android" context="android_java" />
+      <output filename="java/res/values-az/chromium_strings.xml" lang="az" type="android" context="android_java" />
+      <output filename="java/res/values-be/chromium_strings.xml" lang="be" type="android" context="android_java" />
+      <output filename="java/res/values-bg/chromium_strings.xml" lang="bg" type="android" context="android_java" />
+      <output filename="java/res/values-bn/chromium_strings.xml" lang="bn" type="android" context="android_java" />
+      <output filename="java/res/values-bs/chromium_strings.xml" lang="bs" type="android" context="android_java" />
+      <output filename="java/res/values-ca/chromium_strings.xml" lang="ca" type="android" context="android_java" />
+      <output filename="java/res/values-cs/chromium_strings.xml" lang="cs" type="android" context="android_java" />
+      <output filename="java/res/values-da/chromium_strings.xml" lang="da" type="android" context="android_java" />
+      <output filename="java/res/values-de/chromium_strings.xml" lang="de" type="android" context="android_java" />
+      <output filename="java/res/values-el/chromium_strings.xml" lang="el" type="android" context="android_java" />
+      <output filename="java/res/values/chromium_strings.xml" lang="en" type="android" context="android_java" />
+      <output filename="java/res/values-en-rGB/chromium_strings.xml" lang="en-GB" type="android" context="android_java" />
+      <output filename="java/res/values-es/chromium_strings.xml" lang="es" type="android" context="android_java" />
+      <output filename="java/res/values-es-rUS/chromium_strings.xml" lang="es-419" type="android" context="android_java" />
+      <output filename="java/res/values-et/chromium_strings.xml" lang="et" type="android" context="android_java" />
+      <output filename="java/res/values-eu/chromium_strings.xml" lang="eu" type="android" context="android_java" />
+      <output filename="java/res/values-fa/chromium_strings.xml" lang="fa" type="android" context="android_java" />
+      <output filename="java/res/values-fi/chromium_strings.xml" lang="fi" type="android" context="android_java" />
+      <output filename="java/res/values-tl/chromium_strings.xml" lang="fil" type="android" context="android_java" />
+      <output filename="java/res/values-fr/chromium_strings.xml" lang="fr" type="android" context="android_java" />
+      <output filename="java/res/values-fr-rCA/chromium_strings.xml" lang="fr-CA" type="android" context="android_java" />
+      <output filename="java/res/values-gl/chromium_strings.xml" lang="gl" type="android" context="android_java" />
+      <output filename="java/res/values-gu/chromium_strings.xml" lang="gu" type="android" context="android_java" />
+      <output filename="java/res/values-iw/chromium_strings.xml" lang="he" type="android" context="android_java" />
+      <output filename="java/res/values-hi/chromium_strings.xml" lang="hi" type="android" context="android_java" />
+      <output filename="java/res/values-hr/chromium_strings.xml" lang="hr" type="android" context="android_java" />
+      <output filename="java/res/values-hu/chromium_strings.xml" lang="hu" type="android" context="android_java" />
+      <output filename="java/res/values-hy/chromium_strings.xml" lang="hy" type="android" context="android_java" />
+      <output filename="java/res/values-in/chromium_strings.xml" lang="id" type="android" context="android_java" />
+      <output filename="java/res/values-is/chromium_strings.xml" lang="is" type="android" context="android_java" />
+      <output filename="java/res/values-it/chromium_strings.xml" lang="it" type="android" context="android_java" />
+      <output filename="java/res/values-ja/chromium_strings.xml" lang="ja" type="android" context="android_java" />
+      <output filename="java/res/values-ka/chromium_strings.xml" lang="ka" type="android" context="android_java" />
+      <output filename="java/res/values-kk/chromium_strings.xml" lang="kk" type="android" context="android_java" />
+      <output filename="java/res/values-km/chromium_strings.xml" lang="km" type="android" context="android_java" />
+      <output filename="java/res/values-kn/chromium_strings.xml" lang="kn" type="android" context="android_java" />
+      <output filename="java/res/values-ko/chromium_strings.xml" lang="ko" type="android" context="android_java" />
+      <output filename="java/res/values-ky/chromium_strings.xml" lang="ky" type="android" context="android_java" />
+      <output filename="java/res/values-lo/chromium_strings.xml" lang="lo" type="android" context="android_java" />
+      <output filename="java/res/values-lt/chromium_strings.xml" lang="lt" type="android" context="android_java" />
+      <output filename="java/res/values-lv/chromium_strings.xml" lang="lv" type="android" context="android_java" />
+      <output filename="java/res/values-mk/chromium_strings.xml" lang="mk" type="android" context="android_java" />
+      <output filename="java/res/values-ml/chromium_strings.xml" lang="ml" type="android" context="android_java" />
+      <output filename="java/res/values-mn/chromium_strings.xml" lang="mn" type="android" context="android_java" />
+      <output filename="java/res/values-mr/chromium_strings.xml" lang="mr" type="android" context="android_java" />
+      <output filename="java/res/values-ms/chromium_strings.xml" lang="ms" type="android" context="android_java" />
+      <output filename="java/res/values-my/chromium_strings.xml" lang="my" type="android" context="android_java" />
+      <output filename="java/res/values-ne/chromium_strings.xml" lang="ne" type="android" context="android_java" />
+      <output filename="java/res/values-nl/chromium_strings.xml" lang="nl" type="android" context="android_java" />
+      <output filename="java/res/values-nb/chromium_strings.xml" lang="no" type="android" context="android_java" />
+      <output filename="java/res/values-or/chromium_strings.xml" lang="or" type="android" context="android_java" />
+      <output filename="java/res/values-pa/chromium_strings.xml" lang="pa" type="android" context="android_java" />
+      <output filename="java/res/values-pl/chromium_strings.xml" lang="pl" type="android" context="android_java" />
+      <output filename="java/res/values-pt-rBR/chromium_strings.xml" lang="pt-BR" type="android" context="android_java" />
+      <output filename="java/res/values-pt-rPT/chromium_strings.xml" lang="pt-PT" type="android" context="android_java" />
+      <output filename="java/res/values-ro/chromium_strings.xml" lang="ro" type="android" context="android_java" />
+      <output filename="java/res/values-ru/chromium_strings.xml" lang="ru" type="android" context="android_java" />
+      <output filename="java/res/values-si/chromium_strings.xml" lang="si" type="android" context="android_java" />
+      <output filename="java/res/values-sk/chromium_strings.xml" lang="sk" type="android" context="android_java" />
+      <output filename="java/res/values-sl/chromium_strings.xml" lang="sl" type="android" context="android_java" />
+      <output filename="java/res/values-sq/chromium_strings.xml" lang="sq" type="android" context="android_java" />
+      <output filename="java/res/values-sr/chromium_strings.xml" lang="sr" type="android" context="android_java" />
+      <output filename="java/res/values-b+sr+Latn/chromium_strings.xml" lang="sr-Latn" type="android" context="android_java" />
+      <output filename="java/res/values-sv/chromium_strings.xml" lang="sv" type="android" context="android_java" />
+      <output filename="java/res/values-sw/chromium_strings.xml" lang="sw" type="android" context="android_java" />
+      <output filename="java/res/values-ta/chromium_strings.xml" lang="ta" type="android" context="android_java" />
+      <output filename="java/res/values-te/chromium_strings.xml" lang="te" type="android" context="android_java" />
+      <output filename="java/res/values-th/chromium_strings.xml" lang="th" type="android" context="android_java" />
+      <output filename="java/res/values-tr/chromium_strings.xml" lang="tr" type="android" context="android_java" />
+      <output filename="java/res/values-uk/chromium_strings.xml" lang="uk" type="android" context="android_java" />
+      <output filename="java/res/values-ur/chromium_strings.xml" lang="ur" type="android" context="android_java" />
+      <output filename="java/res/values-uz/chromium_strings.xml" lang="uz" type="android" context="android_java" />
+      <output filename="java/res/values-vi/chromium_strings.xml" lang="vi" type="android" context="android_java" />
+      <output filename="java/res/values-zh-rCN/chromium_strings.xml" lang="zh-CN" type="android" context="android_java" />
+      <output filename="java/res/values-zh-rHK/chromium_strings.xml" lang="zh-HK" type="android" context="android_java" />
+      <output filename="java/res/values-zh-rTW/chromium_strings.xml" lang="zh-TW" type="android" context="android_java" />
+      <output filename="java/res/values-zu/chromium_strings.xml" lang="zu" type="android" context="android_java" />
+    </if>
+
     <!-- Pseudolocales -->
     <output filename="chromium_strings_ar-XB.pak" type="data_package" lang="ar-XB" />
     <output filename="chromium_strings_en-XA.pak" type="data_package" lang="en-XA" />
@@ -508,11 +594,6 @@ Brave is unable to recover your settings.
         </message>
       </if>
 
-      <!-- Print Preview -->
-      <message name="IDS_PRINT_PREVIEW_NO_PLUGIN" desc="Message to display when the PDF viewer is missing.">
-        Brave cannot show the print preview when the built-in PDF viewer is missing.
-      </message>
-
       <!-- Download Shelf Items -->
       <message name="IDS_DOWNLOAD_STATUS_CRX_INSTALL_RUNNING" desc="Message shown when a CRX has been downloaded and is being unpacked.">
         Adding to Brave...
@@ -624,10 +705,7 @@ Brave is unable to recover your settings.
         <message name="IDS_ABOUT" desc="In Title Case: The text label of the About Brave menu item">
           About &amp;Brave
         </message>
-        <message name="IDS_UPDATE_NOW" desc="In Title Case: The text label of the Update Brave Now menu item">
-          Update &amp;Brave
-        </message>
-        <message name="IDS_RELAUNCH_TO_UPDATE" desc="In Title Case: The text label of the Update Brave menu item, when relaunch to update experiment is enabled">
+        <message name="IDS_RELAUNCH_TO_UPDATE" desc="In Title Case: The text label of the relaunch to update Brave menu item">
           Relaunch to Update &amp;Brave
         </message>
       </if>
@@ -635,10 +713,7 @@ Brave is unable to recover your settings.
         <message name="IDS_ABOUT" desc="The text label of the About Brave menu item">
           About &amp;Brave
         </message>
-        <message name="IDS_UPDATE_NOW" desc="The text label of the Update Brave Now menu item">
-          Update &amp;Brave
-        </message>
-        <message name="IDS_RELAUNCH_TO_UPDATE" desc="The text label of the Update Brave menu item, when relaunch to update experiment is enabled">
+        <message name="IDS_RELAUNCH_TO_UPDATE" desc="The text label of the relaunch to update Brave menu item">
           Relaunch to update &amp;Brave
         </message>
       </if>
@@ -646,10 +721,7 @@ Brave is unable to recover your settings.
         <message name="IDS_ABOUT" desc="The text label of the About Brave menu item">
           About &amp;Brave
         </message>
-        <message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome OS Now menu item">
-          Update &amp;Chrome OS
-        </message>
-        <message name="IDS_RELAUNCH_TO_UPDATE" desc="The text label of the Update Chrome OS menu item, when relaunch to update experiment is enabled">
+        <message name="IDS_RELAUNCH_TO_UPDATE" desc="The text label of the relaunch to update Chrome OS menu item">
           Relaunch to update &amp;Chrome OS
         </message>
       </if>
diff --git a/app/extensions_strings.grdp b/app/extensions_strings.grdp
index 835ad886ed61..18d1cd8977fc 100644
--- a/app/extensions_strings.grdp
+++ b/app/extensions_strings.grdp
@@ -264,7 +264,7 @@
     Permissions
   </message>
   <message name="IDS_EXTENSIONS_ITEM_PERMISSIONS_EMPTY" desc="The text to indicate that an extension does not have any special permissions.">
-    This extension requires no special permissions
+    This extension requires no special permissions.
   </message>
   <message name="IDS_EXTENSIONS_ITEM_REMOVE_EXTENSION" desc="The label on the button to remove an extension.">
     Remove extension
@@ -272,12 +272,18 @@
   <message name="IDS_EXTENSIONS_ITEM_SITE_ACCESS" desc="The label above the list of the websites that the extension can access.">
     Site access
   </message>
+  <message name="IDS_EXTENSIONS_ITEM_SITE_ACCESS_NEW" desc="The label of the button to click to view the list of websites that the extension can access.">
+    Site permissions
+  </message>
   <message name="IDS_EXTENSIONS_ITEM_SITE_ACCESS_ADD_HOST" desc="The label of the option to add a new site that the extension should be allowed to access.">
     Add a new page
   </message>
   <message name="IDS_EXTENSIONS_ITEM_SITE_ACCESS_EMPTY" desc="The text to indicate that an extension does not have any site access.">
     This extension has no additional site access.
   </message>
+  <message name="IDS_EXTENSIONS_ITEM_SITE_ACCESS_SUBLABEL" desc="The sublabel of the button to click to view the list of websites that the extension can access.">
+    Choose when this extension can read and change your site data
+  </message>
   <message name="IDS_EXTENSIONS_ITEM_SOURCE" desc="The label above an extension's source, which indicates where the extension came from (webstore, third-party, local disk, etc).">
     Source
   </message>
diff --git a/app/generated_resources.grd b/app/generated_resources.grd
index 3fc942430ba5..5bd417a0b685 100644
--- a/app/generated_resources.grd
+++ b/app/generated_resources.grd
@@ -285,7 +285,7 @@ are declared in tools/grit/grit_rule.gni.
       <part file="media_router_strings.grdp" />
 
       <!-- Global Media Controls specific strings -->
-      <part file="global_media_controls_strings.grdp" />
+      <part file="gmc_strings.grdp" />
 
       <!-- Profiles specific strings -->
       <part file="profiles_strings.grdp" />
@@ -519,6 +519,12 @@ are declared in tools/grit/grit_rule.gni.
             This dialog is not currently focused. Press Alt-Shift A to focus this dialog.
           </message>
         </if>
+        <message name="IDS_FOCUS_HELP_BUBBLE_DESCRIPTION" is_accessibility_with_no_ui="true" desc="Message announced to screen reader users when a general help bubble is shown.">
+          Press |<ph name="ACCELERATOR">$1<ex>F6</ex></ph>| to focus this help bubble.
+        </message>
+        <message name="IDS_FOCUS_HELP_BUBBLE_TOGGLE_DESCRIPTION" is_accessibility_with_no_ui="true" desc="Message announced to screen reader when a help bubble pointing to a specific element is shown.">
+          Press |<ph name="ACCELERATOR">$1<ex>F6</ex></ph>| to toggle focus between this help bubble and the element it is pointing to.
+        </message>
       </if>
 
        <!-- content area context menus. Android does not use it -->
@@ -1367,7 +1373,7 @@ are declared in tools/grit/grit_rule.gni.
       </if>
 
       <!-- App menu -->
-      <if expr="chromeos">
+      <if expr="chromeos or lacros">
         <message name="IDS_TOGGLE_REQUEST_TABLET_SITE" desc="The toggle to request mobile version site on a touch dev.">
           Request mobile site
         </message>
@@ -4937,6 +4943,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_WEB_APP_DISABLE_WINDOW_CONTROLS_OVERLAY_TOOLTIP">
         Show title bar
       </message>
+      <message name="IDS_WEB_APP_WINDOW_CONTROLS_OVERLAY_ENABLED_ALERT" desc="Status change notification that the title bar is hidden after window controls overlay is enabled">
+        Title bar is now hidden
+      </message>
+      <message name="IDS_WEB_APP_WINDOW_CONTROLS_OVERLAY_DISABLED_ALERT" desc="Status change notification that the title bar is showing after window controls overlay is disabled">
+        Title bar is now showing
+      </message>
 
       <!-- Components -->
       <message name="IDS_COMPONENTS_TITLE" desc="Title for the chrome://components page.">
@@ -6263,9 +6275,15 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_BOOKMARK_PROMO_2" desc="Text shown on promotional UI appearing next to the Bookmarks button, which encourages users to use it.">
         Get back here fast by bookmarking this tab
       </message>
-      <message name="IDS_CLOSE_TUTORIAL" desc="Accessible name used by a screen reader for the in-product-help bubble close button." is_accessibility_with_no_ui="true">
+      <message name="IDS_CHROME_TIP" desc="Accessible name used by a screen reader for the in-product-help or tutorial bubble icon." is_accessibility_with_no_ui="true">
+        Brave tip
+      </message>
+      <message name="IDS_CLOSE_TUTORIAL" desc="Accessible name used by a screen reader for the tutorial bubble close button." is_accessibility_with_no_ui="true">
         Close tutorial
       </message>
+      <message name="IDS_CLOSE_PROMO" desc="Accessible name used by a screen reader for the in-product-help bubble close button." is_accessibility_with_no_ui="true">
+        Close help bubble
+      </message>
       <message name="IDS_GLOBAL_MEDIA_CONTROLS_PROMO" desc="Text shown on promotional UI appearing next to the global media controls toolbar button.">
         New! Control your music, videos, and more.
       </message>
@@ -6336,6 +6354,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Remind me later
         </message>
       </if>
+      <message name="IDS_SHARED_HIGHLIGHTING_PROMO" desc="The title of in-product-help message encouraging users to interact with the highlight">
+        To create a highlight like this one, select any text and right-click.
+      </message>
 
       <!-- Browser Hung Plugin Detector -->
       <if expr="is_win">
@@ -7003,6 +7024,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_TAB_CXMENU_NEWTABTORIGHT" desc="The label of the 'New Tab to the Right' Tab context menu item.">
           New tab to the right
         </message>
+        <message name="IDS_TAB_CXMENU_NEWTABTOLEFT" desc="The label of the 'New Tab to the Left' Tab context menu item.">
+          New tab to the left
+        </message>
         <message name="IDS_TAB_CXMENU_RELOAD" desc="The label of the 'Reload' Tab context menu item.">
           Reload
         </message>
@@ -7018,6 +7042,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_TAB_CXMENU_CLOSETABSTORIGHT" desc="The label of the 'Close Tabs to the Right' Tab context menu item.">
           Close tabs to the right
         </message>
+        <message name="IDS_TAB_CXMENU_CLOSETABSTOLEFT" desc="The label of the 'Close Tabs to the Left' Tab context menu item.">
+          Close tabs to the left
+        </message>
         <message name="IDS_TAB_CXMENU_FOCUS_THIS_TAB" desc="The label of the 'Focus this tab' Tab context menu item.">
           Focus this tab
         </message>
@@ -7083,6 +7110,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_TAB_CXMENU_NEWTABTORIGHT" desc="In Title Case: The label of the 'New Tab to the Right' Tab context menu item.">
           New Tab to the Right
         </message>
+        <message name="IDS_TAB_CXMENU_NEWTABTOLEFT" desc="In Title Case: The label of the 'New Tab to the Left' Tab context menu item.">
+          New Tab to the Left
+        </message>
         <message name="IDS_TAB_CXMENU_RELOAD" desc="In Title Case: The label of the 'Reload' Tab context menu item.">
           Reload
         </message>
@@ -7098,6 +7128,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_TAB_CXMENU_CLOSETABSTORIGHT" desc="In Title Case: The label of the 'Close Tabs to the Right' Tab context menu item.">
           Close Tabs to the Right
         </message>
+        <message name="IDS_TAB_CXMENU_CLOSETABSTOLEFT" desc="In Title Case: The label of the 'Close Tabs to the Left' Tab context menu item.">
+          Close Tabs to the Left
+        </message>
         <message name="IDS_TAB_CXMENU_FOCUS_THIS_TAB" desc="In Title Case: The label of the 'Focus This Tab' Tab context menu item.">
           Focus This Tab
         </message>
@@ -8594,9 +8627,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_DIRECTORY_LISTING_DATE_MODIFIED" desc="When viewing a local directory, this is the text for the column above the last modified dates.">
         Date Modified
       </message>
-      <message name="IDS_DIRECTORY_LISTING_PARSING_ERROR_BOX_TEXT" desc="Text to show in a box when we failed to parse FTP directory listing.">
-        Oh, no! This server is sending data <ph name="PRODUCT_NAME">$1<ex>Brave</ex></ph> can't understand. Please <ph name="BEGIN_LINK">&lt;a href="http://code.google.com/p/chromium/issues/entry"&gt;</ph>report a bug<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>, and include the <ph name="BEGIN2_LINK">&lt;a href="LOCATION"&gt;</ph>raw listing<ph name="END2_LINK">&lt;/a&gt;</ph>.
-      </message>
 
       <!-- Saving Page-->
       <message name="IDS_SAVE_PAGE_DESC_HTML_ONLY" desc="In the Save Page dialog, the description of saving only the HTML of a webpage.">
@@ -8906,6 +8936,9 @@ Please help our engineers fix this problem. Tell us what happened right before y
           <message name="IDS_SYNC_RELOGIN_BUTTON" desc="The text to display on the button when the user needs to sign out and sign in again to use sync on Chrome OS.">
             Sign out
           </message>
+          <message name="IDS_SYNC_TOKEN_HANDLE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sign-in error bubble view when the user's token handle is invalid.">
+            Your account sign-in details are out of date. Please sign out and sign in again.
+          </message>
           <message name="IDS_ACTIVE_DIRECTORY_PASSWORD_EXPIRED" desc="The text to display on the hyperlink when the user needs to sign out and sign in again to change their password.">
             Your password has expired. Please sign out then sign in again to change it.
           </message>
@@ -10496,7 +10529,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
           Open Settings to connect <ph name="USB_DEVICE_NAME">$1<ex>Nexus 5</ex></ph> to <ph name="USB_VM_NAME">$2<ex>Linux</ex></ph>
       </message>
       <message name="IDS_CROSUSB_DEVICE_DETECTED_NOTIFICATION_LINUX_PLUGIN_VM" desc="Content for notification shown to the user when a USB device gets plugged in and both Parallels and Linux are enabled. Do not translate 'Parallels Desktop' or 'Linux'.">
-          Open Settings to connect <ph name="USB_DEVICE_NAME">$1<ex>Nexus 5</ex></ph> to Parallels Desktop or Linux
+          Open Settings to connect <ph name="USB_DEVICE_NAME">$1<ex>Nexus 5</ex></ph> to Linux or Parallels Desktop
       </message>
       <message name="IDS_CROSUSB_DEVICE_DETECTED_NOTIFICATION_TITLE" desc="Title for notification shown to the user when a USB device gets plugged in.">
         USB device detected
@@ -11457,6 +11490,17 @@ Please help our engineers fix this problem. Tell us what happened right before y
       Open now
     </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?
+    </message>
+    <message name="IDS_TAILORED_SECURITY_UNCONSENTED_ACCEPT_BUTTON" desc="The text on the accept button in the tab modal dialog when the account tailored security setting changes for an unconsented primary account">
+      Turn on
+    </message>
+    <message name="IDS_TAILORED_SECURITY_UNCONSENTED_CANCEL_BUTTON" desc="The text on the cancel button in the tab modal dialog when the account tailored security setting changes for an unconsented primary account">
+      No thanks
+    </message>
+
     <!-- Enterprise file system connector service providers' display names -->
     <message name="IDS_FILE_SYSTEM_CONNECTOR_BOX" meaning="box.com" desc="Display name for Box.">
       Box
@@ -11590,9 +11634,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
     <message name="IDS_COMMANDER_LABEL" desc="Label to identify the Commander feature in Task Manager">
       Commander
     </message>
-    <message name="IDS_SHOW_KALEIDOSCOPE" desc="Menu item to launch the Brave watch feature">
-      Watch
-    </message>
 
     <!-- BraveLabs bubble -->
     <message name="IDS_CHROMELABS_RELAUNCH_BUTTON_LABEL" desc="Label on the button in the footer of the Brave Labs bubble which will relaunch the browser.">
@@ -11671,6 +11712,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
     <message name="IDS_LENS_REGION_SEARCH_BUBBLE_TEXT" desc="Text that is shown in the Lens Region Search education bubble when starting the feature. Informs the user to drag over the screen to select a region to search with Brave Lens.">
       Drag over any image to search
     </message>
+    <!-- BraveLabs Thumbnail Tab Strip -->
+    <message name="IDS_THUMBNAIL_TAB_STRIP_EXPERIMENT_NAME" desc="Name for Thumbnail Tab Strip experiment">
+      Thumbnail tab strip for tablet mode
+    </message>
+    <message name="IDS_THUMBNAIL_TAB_STRIP_EXPERIMENT_DESCRIPTION" desc="Description for Thumbnail Tab Strip experiment">
+      In tablet mode, tap on the tab counter toolbar button to open the new tab strip that shows thumbnails of each tab.
+    </message>
 
     <if expr="is_cfm">
       <message name="IDS_CFM_NETWORK_SETTINGS_TITLE" desc="Title for CFM Network Settings dialog">
diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd
index 73a78ccd622b..099a0412c10a 100644
--- a/app/generated_resources_override.grd
+++ b/app/generated_resources_override.grd
@@ -153,7 +153,7 @@ are declared in tools/grit/grit_rule.gni.
           </if>
         <if expr="not is_macosx">
           </if>
-      </if>
+        </if>
 
        <if expr="not is_android">
         <if expr="not use_titlecase">
@@ -223,7 +223,7 @@ are declared in tools/grit/grit_rule.gni.
       <if expr="is_posix and not is_macosx">
         </if>
 
-      <if expr="chromeos">
+      <if expr="chromeos or lacros">
         </if>
 
       <if expr="not use_titlecase">
@@ -557,7 +557,6 @@ are declared in tools/grit/grit_rule.gni.
         </if>
       <if expr="not use_titlecase">
         </if>
-
       <if expr="is_win">
         </if>
       <if expr="use_titlecase">
diff --git a/app/global_media_controls_strings.grdp b/app/gmc_strings.grdp
similarity index 86%
rename from app/global_media_controls_strings.grdp
rename to app/gmc_strings.grdp
index c78fe3371ece..709c94901fd5 100644
--- a/app/global_media_controls_strings.grdp
+++ b/app/gmc_strings.grdp
@@ -2,14 +2,11 @@
 <!-- Global Media Controls-specific strings (included from generated_resources.grd). -->
 <!--This file is created by l10nUtil.js. Do not edit manually.-->
 <grit-part>
-  <message name="IDS_GLOBAL_MEDIA_CONTROLS_BACK_TO_TAB" desc="A11y text for the Global Media Controls container describing how clicking it takes you back to the tab.">
-   Back to tab
-  </message>
   <message name="IDS_GLOBAL_MEDIA_CONTROLS_ICON_TOOLTIP_TEXT" desc="Tooltip for the Global Media Controls icon, which appears in the toolbar. The tooltip appears on mouseover of the icon.">
    Control your music, videos, and more
   </message>
-  <message name="IDS_GLOBAL_MEDIA_CONTROLS_DISMISS_ICON_TOOLTIP_TEXT" desc="Tooltip for the dismiss button within the Global Media Controls dialog. The tooltip appears on mouseover of the icon.">
-   Dismiss
+  <message name="IDS_GLOBAL_MEDIA_CONTROLS_DEVICES_LABEL" desc="Label to prompt users to select an audio or cast device to play from.">
+   Select a device:
   </message>
   <message name="IDS_GLOBAL_MEDIA_CONTROLS_DEVICES_BUTTON_LABEL" desc="Label for a button that opens a menu for picking an audio or cast device to play from.">
    Select a device
@@ -41,5 +38,8 @@
   <message name="IDS_GLOBAL_MEDIA_CONTROLS_CONTROL_CAST_SESSIONS_PROMO" desc="Text shown on promotional UI appearing next to the global media controls button to promote controlling cast sessions.">
    Control the media you're casting
   </message>
+  <message name="IDS_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE" desc="Title of the toolbar button's context menu item, which, on click, opens a page to report an issue with Cast.">
+    Report an issue with Brave Cast
+  </message>
 
 </grit-part>
diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp
index b45bb3305d23..f0441405b9dc 100644
--- a/app/os_settings_search_tag_strings.grdp
+++ b/app/os_settings_search_tag_strings.grdp
@@ -277,22 +277,22 @@
   <message name="IDS_OS_SETTINGS_TAG_NEARBY_SHARE_DATA_USAGE" desc="Text for search result item which, when clicked, navigates the user to Nearby Share edit data usage button in settings.">
     Nearby Share data usage
   </message>
-  <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_PHONE_HUB" translateable="false" desc="Text for search result item which, when clicked, navigates the user to Phone Hub settings, with a toggle to enable/disable the feature. Phone hub provides the user with information about their Android phone and allows the user to perform phone-side actions directly in the Chrome OS UI.">
+  <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_PHONE_HUB" desc="Text for search result item which, when clicked, navigates the user to Phone Hub settings, with a toggle to enable/disable the feature. Phone hub provides the user with information about their Android phone and allows the user to perform phone-side actions directly in the Chrome OS UI.">
     Phone Hub
   </message>
   <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_PHONE_HUB_CAMERA_ROLL" desc="Text for search result item which, when clicked, navigates the user to Phone Hub photo settings, with a toggle to enable/disable the feature. Phone hub populates the 4 most recently updated photos/videos thumbnail in connected phone's camera roll on Bravebook, and give options to intereact with them.">
     Recent Photos
   </message>
-  <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_PHONE_HUB_NOTIFICATIONS" translateable="false" desc="Text for search result item which, when clicked, navigates the user to Phone Hub Notifications settings, with a toggle to enable/disable the feature. Phone Hub Notifications mirrors all standard notifications currently being shown on connected phone device.">
+  <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_PHONE_HUB_NOTIFICATIONS" desc="Text for search result item which, when clicked, navigates the user to Phone Hub Notifications settings, with a toggle to enable/disable the feature. Phone Hub Notifications mirrors all standard notifications currently being shown on connected phone device.">
     Phone Hub notifications
   </message>
-  <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_PHONE_HUB_TASK_CONTINUATION" translateable="false" desc="Text for search result item which, when clicked, navigates the user to Phone Hub Notifications settings, with a toggle to enable/disable the feature. Phone Hub Task Continuation allows user to continue a task between connected device and Chrome OS">
+  <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_PHONE_HUB_TASK_CONTINUATION" desc="Text for search result item which, when clicked, navigates the user to Phone Hub Notifications settings, with a toggle to enable/disable the feature. Phone Hub Task Continuation allows user to continue a task between connected device and Chrome OS">
     Phone Hub task continuation
   </message>
-  <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_PHONE_HUB_APPS" translateable="false" desc="Text for search result item which, when clicked, navigates the user to Phone Hub Apps settings, with a toggle to enable/disable the feature. Phone Hub Aapps allows user to app streaming from connected phone device.">
+  <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_PHONE_HUB_APPS" desc="Text for search result item which, when clicked, navigates the user to Phone Hub Apps settings, with a toggle to enable/disable the feature. Phone Hub Aapps allows user to app streaming from connected phone device.">
     Phone Hub apps
   </message>
-  <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_WIFI_SYNC" translateable="false" desc="Text for search result item which, when clicked, navigates the user to Wi-Fi Sync V2 settings, with a toggle to enable/disable the feature. Wi-Fi Sync V2 allows user to sync network configurations between Chrome OS devices and a connected Android phone">
+  <message name="IDS_OS_SETTINGS_TAG_MULTIDEVICE_WIFI_SYNC" desc="Text for search result item which, when clicked, navigates the user to Wi-Fi Sync settings, with a toggle to enable/disable the feature. Wi-Fi Sync V2 allows user to sync network configurations between Chrome OS devices and a connected Android phone">
     Wi-Fi Sync
   </message>
 
@@ -533,6 +533,12 @@
   <message name="IDS_OS_SETTINGS_TAG_TOUCHPAD_SPEED" desc="Text for search result item which, when clicked, navigates the user to touchpad settings, with a slider to set speed.">
     Touchpad speed
   </message>
+  <message name="IDS_OS_SETTINGS_TAG_TOUCHPAD_HAPTIC_FEEDBACK" desc="Text for search result item which, when clicked, navigates the user to touchpad settings, with a toggle to enable/disable haptic feedback.">
+    Touchpad haptic feedback
+  </message>
+  <message name="IDS_OS_SETTINGS_TAG_TOUCHPAD_HAPTIC_CLICK_SENSITIVITY" translateable="false" desc="Text for search result item which, when clicked, navigates the user to touchpad settings, with a slider to adjust the haptic touchpad click sensitivity.">
+    Touchpad haptic click sensitivity
+  </message>
   <message name="IDS_OS_SETTINGS_TAG_MOUSE" desc="Text for search result item which, when clicked, navigates the user to mouse settings.">
     Mouse
   </message>
diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp
index a461dce57de5..d021e2047b5a 100644
--- a/app/os_settings_strings.grdp
+++ b/app/os_settings_strings.grdp
@@ -157,9 +157,6 @@
   <message name="IDS_SETTINGS_ABOUT_PAGE_CHECK_FOR_UPDATES" desc="The button label to check for updates and apply (download and install) if found">
     Check for updates
   </message>
-  <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL" desc="The message about current channel.">
-    Currently on <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph>
-  </message>
   <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_INFO" desc="The message about current channel.">
     Currently on <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph> channel
   </message>
@@ -228,21 +225,12 @@
   </message>
 
   <!-- Profiles (OS settings) -->
-  <message name="IDS_OS_SETTINGS_PEOPLE" desc="Name of a section in the OS settings page." meaning="People and their accounts.">
-    Profiles
-  </message>
   <message name="IDS_OS_SETTINGS_PEOPLE_V2" desc="Name of a section in the OS settings page." meaning="People and their accounts.">
     Accounts
   </message>
   <message name="IDS_OS_SETTINGS_PROFILE_NAME" desc="Label with device account first name, showing which user is currently signed in.">
     Currently signed in as <ph name="NAME">$1<ex>John</ex></ph>
   </message>
-  <message name="IDS_OS_SETTINGS_PROFILE_LABEL" desc="Label underneath the profile's real name, listing the email address and optionally the number of additional accounts">
-    {COUNT, plural,
-     =0 {<ph name="EMAIL">$1<ex>alice@example.com</ex></ph>}
-     =1 {<ph name="EMAIL">$1<ex>alice@example.com</ex></ph>, +1 more account}
-     other {<ph name="EMAIL">$1<ex>alice@example.com</ex></ph>, +<ph name="EXTRA_ACCOUNTS">$2<ex>2</ex></ph> more accounts}}
-  </message>
   <message name="IDS_OS_SETTINGS_PROFILE_LABEL_V2" desc="Label underneath the profile's real name, listing the number of accounts">
     {COUNT, plural,
      =1 {1 Brave sync chain}
@@ -1131,7 +1119,7 @@ and Ctrl+Alt+Brightness down to zoom out.
     Downloading speech recognition files... <ph name="PERCENT">$1<ex>17</ex></ph>%
   </message>
   <message name="IDS_SETTINGS_ACCESSIBILITY_DICTATION_SUBTITLE_SODA_DOWNLOAD_ERROR" desc="Description explaining that there was an error with the speech recognition library download.">
-    Couldn’t download <ph name="language">$1<ex>English</ex></ph> speech files. Download will be attempted later. Speech is sent to Brave for processing for now.
+    Couldn’t download <ph name="language">$1<ex>English</ex></ph> speech files. Download will be attempted later. Speech is sent to Brave for processing until download is completed.
   </message>
   <message name="IDS_SETTINGS_ACCESSIBILITY_DICTATION_LOCALE_MENU_LABEL" desc="Description of a drop-down menu to select the language to use for Dictation's speech recognition.">
     Language
@@ -1140,7 +1128,7 @@ and Ctrl+Alt+Brightness down to zoom out.
     <ph name="language">$1<ex>English</ex></ph> is processed locally and works offline
   </message>
   <message name="IDS_SETTINGS_ACCESSIBILITY_DICTATION_LOCALE_SUB_LABEL_NETWORK" desc="Sub-label for a drop-down menu to select the language to use for Dictation. Describes how speech will be sent over the network to Brave for processing to create text.">
-    <ph name="language">$1<ex>English</ex></ph> speech is sent to Brave for processing.
+    <ph name="language">$1<ex>English</ex></ph> speech is sent to Brave for processing
   </message>
   <message name="IDS_SETTINGS_ACCESSIBILITY_DICTATION_CHANGE_LANGUAGE_BUTTON" desc="Text on a button to open a dialog to change the Dictation language.">
     Change
@@ -1563,12 +1551,6 @@ Press an assigned switch or key to remove assignment.
   </message>
 
   <!-- Account Manager (OS settings) -->
-  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_DESCRIPTION" desc="Description of the Account Manager Settings page. Shown just below the title of the page.">
-    Manage your signed-in accounts. Websites, apps, and extensions in Brave and Google Play may use these accounts to customize your experience, depending on permissions. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-  </message>
-  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_CHILD_DESCRIPTION" desc="Description of the Account Manager Settings page for child users. Shown just below the title of the page.">
-    Manage your accounts here. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-  </message>
   <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.">
     This page allows you to manage your signed-in Brave sync chains. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
   </message>
@@ -1605,9 +1587,6 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_ACCOUNT_MANAGER_REMOVE_ACCOUNT_LABEL" desc="Label of the Remove account button in Account Manager.">
     Remove this account
   </message>
-  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_ADD_ACCOUNT_LABEL" desc="Label of the Add account button in Account Manager.">
-    Add account
-  </message>
   <message name="IDS_SETTINGS_ACCOUNT_MANAGER_ADD_ACCOUNT_LABEL_V2" desc="Label of the Add account button in Account Manager.">
     Add Brave sync chain
   </message>
@@ -1617,9 +1596,6 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_ACCOUNT_MANAGER_ADD_SCHOOL_ACCOUNT_LABEL_2" desc="Label of the button to add a school/EDU account in Account Manager.">
     School Account
   </message>
-  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_SECONDARY_ACCOUNTS_DISABLED_TEXT" desc="Text for 'secondary accounts disabled' message in Settings page.">
-    Your administrator has disabled the addition of more Brave sync chains
-  </message>
   <message name="IDS_SETTINGS_ACCOUNT_MANAGER_SECONDARY_ACCOUNTS_DISABLED_TEXT_V2" desc="Tooltip text for 'secondary accounts disabled' message in Settings page.">
    Your administrator doesn’t allow additional Brave sync chains.
   </message>
@@ -2038,6 +2014,15 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_BLUETOOTH_DEVICE_DETAIL_CONNECTED_A11Y_LABEL" desc="Bluetooth device details page: A11y label informing the current device is connected.">
     Connected to <ph name="DEVICE">$1<ex>Beats</ex></ph>
   </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_DEVICE_DETAIL_CONNECTING_A11Y_LABEL" desc="Bluetooth device details page: A11y label informing, the current device is being connected to.">
+    Connecting to <ph name="DEVICE">$1<ex>Beats</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_DEVICE_DETAIL_CONNECTION_FAILURE_A11Y_LABEL" desc="Bluetooth device details page: A11y label informing, the current device could not be connected to.">
+    Could not connect to <ph name="DEVICE">$1<ex>Beats</ex></ph>. Try again.
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_DEVICE_DETAIL_CONNECTION_FAILURE_LABEL" desc="Bluetooth device details page: Message informing, the current device could not be connected to.">
+    Couldn't connect. Try again.
+  </message>
   <message name="IDS_SETTINGS_BLUETOOTH_DEVICE_DETAIL_DISCONNECTED_A11Y_LABEL" desc="Bluetooth device details page: A11y label informing the current device is disconnected.">
     Disconnected from <ph name="DEVICE">$1<ex>Beats</ex></ph>
   </message>
@@ -2173,6 +2158,13 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_BLUETOOTH_MANAGED" desc="Tooltip description for icon notifying user that the Bluetooth device is managed by an enterprise policy and may have restricted functionality.">
     Your administrator has blocked some functionality for this device
   </message>
+  <message name="IDS_BLUETOOTH_ENABLE_FAST_PAIR_LABEL" desc="Label for the toggle that enables Fast Pair on the Bluetooth settings page.">
+    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
+  </message>
+
 
   <!-- Parental Controls -->
   <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_TITLE" desc="Name of the settings page which manages BraveOS's parental controls.">
@@ -2261,6 +2253,18 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_MOUSE_AND_TOUCHPAD_TITLE" desc="In Device Settings, the title of the mouse and touchpad settings subpage (when the user has both types of devices).">
     Mouse and touchpad
   </message>
+  <message name="IDS_SETTINGS_TOUCHPAD_HAPTIC_FEEDBACK_LABEL" desc="In Device Settings, the text next to the toggle for enabling touchpad haptic feedback.">
+    Enable haptic feedback. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_TOUCHPAD_HAPTIC_CLICK_SENSITIVITY_LABEL" translateable="false" desc="In Device Settings, the text next to the slider for setting the touchpad haptic click sensitivity.">
+    Click feedback
+  </message>
+  <message name="IDS_SETTINGS_TOUCHPAD_HAPTIC_LIGHT_CLICK_LABEL" desc="In Device Settings, the text under the left (less sensitive) side of the slider for the touchpad haptic click sensitivity.">
+    Light
+  </message>
+  <message name="IDS_SETTINGS_TOUCHPAD_HAPTIC_FIRM_CLICK_LABEL" desc="In Device Settings, the text under the right (more sensitive) side of the slider for the touchpad haptic click sensitivity.">
+    Firm
+  </message>
 
   <!-- Printing Page (OS Settings)-->
   <message name="IDS_SETTINGS_PRINT_AND_SCAN" desc="Title of the printing and scanning page and navigation item to get there.">
@@ -3082,6 +3086,15 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_CONNECTING_TITLE" desc="The title of the dialog containing the Phone Hub notification opt-in flow shown when the user has confirmed to enable the feature that will mirror phone notifications to their Bravebook.">
     Connecting to your phone
   </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_SCREEN_LOCK_TITLE" desc="The title 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 Bravebook.">
+    Set a PIN or password to continue
+  </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 Bravebook.">
+    Protect your phone's data when this Bravebook wakes from sleep.
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_SCREEN_LOCK_INSTRUCTION" desc="The instruction message of the screen lock dialog containing the smart lock will log in when the phone is nearby.">
+    Smart lock will automatically log you in when your phone is nearby.
+  </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>
@@ -3751,9 +3764,6 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE" desc="Message shown below the title that tells the user to confirm their initial PIN entry.">
     Confirm your PIN
   </message>
-  <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE" desc="Title of the password prompt dialog popup.">
-    Confirm your password
-  </message>
 
   <!-- Setup fingerprint dialog (OS settings) -->
   <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_TITLE" desc="Title of the add fingerprint dialog popup.">
@@ -4089,6 +4099,34 @@ Press an assigned switch or key to remove assignment.
   <message name="IDS_OS_SETTINGS_DATA_ACCESS_PROTECTION_CONFIRM_DIALOG_DISABLE_BUTTON_LABEL" desc="The label of the confirmation button to disable data access protection">
     Disable
   </message>
+  <message name="IDS_OS_SETTINGS_SMART_PRIVACY_TITLE" desc="Do not translate (string not final). Text on the privacy page that opens up the smart privacy section.">
+    Smart privacy protections
+  </message>
+  <message name="IDS_OS_SETTINGS_SMART_PRIVACY_SUBTEXT" desc="Do not translate (string not final). The sub-label describing the purpose of the smart privacy section.">
+    Smart display lock and detect if others peeking from behind
+  </message>
+  <message name="IDS_OS_SETTINGS_SMART_PRIVACY_DESC" desc="Do not translate (string not final). The text explaining to the user the manner in which their presence is sensed and data usage policy.">
+    This feature uses the front camera for detection. The data is securely processed and discarded afterwards. Brave doesn't use your data for any other purposes.
+  </message>
+  <message name="IDS_OS_SETTINGS_SMART_PRIVACY_SCREEN_LOCK_TITLE" desc="Do not translate (string not final). The name of the smart screen lock feature shown as the label of a toggle in the smart privacy subpage.">
+    Smart screen lock
+  </message>
+  <message name="IDS_OS_SETTINGS_SMART_PRIVACY_SCREEN_LOCK_SUBTEXT" desc="Do not translate (string not final). Sub-label elaborating on the meaning of smart screen locking.">
+    Screen locks automatically if you walk off, and won't turn off if you're in front of it
+  </message>
+  <message name="IDS_OS_SETTINGS_SMART_PRIVACY_SNOOPING_TITLE" desc="Do not translate (string not final). Text in the smart privacy section which is the subheader for snooping protection options.">
+    Snooping protection
+  </message>
+  <message name="IDS_OS_SETTINGS_SMART_PRIVACY_SNOOPING_SUBTEXT" desc="Do not translate (string not final). Sub-label elaborating on the meaning of snooping protection.">
+    Notify you or temporary dim your screen when someone is snooping from behind
+  </message>
+  <message name="IDS_OS_SETTINGS_SMART_PRIVACY_SNOOPING_ICON" desc="Do not translate (string not final). The radio button option in the smart privacy section requesting an eye icon when a snooper is detected.">
+    Show me an eye icon in the status area
+  </message>
+  <message name="IDS_OS_SETTINGS_SMART_PRIVACY_SNOOPING_DIM" desc="Do not translate (string not final). The radio button option in the smart privacy section requesting screen dim when a snooper is detected.">
+    Temporary dim screen
+  </message>
+
 
   <!-- On Startup (OS settings) -->
   <message name="IDS_OS_SETTINGS_ON_STARTUP_TITLE" desc="The title of the dropdown menu that allows the user to configure the restore apps and pages options on startup.">
diff --git a/app/os_settings_strings_override.grdp b/app/os_settings_strings_override.grdp
index 107d01c835bd..462ad2df73f1 100644
--- a/app/os_settings_strings_override.grdp
+++ b/app/os_settings_strings_override.grdp
@@ -3,9 +3,6 @@
 <grit-part>
 <if expr="chromeos">
 
-  <message name="IDS_OS_SETTINGS_PEOPLE" desc="Name of a section in the OS settings page." meaning="People and their accounts.">
-    Profiles
-  </message>
   <message name="IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE" desc="Label for the button that opens the multi-profile user manager.">
     Manage other profiles
   </message>
diff --git a/app/settings_brave_strings.grdp b/app/settings_brave_strings.grdp
index c5692fabe6dd..506a75eb9e89 100644
--- a/app/settings_brave_strings.grdp
+++ b/app/settings_brave_strings.grdp
@@ -107,12 +107,15 @@
   <message name="IDS_SETTINGS_RESTART_TO_APPLY_CHANGES" desc="Description in the snackbar to restart Brave and apply changes.">
     To apply your changes, relaunch Brave
   </message>
-  <message name="IDS_SETTINGS_SIGNIN_ALLOWED" desc="The title of the preference to allow to sign-in to Brave">
+
+  <if expr="not chromeos and not lacros">
+    <message name="IDS_SETTINGS_SIGNIN_ALLOWED" desc="The title of the preference to allow to sign-in to Brave">
     Allow Brave sign-in
-  </message>
-  <message name="IDS_SETTINGS_SIGNIN_ALLOWED_DESC" desc="The description of the preference to allow to sign-in to Brave">
+    </message>
+    <message name="IDS_SETTINGS_SIGNIN_ALLOWED_DESC" desc="The description of the preference to allow to sign-in to Brave">
     By turning this off, you can sign in to Brave sites like Gmail without signing in to Brave
-  </message>
+    </message>
+  </if>
 
   <!-- Site Settings -->
   <message name="IDS_SETTINGS_SITE_SETTINGS_PDFS_BLOCKED" desc="Label for the disabled option of the pdfs content setting.">
@@ -121,7 +124,13 @@
 
   <!-- Privacy Review -->
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_CLEAR_ON_EXIT_FEATURE_DESCRIPTION1" desc="A part of the feature description of 'clear cookies on exit' card in the privacy review.">
-    When you close Brave, it automatically clears cookies and site data from the pages you visited
+    When you close all Brave windows, cookies and site data are automatically cleared
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_CLEAR_ON_EXIT_FEATURE_DESCRIPTION2" desc="A part of the feature description of 'clear cookies on exit' card in the privacy review.">
+    You will be <ph name="BEGIN_BOLD">&lt;b&gt;</ph>signed out of most sites<ph name="END_BOLD">&lt;/b&gt;</ph> when you close Brave. If sync is off, you will also be <ph name="BEGIN_BOLD">&lt;b&gt;</ph>signed out of Brave services and Brave<ph name="END_BOLD">&lt;/b&gt;</ph>.
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_CLEAR_ON_EXIT_FEATURE_DESCRIPTION3" desc="A part of the feature description of 'clear cookies on exit' card in the privacy review.">
+    Sites you visit remember your information until you close Brave
   </message>
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_WELCOME_CARD_HEADER" desc="A header shown at the top of the welcome card in the privacy review, explaining to users that they can review their most important privacy and security settings in the privacy review.">
     Customize some of Brave’s most important privacy choices
@@ -129,6 +138,12 @@
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_WELCOME_CARD_SUB_HEADER" desc="A subheader shown at on the welcome card in the privacy review, explaining to users that Brave has default settings but they can customize them if they like.">
     The default settings work for most profiles, but you can customize them to fit how you like to use Brave
   </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_SAFE_BROWSING_CARD_STANDARD_PROTECTION_FEATURE_DESCRIPTION2" desc="A part of the feature description of the standard protection section of the safe browsing card in the privacy review.">
+    Checks URLs with a list of unsafe sites stored in Brave
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_SAFE_BROWSING_CARD_STANDARD_PROTECTION_PRIVACY_DESCRIPTION1" desc="A part of the privacy description of the standard protection section of the safe browsing card in the privacy review.">
+    If a site tries to steal your password, or when you download a harmful file, Brave may also send URLs, including bits of page content, to Safe Browsing
+  </message>
 
   <!-- Safety check -->
   <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE" desc="This text describes what the safety check is. (It's an area of the Settings page where users can quickly check whether their safety-related settings are fully protecting them.)">
@@ -150,6 +165,14 @@
     Safe Browsing is off. Brave recommends turning it on.
   </message>
 
+  <!-- Safe Browsing -->
+  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_TWO" desc="Second bullet point under the safe browsing enhanced protection mode">
+    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_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO" desc="First bullet point under the safe browsing standard protection mode">
+    Checks URLs with a list of unsafe sites stored in Brave. If a site tries to steal your password, or when you download a harmful file, Brave may also send URLs, including bits of page content, to Safe Browsing.
+  </message>
+
   <!-- Profiles Page -->
   <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR" desc="Warning message displayed in the Sign out of Brave dialog that indicates profile browsing data will be removed from the device.">
     This will delete 1 item from this device. To retrieve your data later, sign in to Brave as <ph name="USER_EMAIL">$1<ex>foo@example.com</ex></ph>.
diff --git a/app/settings_brave_strings_override.grdp b/app/settings_brave_strings_override.grdp
index 05deda031053..cd62f2d073c4 100644
--- a/app/settings_brave_strings_override.grdp
+++ b/app/settings_brave_strings_override.grdp
@@ -15,10 +15,12 @@
   <if expr="chromeos or lacros">
     </if>
 
+  <if expr="not chromeos and not lacros">
+    </if>
+
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_WELCOME_CARD_SUB_HEADER" desc="A subheader shown at on the welcome card in the privacy review, explaining to users that Brave has default settings but they can customize them if they like.">
     The default settings work for most profiles, but you can customize them to fit how you like to use Brave
   </message>
-
   <if expr="not chromeos">
   </if>
   <if expr="chromeos">
diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp
index 9363f0e61dd3..986bf2a94966 100644
--- a/app/settings_strings.grdp
+++ b/app/settings_strings.grdp
@@ -282,6 +282,9 @@
   <message name="IDS_SETTINGS_AUTOFILL_DETAIL" desc="Description of what toggling the 'Autofill' setting does. Immediately underneath IDS_SETTINGS_AUTOFILL">
     Enable Autofill to fill out forms in a single click
   </message>
+  <message name="IDS_SETTINGS_AUTOFILL_MORE_ACTIONS_FOR_ADDRESS" desc="The (accessibility) title of a button, which brings up a menu of actions that can be taken on a stored autofill address. The address is described by the name of the recipient and usually the beginning of the address (i.e. street name and building number). The name and the address are separated by comma.">
+    More actions for <ph name="ADDRESS_SUMMARY">$1<ex>John Doe, 123 Main Street</ex></ph>
+  </message>
   <message name="IDS_SETTINGS_ADDRESS_REMOVE" desc="Label for a context menu item that removes the selected address." meaning="Remove selected address.">
     Remove
   </message>
@@ -1247,9 +1250,6 @@
   </if>
 
   <!-- Privacy Page -->
-  <message name="IDS_SETTINGS_PRIVACY" desc="Name of the settings page which allows users to modify privacy and security settings.">
-    Privacy and security
-  </message>
   <message name="IDS_SETTINGS_PRIVACY_V2" desc="Name of the settings page which allows users to modify privacy and security settings.">
     Security and Privacy
   </message>
@@ -1356,17 +1356,23 @@
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_WHAT_YOU_SHARE_WITH_GOOGLE" desc="Header of a text column that describes the information a feature shares with Brave.">
     What you share with Brave
   </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_WHAT_YOU_SHARE_WITH_WEBSITES" desc="Header of a text column that describes the information a feature shares with websites.">
+    What you share with websites
+  </message>
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_WELCOME_CARD_START_BUTTON" desc="Text of a button in the welcome card in the privacy review that starts the privacy review.">
     Get started
   </message>
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_WELCOME_CARD_DONT_SHOW_AGAIN_CHECKBOX" desc="Text of a checkbox in the welcome card in the privacy review that prevents the welcome card from being shown again in the future.">
-    Don’t show again
+    Don’t show this step again
   </message>
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_COMPLETION_CARD_HEADER" desc="A header shown at the top of the completion card in the privacy review that informs users that they completed the privacy review.">
-    Review completed!
+    Review complete!
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COMPLETION_CARD_SUB_HEADER" desc="A subheader shown at the top of the completion card in the privacy review that informs users that they can explore more settings or complete the privacy review.">
+    Explore more settings below or finish now
   </message>
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_COMPLETION_CARD_LEAVE_BUTTON" desc="Text of a button in the completion car in the privacy review that leads the user back to Brave settings.">
-    Back to settings
+    Done
   </message>
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_MSBB_CARD_HEADER" desc="Header of the 'make searches and browsing better' card in the privacy review.">
     Review settings for search and browsing optimization
@@ -1389,9 +1395,6 @@
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_CLEAR_ON_EXIT_CARD_HEADER" desc="Header of the 'clear cookies on exit' card in the privacy review.">
     Review automatic data clearing
   </message>
-  <message name="IDS_SETTINGS_PRIVACY_REVIEW_CLEAR_ON_EXIT_FEATURE_DESCRIPTION2" desc="A part of the feature description of 'clear cookies on exit' card in the privacy review.">
-    Sites you visit can still remember your information until you close Brave
-  </message>
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_HISTORY_SYNC_CARD_HEADER" desc="Header of the history sync card in the privacy review.">
     Review whether to sync history
   </message>
@@ -1404,6 +1407,48 @@
   <message name="IDS_SETTINGS_PRIVACY_REVIEW_HISTORY_SYNC_PRIVACY_DESCRIPTION1" desc="A part of the privacy description of history sync in the privacy review.">
     The URLs you visit are saved to your Brave sync chain
   </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_HEADER" desc="Header of the cookies card in the privacy review.">
+    Choose when to block third-party cookies
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_BLOCK_TPC_INCOGNITO_SUBHEADER" desc="A subheader for the cookies card of the privacy review, for blocking third party cookies in private.">
+    Block third-party cookies in Private
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_BLOCK_TPC_INCOGNITO_FEATURE_DESCRIPTION1" desc="A part of the feature description of the third party cookie blocking in private section of the cookies card in the privacy review.">
+    Sites can use cookies to improve your browsing experience, for example, to keep you signed in or to remember items in your shopping cart
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_BLOCK_TPC_INCOGNITO_FEATURE_DESCRIPTION2" desc="A part of the feature description of the third party cookie blocking in private section of the cookies card in the privacy review.">
+    Features on some sites may not work
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_BLOCK_TPC_INCOGNITO_PRIVACY_DESCRIPTION1" desc="A part of the privacy description of the third party cookie blocking in private section of the cookies card in the privacy review.">
+    When you aren't in Private mode, sites can use cookies to see your browsing activity across different sites, for example, to personalize ads
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_BLOCK_TPC_SUBHEADER" desc="A subheader for the cookies card of the privacy review, for blocking third party cookies.">
+    Block all third-party cookies
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_BLOCK_TPC_FEATURE_DESCRIPTION1" desc="A part of the feature description of the third party cookie blocking section of the cookies card in the privacy review.">
+    Sites can use cookies to improve your browsing experience, for example, to keep you signed in or to remember items in your shopping cart
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_BLOCK_TPC_FEATURE_DESCRIPTION2" desc="A part of the feature description of the third party cookie blocking section of the cookies card in the privacy review.">
+    Features on some sites may not work
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_BLOCK_TPC_PRIVACY_DESCRIPTION1" desc="A part of the privacy description of the third party cookie blocking section of the cookies card in the privacy review.">
+    Sites can only use your cookies to see your browsing activity on their own site
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_SAFE_BROWSING_CARD_HEADER" desc="Header of the safe browsing card in the privacy review.">
+    Choose your Safe Browsing protection
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_SAFE_BROWSING_CARD_ENHANCED_PROTECTION_PRIVACY_DESCRIPTION1" desc="A part of the privacy description of the enhanced protection section of the safe browsing card in the privacy review.">
+    Sends URLs to Safe Browsing to check them
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_SAFE_BROWSING_CARD_ENHANCED_PROTECTION_PRIVACY_DESCRIPTION2" desc="A part of the privacy description of the enhanced protection section of the safe browsing card in the privacy review.">
+    Also sends a small sample of pages, downloads, extension activity, and system information to help discover new threats
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_SAFE_BROWSING_CARD_ENHANCED_PROTECTION_PRIVACY_DESCRIPTION3" desc="A part of the privacy description of the enhanced protection section of the safe browsing card in the privacy review.">
+    Temporarily links this data to your Brave sync chain when you're signed in, to protect you across Brave apps
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_SAFE_BROWSING_CARD_STANDARD_PROTECTION_FEATURE_DESCRIPTION1" desc="A part of the feature description of the standard protection section of the safe browsing card in the privacy review.">
+    Detects and warns you about dangerous events when they happen
+  </message>
 
   <!-- Safety check -->
   <message name="IDS_SETTINGS_SAFETY_CHECK_SECTION_TITLE" desc="'Safety check' is a noun phrase (sentence case). 'Safety check' refers to an area of the Settings page where users can quickly check whether their safety-related settings are fully protecting them.">
@@ -1598,9 +1643,6 @@
   <message name="IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC" desc="Checkbox label: should Brave protect user and user's device from dangerous sites">
     Sends URLs of some pages you visit to Google, when your security is at risk
   </message>
-  <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING" desc="The section title of the extended safe browsing checkbox to help improve safe browsing">
-    Help improve Brave security
-  </message>
   <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC" desc="Description for extended safe browsing">
     Sends URLs of some pages you visit, limited system information, and some page content to Brave, to help discover new threats and protect everyone on the web.
   </message>
@@ -1619,9 +1661,6 @@
   <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE" desc="First bullet point under the safe browsing enhanced protection mode">
     Predicts and warns you about dangerous events before they happen
   </message>
-  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_TWO" desc="Second bullet point under the safe browsing enhanced protection mode">
-    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_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE" desc="Third bullet point under the safe browsing enhanced protection mode">
     Improves security for you and everyone on the web
   </message>
@@ -1643,9 +1682,6 @@
   <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE" desc="First bullet point under the safe browsing standard protection mode">
     Detects and warns you about dangerous events when they happen
   </message>
-  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO" desc="First bullet point under the safe browsing standard protection mode">
-    Checks URLs with a list of unsafe sites stored in Brave. If a site tries to steal your password, or when you download a harmful file, Brave may also send URLs, including bits of page content, to Safe Browsing.
-  </message>
   <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE" desc="The name of the toggle to enable reporting to help improve safe browsing">
     Help improve security on the web for everyone
   </message>
@@ -3297,7 +3333,7 @@
     Control how your browsing history is used to personalize Search and more
   </message>
 
-  <if expr="not chromeos">
+  <if expr="not chromeos and not lacros">
     <!-- Import Settings Dialog -->
     <message name="IDS_SETTINGS_IMPORT_SETTINGS_TITLE" desc="Dialog title for import dialog.">
       Import bookmarks and settings
diff --git a/app/settings_strings_override.grdp b/app/settings_strings_override.grdp
index cf1b607debcb..94389102b635 100644
--- a/app/settings_strings_override.grdp
+++ b/app/settings_strings_override.grdp
@@ -60,6 +60,12 @@
   <if expr="chromeos or lacros">
     </if>
 
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_BLOCK_TPC_INCOGNITO_SUBHEADER" desc="A subheader for the cookies card of the privacy review, for blocking third party cookies in private.">
+    Block third-party cookies in Private
+  </message>
+  <message name="IDS_SETTINGS_PRIVACY_REVIEW_COOKIES_CARD_BLOCK_TPC_INCOGNITO_PRIVACY_DESCRIPTION1" desc="A part of the privacy description of the third party cookie blocking in private section of the cookies card in the privacy review.">
+    When you aren't in Private mode, sites can use cookies to see your browsing activity across different sites, for example, to personalize ads
+  </message>
   <if expr="is_win and _google_chrome">
     </if>
 
@@ -89,7 +95,7 @@
   <if expr="not chromeos">
     </if>
 
-  <if expr="not chromeos">
+  <if expr="not chromeos and not lacros">
     </if>
 
   <if expr="not chromeos and not lacros">
diff --git a/app/shared_settings_strings.grdp b/app/shared_settings_strings.grdp
index 5942266b9fd5..43f932260800 100644
--- a/app/shared_settings_strings.grdp
+++ b/app/shared_settings_strings.grdp
@@ -390,4 +390,17 @@
         Theme
     </message>
   </if>
+
+  <!-- Password Prompt Dialog -->
+  <if expr="chromeos or lacros">
+    <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE" desc="Title of the password prompt dialog popup.">
+      Confirm your password
+    </message>
+    <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL" desc="An input box label that tells the user to enter their password in that input box.">
+      Password
+    </message>
+    <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD" desc="Text on a password field that tells the user the password is incorrect.">
+      Invalid password
+    </message>
+  </if>
 </grit-part>
diff --git a/app/shared_settings_strings_override.grdp b/app/shared_settings_strings_override.grdp
index acc14c488a31..08e0f62ae140 100644
--- a/app/shared_settings_strings_override.grdp
+++ b/app/shared_settings_strings_override.grdp
@@ -17,4 +17,7 @@
     </if>
   <if expr="not chromeos">
       </if>
+
+  <if expr="chromeos or lacros">
+    </if>
 </grit-part>
diff --git a/app/sharesheet_strings.grdp b/app/sharesheet_strings.grdp
index c64457d3ff8c..221d58b626bc 100644
--- a/app/sharesheet_strings.grdp
+++ b/app/sharesheet_strings.grdp
@@ -26,4 +26,7 @@
       =1 {{COUNT} file}
       other {{COUNT} files}}
   </message>
+  <message name="IDS_SHARESHEET_COPY_TO_CLIPBOARD_SHARE_ACTION_LABEL" desc="The label for the button in the sharesheet that copies the data the user has selected to the clipboard.">
+    Copy to clipboard
+  </message>
 </grit-part>
diff --git a/browser/binance/binance_protocol_handler.cc b/browser/binance/binance_protocol_handler.cc
index 3d12c4db5367..a619347a908c 100644
--- a/browser/binance/binance_protocol_handler.cc
+++ b/browser/binance/binance_protocol_handler.cc
@@ -5,8 +5,8 @@
 
 #include "brave/browser/binance/binance_protocol_handler.h"
 
-#include <string>
 #include <map>
+#include <string>
 #include <utility>
 
 #include "base/strings/strcat.h"
@@ -19,9 +19,11 @@
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "net/base/escape.h"
 #include "net/base/url_util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
+#include "url/origin.h"
 
 namespace {
 
@@ -42,10 +44,12 @@ void LoadNewTabURL(const GURL& url,
 
   // We should only allow binance scheme to be used from
   // https://accounts.binance.com
-  GURL allowed_origin("https://accounts.binance.com");
-  if (web_contents->GetLastCommittedURL().GetOrigin() != allowed_origin ||
-      !initiating_origin.has_value() ||
-      initiating_origin.value().GetURL() != allowed_origin) {
+  url::Origin allowed_origin =
+      url::Origin::Create(GURL("https://accounts.binance.com"));
+  url::Origin last_committed_origin =
+      url::Origin::Create(web_contents->GetLastCommittedURL());
+  if (last_committed_origin != allowed_origin ||
+      !initiating_origin.has_value() || initiating_origin != allowed_origin) {
     return;
   }
 
@@ -57,13 +61,13 @@ void LoadNewTabURL(const GURL& url,
     std::string auth_token = parts["code"];
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
-    BinanceServiceFactory::GetInstance()
-      ->GetForProfile(profile)
-      ->SetAuthToken(auth_token);
+    BinanceServiceFactory::GetInstance()->GetForProfile(profile)->SetAuthToken(
+        auth_token);
   }
 
   web_contents->GetController().LoadURL(GURL("chrome://newtab?binanceAuth=1"),
-      content::Referrer(), page_transition, std::string());
+                                        content::Referrer(), page_transition,
+                                        std::string());
 }
 
 }  // namespace
diff --git a/browser/brave_content_browser_client_browsertest.cc b/browser/brave_content_browser_client_browsertest.cc
index 512674da1df7..442a836d98f5 100644
--- a/browser/brave_content_browser_client_browsertest.cc
+++ b/browser/brave_content_browser_client_browsertest.cc
@@ -34,6 +34,7 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "net/dns/mock_host_resolver.h"
+#include "url/origin.h"
 
 class BraveContentBrowserClientTest : public InProcessBrowserTest {
  public:
@@ -501,7 +502,11 @@ IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientReferrerTest,
   blink::mojom::ReferrerPtr referrer = kReferrer.Clone();
   client()->MaybeHideReferrer(browser()->profile(), kRequestUrl, kDocumentUrl,
                               &referrer);
-  EXPECT_EQ(referrer->url, kDocumentUrl.GetOrigin());
+
+  // Creating an Origin off a GURL should generally be avoided, but it's ok in
+  // this particular case where we're just testing and using the http protocol.
+  GURL document_url_origin = url::Origin::Create(kDocumentUrl).GetURL();
+  EXPECT_EQ(referrer->url, document_url_origin);
 
   // Same-origin navigations get full referrers.
   referrer = kReferrer.Clone();
@@ -513,13 +518,13 @@ IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientReferrerTest,
   referrer = kReferrer.Clone();
   client()->MaybeHideReferrer(browser()->profile(), kSameSiteRequestUrl,
                               kDocumentUrl, &referrer);
-  EXPECT_EQ(referrer->url, kDocumentUrl.GetOrigin());
+  EXPECT_EQ(referrer->url, document_url_origin);
 
   // Cross-origin iframe navigations get origins.
   referrer = kReferrer.Clone();
   client()->MaybeHideReferrer(browser()->profile(), kRequestUrl, kDocumentUrl,
                               &referrer);
-  EXPECT_EQ(referrer->url, kDocumentUrl.GetOrigin().spec());
+  EXPECT_EQ(referrer->url, document_url_origin);
 
   // Same-origin iframe navigations get full referrers.
   referrer = kReferrer.Clone();
@@ -545,11 +550,11 @@ IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientReferrerTest,
   referrer = kReferrer.Clone();
   client()->MaybeHideReferrer(browser()->profile(), kOnionUrl, kDocumentUrl,
                               &referrer);
-  EXPECT_EQ(referrer->url, kDocumentUrl.GetOrigin());  // normal -> .onion
+  EXPECT_EQ(referrer->url, document_url_origin);  // normal -> .onion
 
   // Allow referrers for certain URL.
   content_settings()->SetContentSettingCustomScope(
-      ContentSettingsPattern::FromString(kDocumentUrl.GetOrigin().spec() + "*"),
+      ContentSettingsPattern::FromString(document_url_origin.spec() + "*"),
       ContentSettingsPattern::Wildcard(), ContentSettingsType::BRAVE_REFERRERS,
       CONTENT_SETTING_ALLOW);
   referrer = kReferrer.Clone();
diff --git a/browser/brave_shields/ad_block_service_browsertest.cc b/browser/brave_shields/ad_block_service_browsertest.cc
index 4dab05ad52da..8c8da841fa45 100644
--- a/browser/brave_shields/ad_block_service_browsertest.cc
+++ b/browser/brave_shields/ad_block_service_browsertest.cc
@@ -238,8 +238,8 @@ bool AdBlockServiceTest::StartAdBlockRegionalServices() {
 }
 
 void AdBlockServiceTest::SetSubscriptionIntervals() {
-  auto initial_delay = base::TimeDelta::FromSeconds(2);
-  auto retry_interval = base::TimeDelta::FromSeconds(2);
+  auto initial_delay = base::Seconds(2);
+  auto retry_interval = base::Seconds(2);
 
   auto* ad_block_service = g_brave_browser_process->ad_block_service();
   auto* subscription_service_manager =
@@ -541,14 +541,14 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, SubFrame) {
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  ASSERT_EQ(true, EvalJs(contents->GetAllFrames()[1],
+  ASSERT_EQ(true, EvalJs(ChildFrameAt(contents, 0),
                          "setExpectations(0, 0, 0, 1);"
                          "xhr('adbanner.js?1')"));
   EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 1ULL);
 
   // Check also an explicit request for a script since it is a common real-world
   // scenario.
-  ASSERT_EQ(true, EvalJs(contents->GetAllFrames()[1],
+  ASSERT_EQ(true, EvalJs(ChildFrameAt(contents, 0),
                          R"(
                            new Promise(function (resolve, reject) {
                              var s = document.createElement('script');
@@ -575,14 +575,14 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, SubFrameShieldsOff) {
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_EQ(true, EvalJs(contents->GetAllFrames()[1],
+  EXPECT_EQ(true, EvalJs(ChildFrameAt(contents, 0),
                          "setExpectations(0, 0, 1, 0);"
                          "xhr('adbanner.js?1')"));
   EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 0ULL);
 
   // Check also an explicit request for a script since it is a common real-world
   // scenario.
-  EXPECT_EQ(true, EvalJs(contents->GetAllFrames()[1],
+  EXPECT_EQ(true, EvalJs(ChildFrameAt(contents, 0),
                          R"(
                            new Promise(function (resolve, reject) {
                              var s = document.createElement('script');
@@ -1205,7 +1205,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, FrameSourceURL) {
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  ASSERT_EQ(true, EvalJs(contents->GetAllFrames()[1],
+  ASSERT_EQ(true, EvalJs(ChildFrameAt(contents, 0),
                          "setExpectations(0, 0, 1, 0);"
                          "xhr('adbanner.js?1')"));
   EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 0ULL);
@@ -1214,7 +1214,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, FrameSourceURL) {
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
   contents = browser()->tab_strip_model()->GetActiveWebContents();
 
-  ASSERT_EQ(true, EvalJs(contents->GetAllFrames()[1],
+  ASSERT_EQ(true, EvalJs(ChildFrameAt(contents, 0),
                          "setExpectations(0, 0, 0, 1);"
                          "xhr('adbanner.js?1')"));
   EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 1ULL);
diff --git a/browser/brave_shields/brave_shields_web_contents_observer.cc b/browser/brave_shields/brave_shields_web_contents_observer.cc
index 3fa48a81354f..2d1dcb19b633 100644
--- a/browser/brave_shields/brave_shields_web_contents_observer.cc
+++ b/browser/brave_shields/brave_shields_web_contents_observer.cc
@@ -59,21 +59,26 @@ BraveShieldsWebContentsObserver* g_receiver_impl_for_testing = nullptr;
 // npm run test -- brave_browser_tests
 // --filter=BraveContentSettingsAgentImplBrowserTest.*
 void UpdateContentSettingsToRendererFrames(content::WebContents* web_contents) {
-  for (content::RenderFrameHost* frame : web_contents->GetAllFrames()) {
-    Profile* profile =
-        Profile::FromBrowserContext(web_contents->GetBrowserContext());
-    const HostContentSettingsMap* map =
-        HostContentSettingsMapFactory::GetForProfile(profile);
-    RendererContentSettingRules rules;
-    GetRendererContentSettingRules(map, &rules);
-    IPC::ChannelProxy* channel = frame->GetProcess()->GetChannel();
-    // channel might be NULL in tests.
-    if (channel) {
-      mojo::AssociatedRemote<chrome::mojom::RendererConfiguration> rc_interface;
-      channel->GetRemoteAssociatedInterface(&rc_interface);
-      rc_interface->SetContentSettingRules(rules);
-    }
-  }
+  web_contents->ForEachRenderFrameHost(
+      base::BindRepeating([](content::RenderFrameHost* frame) {
+        if (!frame->IsRenderFrameLive())
+          return;
+
+        IPC::ChannelProxy* channel = frame->GetProcess()->GetChannel();
+        // channel might be NULL in tests.
+        if (channel) {
+          const auto* map = HostContentSettingsMapFactory::GetForProfile(
+              frame->GetBrowserContext());
+
+          RendererContentSettingRules rules;
+          GetRendererContentSettingRules(map, &rules);
+
+          mojo::AssociatedRemote<chrome::mojom::RendererConfiguration>
+              rc_interface;
+          channel->GetRemoteAssociatedInterface(&rc_interface);
+          rc_interface->SetContentSettingRules(rules);
+        }
+      }));
 }
 
 }  // namespace
@@ -249,11 +254,15 @@ void BraveShieldsWebContentsObserver::ReadyToCommitNavigation(
     }
   }
 
-  auto render_frame_hosts = navigation_handle->GetWebContents()->GetAllFrames();
-  for (content::RenderFrameHost* rfh : render_frame_hosts) {
-    GetBraveShieldsRemote(rfh)->SetAllowScriptsFromOriginsOnce(
-        allowed_script_origins_);
-  }
+  navigation_handle->GetWebContents()->ForEachRenderFrameHost(
+      base::BindRepeating(
+          [](BraveShieldsWebContentsObserver* observer,
+             content::RenderFrameHost* rfh) {
+            observer->GetBraveShieldsRemote(rfh)
+                ->SetAllowScriptsFromOriginsOnce(
+                    observer->allowed_script_origins_);
+          },
+          base::Unretained(this)));
 }
 
 void BraveShieldsWebContentsObserver::AllowScriptsOnce(
diff --git a/browser/brave_stats/brave_stats_updater.cc b/browser/brave_stats/brave_stats_updater.cc
index 9f09a52cf810..aaa689c86a2d 100644
--- a/browser/brave_stats/brave_stats_updater.cc
+++ b/browser/brave_stats/brave_stats_updater.cc
@@ -134,9 +134,8 @@ void BraveStatsUpdater::Start() {
   DCHECK(!server_ping_periodic_timer_);
   server_ping_periodic_timer_ = std::make_unique<base::RepeatingTimer>();
   server_ping_periodic_timer_->Start(
-      FROM_HERE,
-      base::TimeDelta::FromSeconds(kUpdateServerPeriodicPingFrequencySeconds),
-      this, &BraveStatsUpdater::OnServerPingTimerFired);
+      FROM_HERE, base::Seconds(kUpdateServerPeriodicPingFrequencySeconds), this,
+      &BraveStatsUpdater::OnServerPingTimerFired);
 }
 
 void BraveStatsUpdater::Stop() {
@@ -357,8 +356,7 @@ void BraveStatsUpdater::OnDetectUncertainFuture(
 void BraveStatsUpdater::StartServerPingStartupTimer() {
   stats_startup_complete_ = true;
   server_ping_startup_timer_->Start(
-      FROM_HERE,
-      base::TimeDelta::FromSeconds(kUpdateServerStartupPingDelaySeconds), this,
+      FROM_HERE, base::Seconds(kUpdateServerStartupPingDelaySeconds), this,
       &BraveStatsUpdater::OnServerPingTimerFired);
 }
 
diff --git a/browser/brave_stats/brave_stats_updater_params.cc b/browser/brave_stats/brave_stats_updater_params.cc
index 4ab9e25d70ce..7b920b78739a 100644
--- a/browser/brave_stats/brave_stats_updater_params.cc
+++ b/browser/brave_stats/brave_stats_updater_params.cc
@@ -27,7 +27,7 @@ namespace brave_stats {
 base::Time BraveStatsUpdaterParams::g_current_time;
 bool BraveStatsUpdaterParams::g_force_first_run = false;
 static constexpr base::TimeDelta g_dtoi_delete_delta =
-    base::TimeDelta::FromSeconds(30 * 24 * 60 * 60);
+    base::Seconds(30 * 24 * 60 * 60);
 
 BraveStatsUpdaterParams::BraveStatsUpdaterParams(
     PrefService* stats_pref_service,
@@ -178,7 +178,7 @@ int BraveStatsUpdaterParams::GetCurrentISOWeekNumber() const {
 }
 
 base::Time BraveStatsUpdaterParams::GetReferenceTime() const {
-  return GetCurrentTimeNow() - base::TimeDelta::FromDays(1);
+  return GetCurrentTimeNow() - base::Days(1);
 }
 
 base::Time BraveStatsUpdaterParams::GetCurrentTimeNow() const {
diff --git a/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc b/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc
index 96c5e1415aff..c17886f8a27f 100644
--- a/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc
+++ b/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc
@@ -26,6 +26,7 @@
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/dns/mock_host_resolver.h"
+#include "url/origin.h"
 
 namespace {
 
@@ -135,8 +136,9 @@ IN_PROC_BROWSER_TEST_F(BraveWalletEthereumChainTest, AddEthereumChainApproved) {
                   ->IsShowingBubble());
   GetEthJsonRpcController()->AddEthereumChainRequestCompleted("0x38", true);
   base::RunLoop().RunUntilIdle();  // For FirePendingRequestCompleted
-  GetEthJsonRpcController()->NotifySwitchChainRequestProcessed(true,
-                                                               url.GetOrigin());
+  url::Origin url_origin = url::Origin::Create(url);
+  GetEthJsonRpcController()->NotifySwitchChainRequestProcessed(
+      true, url_origin.GetURL());
   auto result_first = EvalJs(contents, kScriptWaitForEvent,
                              content::EXECUTE_SCRIPT_USE_MANUAL_REPLY);
   EXPECT_EQ(base::Value(true), result_first.value);
@@ -254,8 +256,9 @@ IN_PROC_BROWSER_TEST_F(BraveWalletEthereumChainTest,
   // Add Ethereum chain but don't switch
   GetEthJsonRpcController()->AddEthereumChainRequestCompleted("0x11", true);
   base::RunLoop().RunUntilIdle();  // For FirePendingRequestCompleted
+  url::Origin urlB_origin = url::Origin::Create(urlB);
   GetEthJsonRpcController()->NotifySwitchChainRequestProcessed(
-      false, urlB.GetOrigin());
+      false, urlB_origin.GetURL());
   auto rejected_same_id = EvalJs(web_contentsB, kScriptWaitForEvent,
                                  content::EXECUTE_SCRIPT_USE_MANUAL_REPLY);
   EXPECT_EQ(base::Value(false), rejected_same_id.value);
@@ -306,8 +309,9 @@ IN_PROC_BROWSER_TEST_F(BraveWalletEthereumChainTest, AddDifferentChainsSwitch) {
   // Add Ethereum chain and switch
   GetEthJsonRpcController()->AddEthereumChainRequestCompleted("0x11", true);
   base::RunLoop().RunUntilIdle();  // For FirePendingRequestCompleted
+  url::Origin urlB_origin = url::Origin::Create(urlB);
   GetEthJsonRpcController()->NotifySwitchChainRequestProcessed(
-      true, urlB.GetOrigin());
+      true, urlB_origin.GetURL());
   auto rejected_same_id = EvalJs(web_contentsB, kScriptWaitForEvent,
                                  content::EXECUTE_SCRIPT_USE_MANUAL_REPLY);
   EXPECT_EQ(base::Value(true), rejected_same_id.value);
diff --git a/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc b/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc
index 17e67c7d226d..1796efd78be7 100644
--- a/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc
+++ b/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc
@@ -65,7 +65,7 @@ BraveWalletProviderDelegateImpl::~BraveWalletProviderDelegateImpl() = default;
 
 GURL BraveWalletProviderDelegateImpl::GetOrigin() const {
   auto* rfh = content::RenderFrameHost::FromID(host_id_);
-  return rfh ? rfh->GetLastCommittedURL().GetOrigin() : GURL();
+  return rfh ? rfh->GetLastCommittedOrigin().GetURL() : GURL();
 }
 
 void BraveWalletProviderDelegateImpl::ShowPanel() {
diff --git a/browser/brave_wallet/brave_wallet_provider_impl_unittest.cc b/browser/brave_wallet/brave_wallet_provider_impl_unittest.cc
index 2b38a30eba1f..026b084fb8c8 100644
--- a/browser/brave_wallet/brave_wallet_provider_impl_unittest.cc
+++ b/browser/brave_wallet/brave_wallet_provider_impl_unittest.cc
@@ -55,6 +55,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "url/origin.h"
 
 namespace brave_wallet {
 
@@ -274,7 +275,7 @@ class BraveWalletProviderImplUnitTest : public testing::Test {
   void Navigate(const GURL& url) { web_contents()->NavigateAndCommit(url); }
 
   GURL GetOrigin() {
-    return web_contents()->GetMainFrame()->GetLastCommittedURL().GetOrigin();
+    return web_contents()->GetMainFrame()->GetLastCommittedOrigin().GetURL();
   }
 
   void CreateBraveWalletTabHelper() {
diff --git a/browser/brave_wallet/brave_wallet_service_browsertest.cc b/browser/brave_wallet/brave_wallet_service_browsertest.cc
index 2d3328c51ba4..473348f52c47 100644
--- a/browser/brave_wallet/brave_wallet_service_browsertest.cc
+++ b/browser/brave_wallet/brave_wallet_service_browsertest.cc
@@ -3,8 +3,10 @@
  * 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/path_service.h"
 #include "base/test/scoped_feature_list.h"
 #include "brave/browser/brave_wallet/brave_wallet_service_factory.h"
+#include "brave/common/brave_paths.h"
 #include "brave/components/brave_wallet/browser/brave_wallet_service.h"
 #include "brave/components/brave_wallet/common/brave_wallet.mojom.h"
 #include "brave/components/brave_wallet/common/features.h"
@@ -63,36 +65,38 @@ class TestBraveWalletServiceObserver
 
 class BraveWalletServiceTest : public InProcessBrowserTest {
  public:
-  BraveWalletServiceTest() {
+  BraveWalletServiceTest()
+      : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {
     feature_list_.InitAndEnableFeature(
         brave_wallet::features::kNativeBraveWalletFeature);
+
+    brave::RegisterPathProvider();
+    base::FilePath test_data_dir;
+    base::PathService::Get(brave::DIR_TEST_DATA, &test_data_dir);
+    https_server_.SetSSLConfig(net::EmbeddedTestServer::CERT_TEST_NAMES);
+    https_server_.ServeFilesFromDirectory(test_data_dir);
+    EXPECT_TRUE(https_server_.Start());
   }
 
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
     host_resolver()->AddRule("*", "127.0.0.1");
-
-    https_server_.reset(new net::EmbeddedTestServer(
-        net::test_server::EmbeddedTestServer::TYPE_HTTPS));
-    https_server_->SetSSLConfig(net::EmbeddedTestServer::CERT_OK);
-    ASSERT_TRUE(https_server_->Start());
-
     wallet_service_ = brave_wallet::BraveWalletServiceFactory::GetInstance()
                           ->GetServiceForContext(browser()->profile());
   }
 
   BraveWalletService* wallet_service() { return wallet_service_; }
-  net::EmbeddedTestServer* https_server() { return https_server_.get(); }
+  const net::EmbeddedTestServer* https_server() const { return &https_server_; }
 
  private:
   BraveWalletService* wallet_service_;
-  std::unique_ptr<net::EmbeddedTestServer> https_server_;
+  net::EmbeddedTestServer https_server_;
   base::test::ScopedFeatureList feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(BraveWalletServiceTest, ActiveOrigin) {
-  GURL url = https_server()->GetURL("a.com", "/simple.html");
-  std::string expected_origin = url.GetOrigin().spec();
+  GURL url = https_server()->GetURL("a.test", "/simple.html");
+  std::string expected_origin = url::Origin::Create(url).Serialize();
   TestBraveWalletServiceObserver observer;
   wallet_service()->AddObserver(observer.GetReceiver());
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
@@ -104,8 +108,8 @@ IN_PROC_BROWSER_TEST_F(BraveWalletServiceTest, ActiveOrigin) {
   EXPECT_TRUE(callback_called);
   EXPECT_EQ(observer.active_origin(), expected_origin);
 
-  url = https_server()->GetURL("b.com", "/simple.html");
-  expected_origin = url.GetOrigin().spec();
+  url = https_server()->GetURL("b.test", "/simple.html");
+  expected_origin = url::Origin::Create(url).Serialize();
   callback_called = false;
   observer.Reset();
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
@@ -115,8 +119,8 @@ IN_PROC_BROWSER_TEST_F(BraveWalletServiceTest, ActiveOrigin) {
   EXPECT_TRUE(callback_called);
   EXPECT_EQ(observer.active_origin(), expected_origin);
 
-  url = https_server()->GetURL("c.com", "/simple.html");
-  expected_origin = url.GetOrigin().spec();
+  url = https_server()->GetURL("c.test", "/simple.html");
+  expected_origin = url::Origin::Create(url).Serialize();
   observer.Reset();
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
@@ -127,8 +131,8 @@ IN_PROC_BROWSER_TEST_F(BraveWalletServiceTest, ActiveOrigin) {
   EXPECT_TRUE(callback_called);
   EXPECT_EQ(observer.active_origin(), expected_origin);
 
-  url = https_server()->GetURL("d.com", "/simple.html");
-  expected_origin = url.GetOrigin().spec();
+  url = https_server()->GetURL("d.test", "/simple.html");
+  expected_origin = url::Origin::Create(url).Serialize();
   observer.Reset();
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), url, WindowOpenDisposition::NEW_WINDOW,
diff --git a/browser/brave_wallet/brave_wallet_service_delegate_impl.cc b/browser/brave_wallet/brave_wallet_service_delegate_impl.cc
index 6670214c053f..28d66171c972 100644
--- a/browser/brave_wallet/brave_wallet_service_delegate_impl.cc
+++ b/browser/brave_wallet/brave_wallet_service_delegate_impl.cc
@@ -167,11 +167,9 @@ void BraveWalletServiceDelegateImpl::FireActiveOriginChanged() {
 
 std::string BraveWalletServiceDelegateImpl::GetActiveOriginInternal() {
   content::WebContents* contents = GetActiveWebContents();
-  return contents ? contents->GetMainFrame()
-                        ->GetLastCommittedURL()
-                        .GetOrigin()
-                        .spec()
-                  : "";
+  return contents
+             ? contents->GetMainFrame()->GetLastCommittedOrigin().Serialize()
+             : "";
 }
 
 void BraveWalletServiceDelegateImpl::GetActiveOrigin(
diff --git a/browser/brave_wallet/brave_wallet_service_unittest.cc b/browser/brave_wallet/brave_wallet_service_unittest.cc
index 4eede3c22b87..9cb0b9af672a 100644
--- a/browser/brave_wallet/brave_wallet_service_unittest.cc
+++ b/browser/brave_wallet/brave_wallet_service_unittest.cc
@@ -1114,8 +1114,7 @@ TEST_F(BraveWalletServiceUnitTest, RecordWalletHistogram) {
   histogram_tester_->ExpectBucketCount(kBraveWalletMonthlyHistogramName, true,
                                        1);
 
-  service_->RecordWalletUsage(base::Time::Now() +
-                              base::TimeDelta::FromDays(31));
+  service_->RecordWalletUsage(base::Time::Now() + base::Days(31));
   histogram_tester_->ExpectBucketCount(kBraveWalletDailyHistogramName, false,
                                        2);
   histogram_tester_->ExpectBucketCount(kBraveWalletWeeklyHistogramName, false,
diff --git a/browser/brave_wallet/brave_wallet_sign_message_browsertest.cc b/browser/brave_wallet/brave_wallet_sign_message_browsertest.cc
index 1416f894028f..c66227464e4f 100644
--- a/browser/brave_wallet/brave_wallet_sign_message_browsertest.cc
+++ b/browser/brave_wallet/brave_wallet_sign_message_browsertest.cc
@@ -68,9 +68,6 @@ class BraveWalletSignMessageBrowserTest : public InProcessBrowserTest {
   content::WebContents* web_contents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
-  GURL GetLastCommitedOrigin() {
-    return web_contents()->GetLastCommittedURL().GetOrigin();
-  }
 
   net::EmbeddedTestServer* https_server() { return &https_server_; }
 
diff --git a/browser/brave_wallet/eth_tx_state_manager_unittest.cc b/browser/brave_wallet/eth_tx_state_manager_unittest.cc
index 65f25387254a..2a4e93822182 100644
--- a/browser/brave_wallet/eth_tx_state_manager_unittest.cc
+++ b/browser/brave_wallet/eth_tx_state_manager_unittest.cc
@@ -476,8 +476,8 @@ TEST_F(EthTxStateManagerUnitTest, TxMetaToTransactionInfo) {
   meta.from = EthAddress::FromHex("0x2f015c60e0be116b1f0cd534704db9c92118fb6a");
   base::Time::Exploded x{1981, 3, 0, 1, 2};
   EXPECT_TRUE(base::Time::FromUTCExploded(x, &meta.confirmed_time));
-  meta.submitted_time = meta.confirmed_time - base::TimeDelta::FromSeconds(3);
-  meta.created_time = meta.confirmed_time - base::TimeDelta::FromMinutes(1);
+  meta.submitted_time = meta.confirmed_time - base::Seconds(3);
+  meta.created_time = meta.confirmed_time - base::Minutes(1);
 
   mojom::TransactionInfoPtr ti =
       EthTxStateManager::TxMetaToTransactionInfo(meta);
diff --git a/browser/brave_wallet/external_wallets_importer.cc b/browser/brave_wallet/external_wallets_importer.cc
index 2c329792c40d..09644a09c379 100644
--- a/browser/brave_wallet/external_wallets_importer.cc
+++ b/browser/brave_wallet/external_wallets_importer.cc
@@ -10,9 +10,9 @@
 
 #include "base/base64.h"
 #include "base/bind.h"
-#include "base/bind_post_task.h"
 #include "base/json/json_reader.h"
 #include "base/strings/utf_string_conversion_utils.h"
+#include "base/task/bind_post_task.h"
 #include "base/task/thread_pool.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "brave/browser/ethereum_remote_client/buildflags/buildflags.h"
diff --git a/browser/brave_wallet/keyring_controller_unittest.cc b/browser/brave_wallet/keyring_controller_unittest.cc
index da4b1bf7dd41..261ef91b87e7 100644
--- a/browser/brave_wallet/keyring_controller_unittest.cc
+++ b/browser/brave_wallet/keyring_controller_unittest.cc
@@ -1769,11 +1769,11 @@ TEST_F(KeyringControllerUnitTest, AutoLock) {
   ASSERT_FALSE(controller.IsLocked());
 
   // Should not be locked yet after 4 minutes
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(4));
+  task_environment_.FastForwardBy(base::Minutes(4));
   ASSERT_FALSE(controller.IsLocked());
 
   // After the 5th minute, it should be locked
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(1));
+  task_environment_.FastForwardBy(base::Minutes(1));
   ASSERT_TRUE(controller.IsLocked());
   // Locking after it is auto locked won't cause a crash
   controller.Lock();
@@ -1785,7 +1785,7 @@ TEST_F(KeyringControllerUnitTest, AutoLock) {
                               base::Unretained(this)));
   base::RunLoop().RunUntilIdle();
   ASSERT_FALSE(controller.IsLocked());
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(5));
+  task_environment_.FastForwardBy(base::Minutes(5));
   ASSERT_TRUE(controller.IsLocked());
 
   // Locking before the timer fires won't cause any problems after the
@@ -1795,17 +1795,17 @@ TEST_F(KeyringControllerUnitTest, AutoLock) {
                               base::Unretained(this)));
   base::RunLoop().RunUntilIdle();
   ASSERT_FALSE(controller.IsLocked());
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(1));
+  task_environment_.FastForwardBy(base::Minutes(1));
   controller.Lock();
   ASSERT_TRUE(controller.IsLocked());
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(4));
+  task_environment_.FastForwardBy(base::Minutes(4));
   ASSERT_TRUE(controller.IsLocked());
 
   // Restoring keyring will auto lock too
   controller.Reset();
   controller.RestoreWallet(mnemonic, "brave", false, base::DoNothing());
   ASSERT_FALSE(controller.IsLocked());
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(6));
+  task_environment_.FastForwardBy(base::Minutes(6));
   ASSERT_TRUE(controller.IsLocked());
 
   // Changing the auto lock pref should reset the timer
@@ -1813,11 +1813,11 @@ TEST_F(KeyringControllerUnitTest, AutoLock) {
       "brave", base::BindOnce(&KeyringControllerUnitTest::GetBooleanCallback,
                               base::Unretained(this)));
   ASSERT_FALSE(controller.IsLocked());
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(4));
+  task_environment_.FastForwardBy(base::Minutes(4));
   GetPrefs()->SetInteger(kBraveWalletAutoLockMinutes, 3);
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(2));
+  task_environment_.FastForwardBy(base::Minutes(2));
   EXPECT_FALSE(controller.IsLocked());
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(1));
+  task_environment_.FastForwardBy(base::Minutes(1));
   EXPECT_TRUE(controller.IsLocked());
 
   // Changing the auto lock pref should reset the timer even if higher
@@ -1826,12 +1826,12 @@ TEST_F(KeyringControllerUnitTest, AutoLock) {
       "brave", base::BindOnce(&KeyringControllerUnitTest::GetBooleanCallback,
                               base::Unretained(this)));
   ASSERT_FALSE(controller.IsLocked());
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(2));
+  task_environment_.FastForwardBy(base::Minutes(2));
   EXPECT_FALSE(controller.IsLocked());
   GetPrefs()->SetInteger(kBraveWalletAutoLockMinutes, 10);
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(9));
+  task_environment_.FastForwardBy(base::Minutes(9));
   EXPECT_FALSE(controller.IsLocked());
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(1));
+  task_environment_.FastForwardBy(base::Minutes(1));
   EXPECT_TRUE(controller.IsLocked());
 }
 
@@ -1841,13 +1841,13 @@ TEST_F(KeyringControllerUnitTest, NotifyUserInteraction) {
   ASSERT_FALSE(controller.IsLocked());
 
   // Notifying of user interaction should keep the wallet unlocked
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(4));
+  task_environment_.FastForwardBy(base::Minutes(4));
   controller.NotifyUserInteraction();
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(1));
+  task_environment_.FastForwardBy(base::Minutes(1));
   controller.NotifyUserInteraction();
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(4));
+  task_environment_.FastForwardBy(base::Minutes(4));
   ASSERT_FALSE(controller.IsLocked());
-  task_environment_.FastForwardBy(base::TimeDelta::FromMinutes(1));
+  task_environment_.FastForwardBy(base::Minutes(1));
   ASSERT_TRUE(controller.IsLocked());
 }
 
diff --git a/browser/brave_wallet/send_transaction_browsertest.cc b/browser/brave_wallet/send_transaction_browsertest.cc
index f191f0532f13..dbc7b990e911 100644
--- a/browser/brave_wallet/send_transaction_browsertest.cc
+++ b/browser/brave_wallet/send_transaction_browsertest.cc
@@ -173,10 +173,6 @@ class SendTransactionBrowserTest : public InProcessBrowserTest {
     return HostContentSettingsMapFactory::GetForProfile(browser()->profile());
   }
 
-  GURL GetLastCommitedOrigin() {
-    return web_contents()->GetLastCommittedURL().GetOrigin();
-  }
-
   net::EmbeddedTestServer* https_server_for_files() {
     return &https_server_for_files_;
   }
diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate.cc b/browser/browsing_data/brave_browsing_data_remover_delegate.cc
index 422810d5f5d9..bc2459964978 100644
--- a/browser/browsing_data/brave_browsing_data_remover_delegate.cc
+++ b/browser/browsing_data/brave_browsing_data_remover_delegate.cc
@@ -116,8 +116,7 @@ void BraveBrowsingDataRemoverDelegate::WaitForIPFSRepoGC(
     // command should be finished in just a few seconds and we do not expect
     // this child process would hang forever. To be safe, we will wait for 30
     // seconds max here.
-    exited = process.WaitForExitWithTimeout(base::TimeDelta::FromSeconds(30),
-                                            nullptr);
+    exited = process.WaitForExitWithTimeout(base::Seconds(30), nullptr);
   }
 
   if (!exited)
diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc b/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc
index a32d7a4465e8..1c144a1b459c 100644
--- a/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc
+++ b/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc
@@ -73,7 +73,7 @@ TEST_F(BraveBrowsingDataRemoverDelegateTest, ShieldsSettingsClearTest) {
       CONTENT_SETTING_BLOCK);
 
   const base::Time kNow = base::Time::Now();
-  const base::Time k1DaysOld = kNow - base::TimeDelta::FromDays(1);
+  const base::Time k1DaysOld = kNow - base::Days(1);
 
   // Check current shields settings count is 2 and zero after clearing 1 day
   // time range.
diff --git a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
index 97bcbed9f58d..d54047ebc253 100644
--- a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
+++ b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc
@@ -8,8 +8,8 @@
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
-#include "base/single_thread_task_runner.h"
 #include "base/task/post_task.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/test/scoped_feature_list.h"
 #include "brave/browser/browsing_data/brave_clear_browsing_data.h"
 #include "chrome/app/chrome_command_ids.h"
diff --git a/browser/component_updater/brave_component_updater_delegate.cc b/browser/component_updater/brave_component_updater_delegate.cc
index 751841ae5542..ac6ad07865cc 100644
--- a/browser/component_updater/brave_component_updater_delegate.cc
+++ b/browser/component_updater/brave_component_updater_delegate.cc
@@ -7,8 +7,8 @@
 
 #include <utility>
 
-#include "base/sequenced_task_runner.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
 #include "brave/browser/component_updater/brave_component_installer.h"
 #include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h"
diff --git a/browser/download/brave_download_item_model.cc b/browser/download/brave_download_item_model.cc
index d8f0cccc46ff..35af13d28f39 100644
--- a/browser/download/brave_download_item_model.cc
+++ b/browser/download/brave_download_item_model.cc
@@ -17,6 +17,7 @@
 #include "ui/gfx/text_constants.h"
 #include "ui/gfx/text_elider.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 #include "url/url_constants.h"
 
 using download::DownloadItem;
@@ -59,9 +60,16 @@ std::u16string BraveDownloadItemModel::GetOriginURLText(bool* is_secure) {
     if (gurl.SchemeIs(url::kAboutScheme)) {
       origin = gurl.spec();
     } else {
-      origin = gurl.GetOrigin().spec();
-      if (!gurl.SchemeIsFile()) {
-        base::TrimString(origin, "/", &origin);
+      origin = url::Origin::Create(gurl).Serialize();
+      if (gurl.SchemeIsFile()) {
+        // url::Origin::Serialize() does an ASCII serialization of the Origin as
+        // per Section 6.2 of RFC 6454, with the addition that all Origins with
+        // a 'file' scheme serialize to "file://" (see url/origin.{h,cc}).
+        DCHECK_EQ(origin, "file://");
+
+        // However, we want to return 'file:///' (with a trailing '/') in this
+        // case, see the BraveDownloadItemModelTest.GetOriginUrlText unit test.
+        origin = "file:///";
       }
     }
   } else {
diff --git a/browser/ephemeral_storage/ephemeral_storage_browsertest.cc b/browser/ephemeral_storage/ephemeral_storage_browsertest.cc
index 30439cdd4be2..71636fde54b1 100644
--- a/browser/ephemeral_storage/ephemeral_storage_browsertest.cc
+++ b/browser/ephemeral_storage/ephemeral_storage_browsertest.cc
@@ -157,7 +157,7 @@ void EphemeralStorageBrowserTest::SetUpOnMainThread() {
       "a.com", "/ephemeral_storage_with_network_cookies.html");
 
   ephemeral_storage::EphemeralStorageTabHelper::SetKeepAliveTimeDelayForTesting(
-      base::TimeDelta::FromSeconds(kKeepAliveInterval));
+      base::Seconds(kKeepAliveInterval));
 }
 
 void EphemeralStorageBrowserTest::SetUpHttpsServer() {
@@ -275,8 +275,7 @@ content::EvalJsResult EphemeralStorageBrowserTest::GetCookiesInFrame(
 void EphemeralStorageBrowserTest::WaitForCleanupAfterKeepAlive() {
   base::RunLoop run_loop;
   base::SequencedTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE, run_loop.QuitClosure(),
-      base::TimeDelta::FromSeconds(kKeepAliveInterval));
+      FROM_HERE, run_loop.QuitClosure(), base::Seconds(kKeepAliveInterval));
   run_loop.Run();
 }
 
diff --git a/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc b/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc
index b51672cf4660..6b061da30d25 100644
--- a/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc
+++ b/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc
@@ -144,7 +144,7 @@ void EphemeralStorageTabHelper::CreateEphemeralStorageAreasForDomainAndURL(
             &EphemeralStorageTabHelper::ClearEphemeralLifetimeKeepalive,
             weak_factory_.GetWeakPtr(), tld_ephemeral_lifetime_->key()),
         g_storage_keep_alive_for_testing.is_min()
-            ? base::TimeDelta::FromSeconds(
+            ? base::Seconds(
                   net::features::kBraveEphemeralStorageKeepAliveTimeInSeconds
                       .Get())
             : g_storage_keep_alive_for_testing);
diff --git a/browser/ethereum_remote_client/ethereum_remote_client_service.cc b/browser/ethereum_remote_client/ethereum_remote_client_service.cc
index 730d06649adc..d7649619f941 100644
--- a/browser/ethereum_remote_client/ethereum_remote_client_service.cc
+++ b/browser/ethereum_remote_client/ethereum_remote_client_service.cc
@@ -14,8 +14,8 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/post_task.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "brave/browser/ethereum_remote_client/ethereum_remote_client_constants.h"
 #include "brave/browser/ethereum_remote_client/ethereum_remote_client_delegate.h"
 #include "brave/browser/ethereum_remote_client/pref_names.h"
diff --git a/browser/extensions/api/brave_shields_api_browsertest.cc b/browser/extensions/api/brave_shields_api_browsertest.cc
index 0a0c7943b652..ced6418d9f9d 100644
--- a/browser/extensions/api/brave_shields_api_browsertest.cc
+++ b/browser/extensions/api/brave_shields_api_browsertest.cc
@@ -27,6 +27,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_builder.h"
 #include "net/dns/mock_host_resolver.h"
+#include "url/origin.h"
 
 namespace extensions {
 
@@ -82,13 +83,13 @@ class BraveShieldsAPIBrowserTest : public InProcessBrowserTest {
     function->set_has_callback(true);
 
     const GURL url(embedded_test_server()->GetURL(origin, "/simple.js"));
-    const std::string allow_origin = url.GetOrigin().spec();
+    url::Origin allow_origin = url::Origin::Create(url);
     int tabId = extensions::ExtensionTabUtil::GetTabId(active_contents());
 
-    RunFunctionAndReturnSingleResult(
-        function.get(),
-        "[[\"" + allow_origin + "\"], " + std::to_string(tabId) + "]",
-        browser());
+    RunFunctionAndReturnSingleResult(function.get(),
+                                     "[[\"" + allow_origin.Serialize() +
+                                         "\"], " + std::to_string(tabId) + "]",
+                                     browser());
 
     // reload page with a.test temporarily allowed
     active_contents()->GetController().Reload(content::ReloadType::NORMAL,
@@ -103,12 +104,13 @@ class BraveShieldsAPIBrowserTest : public InProcessBrowserTest {
     function->set_has_callback(true);
 
     const GURL url(embedded_test_server()->GetURL(origin, "/simple.js"));
-    const std::string allow_origin = url.GetOrigin().spec();
+    url::Origin allow_origin = url::Origin::Create(url);
 
     int tabId = extensions::ExtensionTabUtil::GetTabId(active_contents());
     RunFunctionAndReturnSingleResult(function.get(),
-                                     "[[\"" + allow_origin + "\",\"" + dataURL +
-                                         "\"], " + std::to_string(tabId) + "]",
+                                     "[[\"" + allow_origin.Serialize() +
+                                         "\",\"" + dataURL + "\"], " +
+                                         std::to_string(tabId) + "]",
                                      browser());
 
     // reload page with dataURL temporarily allowed
@@ -126,19 +128,19 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, AllowScriptsOnce) {
 
   EXPECT_TRUE(
       NavigateToURLUntilLoadStop("a.test", "/load_js_from_origins.html"));
-  EXPECT_EQ(active_contents()->GetAllFrames().size(), 1u)
+  EXPECT_EQ(CollectAllRenderFrameHosts(active_contents()).size(), 1u)
       << "All script loadings should be blocked.";
 
   AllowScriptOriginOnce("a.test");
 
   EXPECT_TRUE(WaitForLoadStop(active_contents()));
-  EXPECT_EQ(active_contents()->GetAllFrames().size(), 2u)
+  EXPECT_EQ(CollectAllRenderFrameHosts(active_contents()).size(), 2u)
       << "Scripts from a.test should be temporarily allowed.";
 
   // reload page again
   active_contents()->GetController().Reload(content::ReloadType::NORMAL, true);
   EXPECT_TRUE(WaitForLoadStop(active_contents()));
-  EXPECT_EQ(active_contents()->GetAllFrames().size(), 2u)
+  EXPECT_EQ(CollectAllRenderFrameHosts(active_contents()).size(), 2u)
       << "Scripts from a.test should be temporarily allowed after reload.";
 
   // same doc navigation
@@ -146,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, AllowScriptsOnce) {
       browser(), embedded_test_server()->GetURL(
                      "a.test", "/load_js_from_origins.html#foo")));
   EXPECT_TRUE(WaitForLoadStop(active_contents()));
-  EXPECT_EQ(active_contents()->GetAllFrames().size(), 2u)
+  EXPECT_EQ(CollectAllRenderFrameHosts(active_contents()).size(), 2u)
       << "Scripts from a.test should be temporarily allowed for same doc "
          "navigation.";
 
@@ -155,20 +157,20 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, AllowScriptsOnce) {
       browser(),
       embedded_test_server()->GetURL("b.test", "/load_js_from_origins.html")));
   EXPECT_TRUE(WaitForLoadStop(active_contents()));
-  EXPECT_EQ(active_contents()->GetAllFrames().size(), 1u)
+  EXPECT_EQ(CollectAllRenderFrameHosts(active_contents()).size(), 1u)
       << "All script loadings should be blocked after navigating away.";
 }
 
 IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, AllowScriptsOnceDataURL) {
   EXPECT_TRUE(
       NavigateToURLUntilLoadStop("a.test", "/load_js_from_origins.html"));
-  EXPECT_EQ(active_contents()->GetAllFrames().size(), 4u)
+  EXPECT_EQ(CollectAllRenderFrameHosts(active_contents()).size(), 4u)
       << "All script loadings should not be blocked by default.";
 
   BlockScripts();
   EXPECT_TRUE(
       NavigateToURLUntilLoadStop("a.test", "/load_js_from_origins.html"));
-  EXPECT_EQ(active_contents()->GetAllFrames().size(), 1u)
+  EXPECT_EQ(CollectAllRenderFrameHosts(active_contents()).size(), 1u)
       << "All script loadings should be blocked.";
 
   AllowScriptOriginAndDataURLOnce(
@@ -178,7 +180,7 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, AllowScriptsOnceDataURL) {
       "50LmJvZHkuYXBwZW5kQ2hpbGQoZnJhbWUpOw==");
 
   EXPECT_TRUE(WaitForLoadStop(active_contents()));
-  EXPECT_EQ(active_contents()->GetAllFrames().size(), 3u)
+  EXPECT_EQ(CollectAllRenderFrameHosts(active_contents()).size(), 3u)
       << "Scripts from a.test and data URL should be temporarily allowed.";
 }
 
@@ -186,13 +188,13 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, AllowScriptsOnceIframe) {
   BlockScripts();
 
   EXPECT_TRUE(NavigateToURLUntilLoadStop("a.com", "/remote_iframe.html"));
-  EXPECT_EQ(active_contents()->GetAllFrames().size(), 2u)
+  EXPECT_EQ(CollectAllRenderFrameHosts(active_contents()).size(), 2u)
       << "All script loadings should be blocked.";
 
   AllowScriptOriginOnce("b.com");
 
   EXPECT_TRUE(WaitForLoadStop(active_contents()));
-  EXPECT_EQ(active_contents()->GetAllFrames().size(), 3u)
+  EXPECT_EQ(CollectAllRenderFrameHosts(active_contents()).size(), 3u)
       << "Scripts from b.com should be temporarily allowed.";
 }
 
@@ -213,8 +215,8 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest,
       new api::BraveShieldsGetNoScriptControlTypeFunction());
   get_function->set_extension(extension().get());
   std::unique_ptr<base::Value> value;
-  value.reset(RunFunctionAndReturnSingleResult(
-      get_function.get(), kJavascriptGetParams, browser()));
+  value = RunFunctionAndReturnSingleResult(get_function.get(),
+                                           kJavascriptGetParams, browser());
   EXPECT_EQ(value->GetString(), std::string("allow"));
 }
 
diff --git a/browser/extensions/api/brave_theme_api_browsertest.cc b/browser/extensions/api/brave_theme_api_browsertest.cc
index e237aee6924f..60f2511ed064 100644
--- a/browser/extensions/api/brave_theme_api_browsertest.cc
+++ b/browser/extensions/api/brave_theme_api_browsertest.cc
@@ -42,8 +42,7 @@ IN_PROC_BROWSER_TEST_F(BraveThemeAPIBrowserTest,
       new BraveThemeGetBraveThemeTypeFunction());
   get_function->set_extension(extension().get());
   std::unique_ptr<base::Value> value;
-  value.reset(RunFunctionAndReturnSingleResult(get_function.get(),
-                                               std::string("[]"),
-                                               browser()));
+  value = RunFunctionAndReturnSingleResult(get_function.get(),
+                                           std::string("[]"), browser());
   EXPECT_EQ(value->GetString(), "Light");
 }
diff --git a/browser/ftx/ftx_protocol_handler.cc b/browser/ftx/ftx_protocol_handler.cc
index ab0b88b8d2d2..5c5e77002abb 100644
--- a/browser/ftx/ftx_protocol_handler.cc
+++ b/browser/ftx/ftx_protocol_handler.cc
@@ -19,8 +19,10 @@
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "net/base/escape.h"
 #include "net/base/url_util.h"
+#include "url/origin.h"
 
 namespace {
 
@@ -39,17 +41,19 @@ void LoadNewTabURL(const GURL& url,
     return;
   }
 
-  GURL allowed_origin_one("https://ftx.us");
-  GURL allowed_origin_two("https://ftx.com");
+  url::Origin allowed_origin_one = url::Origin::Create(GURL("https://ftx.us"));
+  url::Origin allowed_origin_two = url::Origin::Create(GURL("https://ftx.com"));
 
   if (!initiating_origin.has_value()) {
     return;
   }
 
-  if (web_contents->GetLastCommittedURL().GetOrigin() != allowed_origin_one &&
-      web_contents->GetLastCommittedURL().GetOrigin() != allowed_origin_two &&
-      initiating_origin.value().GetURL() != allowed_origin_one &&
-      initiating_origin.value().GetURL() != allowed_origin_two) {
+  url::Origin last_committed_origin =
+      url::Origin::Create(web_contents->GetLastCommittedURL());
+  if (last_committed_origin != allowed_origin_one &&
+      last_committed_origin != allowed_origin_two &&
+      initiating_origin != allowed_origin_one &&
+      initiating_origin != allowed_origin_two) {
     return;
   }
 
diff --git a/browser/gemini/gemini_protocol_handler.cc b/browser/gemini/gemini_protocol_handler.cc
index 23287633a0c2..63cff024a5d0 100644
--- a/browser/gemini/gemini_protocol_handler.cc
+++ b/browser/gemini/gemini_protocol_handler.cc
@@ -19,12 +19,14 @@
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/escape.h"
 #include "net/base/url_util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace {
 
@@ -43,10 +45,12 @@ void LoadNewTabURL(const GURL& url,
     return;
   }
 
-  GURL allowed_origin("https://exchange.gemini.com");
-  if (web_contents->GetLastCommittedURL().GetOrigin() != allowed_origin ||
-      !initiating_origin.has_value() ||
-      initiating_origin.value().GetURL() != allowed_origin) {
+  url::Origin allowed_origin =
+      url::Origin::Create(GURL("https://exchange.gemini.com"));
+  url::Origin last_committed_origin =
+      url::Origin::Create(web_contents->GetLastCommittedURL());
+  if (last_committed_origin != allowed_origin ||
+      !initiating_origin.has_value() || initiating_origin != allowed_origin) {
     return;
   }
 
diff --git a/browser/importer/brave_external_process_importer_client.cc b/browser/importer/brave_external_process_importer_client.cc
index 3ce4ea710b22..743e5aad37a3 100644
--- a/browser/importer/brave_external_process_importer_client.cc
+++ b/browser/importer/brave_external_process_importer_client.cc
@@ -22,9 +22,9 @@ bool ShouldUseBraveImporter(importer::ImporterType type) {
 }  // namespace
 
 template <>
-inline sandbox::policy::SandboxType
+inline sandbox::mojom::Sandbox
 content::GetServiceSandboxType<brave::mojom::ProfileImport>() {
-  return sandbox::policy::SandboxType::kNoSandbox;
+  return sandbox::mojom::Sandbox::kNoSandbox;
 }
 
 BraveExternalProcessImporterClient::BraveExternalProcessImporterClient(
@@ -49,8 +49,6 @@ void BraveExternalProcessImporterClient::Start() {
   auto options = content::ServiceProcessHost::Options()
                      .WithDisplayName(IDS_UTILITY_PROCESS_PROFILE_IMPORTER_NAME)
                      .Pass();
-  options.sandbox_type =
-      content::GetServiceSandboxType<brave::mojom::ProfileImport>();
   content::ServiceProcessHost::Launch(
       brave_profile_import_.BindNewPipeAndPassReceiver(), std::move(options));
 
diff --git a/browser/ipfs/ipfs_tab_helper.cc b/browser/ipfs/ipfs_tab_helper.cc
index bfb6dcef712d..cb1e27311164 100644
--- a/browser/ipfs/ipfs_tab_helper.cc
+++ b/browser/ipfs/ipfs_tab_helper.cc
@@ -25,6 +25,7 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "net/http/http_status_code.h"
+#include "url/origin.h"
 
 namespace {
 
@@ -232,8 +233,9 @@ void IPFSTabHelper::UpdateDnsLinkButtonState() {
 }
 
 bool IPFSTabHelper::CanResolveURL(const GURL& url) const {
+  url::Origin url_origin = url::Origin::Create(url);
   return url.SchemeIsHTTPOrHTTPS() &&
-         !IsAPIGateway(url.GetOrigin(), chrome::GetChannel()) &&
+         !IsAPIGateway(url_origin.GetURL(), chrome::GetChannel()) &&
          !IsDefaultGatewayURL(url, pref_service_);
 }
 
diff --git a/browser/net/brave_network_audit_browsertest.cc b/browser/net/brave_network_audit_browsertest.cc
index 0a3d8b06e89e..af43bea25a78 100644
--- a/browser/net/brave_network_audit_browsertest.cc
+++ b/browser/net/brave_network_audit_browsertest.cc
@@ -54,8 +54,7 @@ constexpr const char* kPrivateIPRegexps[] = {
 void WaitForTimeout(int timeout) {
   base::RunLoop run_loop;
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE, run_loop.QuitClosure(),
-      base::TimeDelta::FromMilliseconds(timeout));
+      FROM_HERE, run_loop.QuitClosure(), base::Milliseconds(timeout));
   run_loop.Run();
 }
 
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 f95d11173eb3..8af382d0be38 100644
--- a/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc
+++ b/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc
@@ -22,6 +22,7 @@
 #include "content/public/test/test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/default_handlers.h"
+#include "url/origin.h"
 
 class BraveSiteHacksNetworkDelegateBrowserTest : public InProcessBrowserTest {
  public:
@@ -371,7 +372,8 @@ IN_PROC_BROWSER_TEST_F(BraveSiteHacksNetworkDelegateBrowserTest,
     const GURL same_origin_test_url = url(dest_url, onion_post_url());
     NavigateToURLAndWaitForRedirects(same_origin_test_url, dest_url);
     EXPECT_EQ(last_referrer(dest_url), same_origin_test_url.spec());
-    std::string full_origin = same_origin_test_url.GetOrigin().spec();
+    std::string full_origin =
+        url::Origin::Create(same_origin_test_url).GetURL().spec();
     full_origin.pop_back();  // CORS headers don't use canonical forms.
     EXPECT_EQ(last_origin(dest_url), full_origin);
 
@@ -416,7 +418,7 @@ IN_PROC_BROWSER_TEST_F(BraveSiteHacksNetworkDelegateBrowserTest,
   NavigateToURLAndWaitForRedirects(images_url(), images_url());
 
   // Same-origin sub-requests
-  std::string full_origin = images_url().GetOrigin().spec();
+  std::string full_origin = url::Origin::Create(images_url()).GetURL().spec();
   full_origin.pop_back();  // CORS headers don't use canonical forms.
   EXPECT_EQ(last_referrer(image_url("1")), images_url().spec());
   EXPECT_EQ(last_origin(image_url("1")), "");  // nocors
diff --git a/browser/net/brave_site_hacks_network_delegate_helper_unittest.cc b/browser/net/brave_site_hacks_network_delegate_helper_unittest.cc
index e80b92bf32c5..cbb278d63e69 100644
--- a/browser/net/brave_site_hacks_network_delegate_helper_unittest.cc
+++ b/browser/net/brave_site_hacks_network_delegate_helper_unittest.cc
@@ -15,6 +15,7 @@
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/origin.h"
 
 using brave::ResponseCallback;
 
@@ -76,7 +77,7 @@ TEST(BraveSiteHacksNetworkDelegateHelperTest, ReferrerTruncated) {
     EXPECT_TRUE(brave_request_info->new_url_spec.empty());
     EXPECT_TRUE(brave_request_info->new_referrer.has_value());
     EXPECT_EQ(brave_request_info->new_referrer.value(),
-              original_referrer.GetOrigin().spec());
+              url::Origin::Create(original_referrer).GetURL());
   }
 }
 
@@ -115,7 +116,7 @@ TEST(BraveSiteHacksNetworkDelegateHelperTest, OnionReferrerStripped) {
   // Cross-origin request to a .onion gets normal referrer.
   auto url2 = net::URLRequestJob::ComputeReferrerForPolicy(
       net::ReferrerPolicy::NEVER_CLEAR, destination, original_referrer);
-  EXPECT_EQ(url2, destination.GetOrigin());
+  EXPECT_EQ(url2, destination);
 }
 
 TEST(BraveSiteHacksNetworkDelegateHelperTest, QueryStringUntouched) {
diff --git a/browser/net/url_context.cc b/browser/net/url_context.cc
index 0767ec2f891c..b34b1b8c6e98 100644
--- a/browser/net/url_context.cc
+++ b/browser/net/url_context.cc
@@ -16,8 +16,10 @@
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "net/base/isolation_info.h"
 #include "services/network/public/cpp/resource_request.h"
+#include "url/origin.h"
 
 #if BUILDFLAG(ENABLE_IPFS)
 #include "brave/components/ipfs/ipfs_constants.h"
@@ -109,7 +111,8 @@ std::shared_ptr<brave::BraveRequestInfo> BraveRequestInfo::MakeCTX(
     content::WebContents* contents =
         content::WebContents::FromFrameTreeNodeId(ctx->frame_tree_node_id);
     if (contents) {
-      ctx->tab_origin = contents->GetLastCommittedURL().GetOrigin();
+      ctx->tab_origin =
+          url::Origin::Create(contents->GetLastCommittedURL()).GetURL();
     }
   }
 
@@ -129,7 +132,7 @@ std::shared_ptr<brave::BraveRequestInfo> BraveRequestInfo::MakeCTX(
   if (ipfs::IsLocalGatewayConfigured(prefs) && ctx->tab_origin.is_empty() &&
       ipfs::IsLocalGatewayURL(ctx->initiator_url)) {
     ctx->tab_url = ctx->initiator_url;
-    ctx->tab_origin = ctx->initiator_url.GetOrigin();
+    ctx->tab_origin = url::Origin::Create(ctx->initiator_url).GetURL();
   }
 #endif
 
diff --git a/browser/p3a/p3a_core_metrics.cc b/browser/p3a/p3a_core_metrics.cc
index b9d733d5c8d8..f90ad8680507 100644
--- a/browser/p3a/p3a_core_metrics.cc
+++ b/browser/p3a/p3a_core_metrics.cc
@@ -58,8 +58,7 @@ constexpr char kDailyUptimesListPrefName[] = "daily_uptimes";
 
 BraveUptimeTracker::BraveUptimeTracker(PrefService* local_state)
     : state_(local_state, kDailyUptimesListPrefName) {
-  timer_.Start(FROM_HERE,
-               base::TimeDelta::FromMinutes(kUsageTimeQueryIntervalMinutes),
+  timer_.Start(FROM_HERE, base::Minutes(kUsageTimeQueryIntervalMinutes),
                base::BindRepeating(&BraveUptimeTracker::RecordUsage,
                                    base::Unretained(this)));
 }
@@ -79,7 +78,7 @@ void BraveUptimeTracker::RecordP3A() {
   int answer = 0;
   if (state_.IsOneWeekPassed()) {
     uint64_t total = state_.GetWeeklySum();
-    const int minutes = base::TimeDelta::FromSeconds(total).InMinutes();
+    const int minutes = base::Seconds(total).InMinutes();
     DCHECK_GE(minutes, 0);
     if (0 <= minutes && minutes < 30) {
       answer = 1;
@@ -109,8 +108,7 @@ BraveWindowTracker::BraveWindowTracker(PrefService* local_state)
     return;
   }
   BrowserList::AddObserver(this);
-  timer_.Start(FROM_HERE,
-               base::TimeDelta::FromMinutes(kWindowUsageP3AIntervalMinutes),
+  timer_.Start(FROM_HERE, base::Minutes(kWindowUsageP3AIntervalMinutes),
                base::BindRepeating(&BraveWindowTracker::UpdateP3AValues,
                                    base::Unretained(this)));
   UpdateP3AValues();
@@ -154,11 +152,11 @@ void BraveWindowTracker::UpdateP3AValues() const {
   const base::Time now = base::Time::Now();
   if (time.is_null()) {
     bucket = WindowUsageStats::kNeverUsed;
-  } else if (now - time < base::TimeDelta::FromHours(24)) {
+  } else if (now - time < base::Hours(24)) {
     bucket = WindowUsageStats::kUsedIn24h;
-  } else if (now - time < base::TimeDelta::FromDays(7)) {
+  } else if (now - time < base::Days(7)) {
     bucket = WindowUsageStats::kUsedInLastWeek;
-  } else if (now - time < base::TimeDelta::FromDays(28)) {
+  } else if (now - time < base::Days(28)) {
     bucket = WindowUsageStats::kUsedInLast28Days;
   } else {
     bucket = WindowUsageStats::kEverUsed;
diff --git a/browser/permissions/brave_ethereum_permission_context_browsertest.cc b/browser/permissions/brave_ethereum_permission_context_browsertest.cc
index 9f6de6413246..922660f5f9a1 100644
--- a/browser/permissions/brave_ethereum_permission_context_browsertest.cc
+++ b/browser/permissions/brave_ethereum_permission_context_browsertest.cc
@@ -26,6 +26,7 @@
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace permissions {
 
@@ -75,7 +76,7 @@ class BraveEthereumPermissionContextBrowserTest : public InProcessBrowserTest {
   }
 
   GURL GetLastCommitedOrigin() {
-    return web_contents()->GetLastCommittedURL().GetOrigin();
+    return url::Origin::Create(web_contents()->GetLastCommittedURL()).GetURL();
   }
 
   net::EmbeddedTestServer* https_server() { return &https_server_; }
diff --git a/browser/permissions/permission_lifetime_manager_browsertest.cc b/browser/permissions/permission_lifetime_manager_browsertest.cc
index a695097c21e1..0405a0bb8d73 100644
--- a/browser/permissions/permission_lifetime_manager_browsertest.cc
+++ b/browser/permissions/permission_lifetime_manager_browsertest.cc
@@ -162,8 +162,7 @@ IN_PROC_BROWSER_TEST_F(PermissionLifetimeManagerBrowserTest, ExpirationSmoke) {
   EXPECT_CALL(*prompt_factory_, OnPermissionPromptCreated(_))
       .WillOnce(testing::Invoke([&](MockPermissionLifetimePrompt* prompt) {
         run_loop.Quit();
-        prompt->delegate()->Requests()[0]->SetLifetime(
-            base::TimeDelta::FromSeconds(30));
+        prompt->delegate()->Requests()[0]->SetLifetime(base::Seconds(30));
         scoped_mock_time_task_runner =
             std::make_unique<base::ScopedMockTimeMessageLoopTaskRunner>();
       }));
@@ -179,13 +178,11 @@ IN_PROC_BROWSER_TEST_F(PermissionLifetimeManagerBrowserTest, ExpirationSmoke) {
   EXPECT_EQ(host_content_settings_map()->GetContentSetting(
                 url, url, ContentSettingsType::GEOLOCATION),
             ContentSetting::CONTENT_SETTING_ALLOW);
-  scoped_mock_time_task_runner->task_runner()->FastForwardBy(
-      base::TimeDelta::FromSeconds(20));
+  scoped_mock_time_task_runner->task_runner()->FastForwardBy(base::Seconds(20));
   EXPECT_EQ(host_content_settings_map()->GetContentSetting(
                 url, url, ContentSettingsType::GEOLOCATION),
             ContentSetting::CONTENT_SETTING_ALLOW);
-  scoped_mock_time_task_runner->task_runner()->FastForwardBy(
-      base::TimeDelta::FromSeconds(20));
+  scoped_mock_time_task_runner->task_runner()->FastForwardBy(base::Seconds(20));
   EXPECT_EQ(host_content_settings_map()->GetContentSetting(
                 url, url, ContentSettingsType::GEOLOCATION),
             ContentSetting::CONTENT_SETTING_ASK);
@@ -201,8 +198,7 @@ IN_PROC_BROWSER_TEST_F(PermissionLifetimeManagerBrowserTest,
       PermissionRequestManager::AutoResponseType::ACCEPT_ALL);
   EXPECT_CALL(*prompt_factory_, OnPermissionPromptCreated(_))
       .WillOnce(testing::Invoke([&](MockPermissionLifetimePrompt* prompt) {
-        prompt->delegate()->Requests()[0]->SetLifetime(
-            base::TimeDelta::FromSeconds(30));
+        prompt->delegate()->Requests()[0]->SetLifetime(base::Seconds(30));
       }));
 
   content::ExecuteScriptAsync(
@@ -235,15 +231,13 @@ IN_PROC_BROWSER_TEST_F(PermissionLifetimeManagerBrowserTest,
   EXPECT_TRUE(permission_lifetime_timer().IsRunning());
   EXPECT_FALSE(GetExpirationsPrefValue()->DictEmpty());
 
-  scoped_mock_time_task_runner.task_runner()->FastForwardBy(
-      base::TimeDelta::FromSeconds(10));
+  scoped_mock_time_task_runner.task_runner()->FastForwardBy(base::Seconds(10));
   EXPECT_TRUE(permission_lifetime_timer().IsRunning());
   EXPECT_EQ(host_content_settings_map()->GetContentSetting(
                 url, url, ContentSettingsType::GEOLOCATION),
             ContentSetting::CONTENT_SETTING_ALLOW);
 
-  scoped_mock_time_task_runner.task_runner()->FastForwardBy(
-      base::TimeDelta::FromSeconds(60));
+  scoped_mock_time_task_runner.task_runner()->FastForwardBy(base::Seconds(60));
   EXPECT_FALSE(permission_lifetime_timer().IsRunning());
   EXPECT_TRUE(GetExpirationsPrefValue()->DictEmpty());
   EXPECT_EQ(host_content_settings_map()->GetContentSetting(
@@ -259,8 +253,7 @@ IN_PROC_BROWSER_TEST_F(PermissionLifetimeManagerBrowserTest,
       PermissionRequestManager::AutoResponseType::ACCEPT_ALL);
   EXPECT_CALL(*prompt_factory_, OnPermissionPromptCreated(_))
       .WillOnce(testing::Invoke([&](MockPermissionLifetimePrompt* prompt) {
-        prompt->delegate()->Requests()[0]->SetLifetime(
-            base::TimeDelta::FromSeconds(30));
+        prompt->delegate()->Requests()[0]->SetLifetime(base::Seconds(30));
       }));
 
   content::ExecuteScriptAsync(
@@ -288,8 +281,7 @@ class PermissionLifetimeManagerWithOriginMonitorBrowserTest
  public:
   PermissionLifetimeManagerWithOriginMonitorBrowserTest() {
     ephemeral_storage::EphemeralStorageTabHelper::
-        SetKeepAliveTimeDelayForTesting(
-            base::TimeDelta::FromSeconds(kKeepAliveInterval));
+        SetKeepAliveTimeDelayForTesting(base::Seconds(kKeepAliveInterval));
   }
 };
 
@@ -328,8 +320,7 @@ IN_PROC_BROWSER_TEST_F(PermissionLifetimeManagerWithOriginMonitorBrowserTest,
   // Permission Should be reset after the timeout
   base::RunLoop run_loop;
   base::SequencedTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE, run_loop.QuitClosure(),
-      base::TimeDelta::FromSeconds(kKeepAliveInterval));
+      FROM_HERE, run_loop.QuitClosure(), base::Seconds(kKeepAliveInterval));
   run_loop.Run();
 
   EXPECT_EQ(host_content_settings_map()->GetContentSetting(
@@ -383,8 +374,7 @@ IN_PROC_BROWSER_TEST_F(PermissionLifetimeManagerWithOriginMonitorBrowserTest,
   // Permission Should be reset after the timeout
   base::RunLoop run_loop;
   base::SequencedTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE, run_loop.QuitClosure(),
-      base::TimeDelta::FromSeconds(kKeepAliveInterval));
+      FROM_HERE, run_loop.QuitClosure(), base::Seconds(kKeepAliveInterval));
   run_loop.Run();
 
   EXPECT_EQ(host_content_settings_map()->GetContentSetting(
@@ -438,8 +428,7 @@ IN_PROC_BROWSER_TEST_F(PermissionLifetimeManagerWithOriginMonitorBrowserTest,
   // Permission Should be reset after the timeout
   base::RunLoop run_loop;
   base::SequencedTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE, run_loop.QuitClosure(),
-      base::TimeDelta::FromSeconds(kKeepAliveInterval));
+      FROM_HERE, run_loop.QuitClosure(), base::Seconds(kKeepAliveInterval));
   run_loop.Run();
 
   EXPECT_EQ(host_content_settings_map()->GetContentSetting(
diff --git a/browser/permissions/permission_lifetime_manager_unittest.cc b/browser/permissions/permission_lifetime_manager_unittest.cc
index b55eb29513cf..e175ba2ffa58 100644
--- a/browser/permissions/permission_lifetime_manager_unittest.cc
+++ b/browser/permissions/permission_lifetime_manager_unittest.cc
@@ -229,8 +229,8 @@ class PermissionLifetimeManagerTest : public testing::Test {
  protected:
   const GURL kOrigin{"https://example.com"};
   const GURL kOrigin2{"https://brave.com"};
-  const base::TimeDelta kLifetime{base::TimeDelta::FromSeconds(5)};
-  const base::TimeDelta kOneSecond{base::TimeDelta::FromSeconds(1)};
+  const base::TimeDelta kLifetime{base::Seconds(5)};
+  const base::TimeDelta kOneSecond{base::Seconds(1)};
 
   content::BrowserTaskEnvironment browser_task_environment_;
   TestingProfile profile_;
@@ -371,8 +371,7 @@ TEST_F(PermissionLifetimeManagerTest, TwoPermissionsSameTime) {
 
 TEST_F(PermissionLifetimeManagerTest, TwoPermissionsBigTimeDifference) {
   auto request(CreateRequestAndAllowContentSetting(
-      kOrigin, ContentSettingsType::NOTIFICATIONS,
-      base::TimeDelta::FromDays(5)));
+      kOrigin, ContentSettingsType::NOTIFICATIONS, base::Days(5)));
   const base::Time expected_expiration_time =
       base::Time::Now() + *request->GetLifetime();
   manager()->PermissionDecided(*request, kOrigin, kOrigin,
@@ -482,8 +481,7 @@ TEST_F(PermissionLifetimeManagerTest, ExpiredRestoreAfterRestart) {
 
 TEST_F(PermissionLifetimeManagerTest, PartiallyExpiredRestoreAfterRestart) {
   auto request(CreateRequestAndAllowContentSetting(
-      kOrigin, ContentSettingsType::NOTIFICATIONS,
-      base::TimeDelta::FromDays(5)));
+      kOrigin, ContentSettingsType::NOTIFICATIONS, base::Days(5)));
   const base::Time expected_expiration_time =
       base::Time::Now() + *request->GetLifetime();
   manager()->PermissionDecided(*request, kOrigin, kOrigin,
diff --git a/browser/permissions/permission_manager_browsertest.cc b/browser/permissions/permission_manager_browsertest.cc
index 633e0a40e446..64b8fce72d0d 100644
--- a/browser/permissions/permission_manager_browsertest.cc
+++ b/browser/permissions/permission_manager_browsertest.cc
@@ -32,6 +32,7 @@
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace permissions {
 
@@ -100,7 +101,7 @@ class PermissionManagerBrowserTest : public InProcessBrowserTest {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
   GURL GetLastCommitedOrigin() {
-    return web_contents()->GetLastCommittedURL().GetOrigin();
+    return url::Origin::Create(web_contents()->GetLastCommittedURL()).GetURL();
   }
 
   net::EmbeddedTestServer* https_server() { return &https_server_; }
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 a705b9da4707..64425506e046 100644
--- a/browser/resources/settings/brave_sync_page/brave_sync_subpage.js
+++ b/browser/resources/settings/brave_sync_page/brave_sync_subpage.js
@@ -17,74 +17,76 @@ import '../people_page/sync_controls.js';
 import './brave_sync_configure.js';
 import './brave_sync_setup.js';
 
-import {assert} from 'chrome://resources/js/assert.m.js';
-import {Polymer, html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
-
-import {Route, RouteObserverBehavior, Router} from '../router.js';
-import {SyncBrowserProxyImpl, StatusAction} from '../people_page/sync_browser_proxy.js';
-
-/**
-* @fileoverview
-* 'settings-sync-subpage' is the settings page content
-*/
-Polymer({
-  is: 'settings-brave-sync-subpage',
-
-  _template: html`{__html_template__}`,
-
-  behaviors: [
-    RouteObserverBehavior,
-  ],
-
-  properties: {
-    /**
-    * Current page status
-    * 'configure' | 'setup' | 'spinner'
-    * @private
-    */
-    pageStatus_: {
-      type: String,
-      value: 'configure',
-    },
-
-    /**
-    * The current sync preferences, supplied by SyncBrowserProxy.
-    * @type {SyncPrefs|undefined}
-    */
-    syncPrefs: {
-      type: Object,
-    },
-
-    /** @type {SyncStatus} */
-    syncStatus: {
-      type: Object,
-    },
-
-    /** @private */
-    syncDisabledByAdmin_: {
-      type: Boolean,
-      value: false,
-      computed: 'computeSyncDisabledByAdmin_(syncStatus.managed)',
-    },
-
-    /** @private */
-    syncSectionDisabled_: {
-      type: Boolean,
-      value: false,
-      computed: 'computeSyncSectionDisabled_(' +
+import { assert } from 'chrome://resources/js/assert.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 { Route, RouteObserverMixin, Router } from '../router.js';
+import { SyncBrowserProxyImpl, StatusAction } from '../people_page/sync_browser_proxy.js';
+
+const SettingBraveSyncSubpageBase = I18nMixin(RouteObserverMixin(PolymerElement))
+
+class SettingBraveSyncSubpage extends SettingBraveSyncSubpageBase {
+  static get is() {
+    return 'settings-brave-sync-subpage'
+  }
+
+  static get template() {
+    return html`{__html_template__}`
+  }
+
+  static get properties() {
+    return {
+      /**
+       * Current page status
+       * 'configure' | 'setup' | 'spinner'
+       * @private
+       */
+      pageStatus_: {
+        type: String,
+        value: 'configure',
+      },
+
+      /**
+      * The current sync preferences, supplied by SyncBrowserProxy.
+      * @type {SyncPrefs|undefined}
+      */
+      syncPrefs: {
+        type: Object,
+      },
+
+      /** @type {SyncStatus} */
+      syncStatus: {
+        type: Object,
+      },
+
+      /** @private */
+      syncDisabledByAdmin_: {
+        type: Boolean,
+        value: false,
+        computed: 'computeSyncDisabledByAdmin_(syncStatus.managed)',
+      },
+
+      /** @private */
+      syncSectionDisabled_: {
+        type: Boolean,
+        value: false,
+        computed: 'computeSyncSectionDisabled_(' +
           'syncStatus.disabled, ' +
           'syncStatus.hasError, syncStatus.statusAction, ' +
           'syncPrefs.trustedVaultKeysRequired)',
-    },
-  },
+      },
+    }
+  }
 
-  observers: [
-    'updatePageStatus_(syncStatus.*)'
-  ],
+  static get observers() {
+    return [
+      'updatePageStatus_(syncStatus.*)'
+    ]
+  }
 
   /** @private {?SyncBrowserProxy} */
-  browserProxy_: null,
+  browserProxy_ = SyncBrowserProxyImpl.getInstance()
 
   /**
   * The beforeunload callback is used to show the 'Leave site' dialog. This
@@ -96,7 +98,7 @@ Polymer({
   *
   * @private {?Function}
   */
-  beforeunloadCallback_: null,
+  beforeunloadCallback_ = null
 
   /**
   * The unload callback is used to cancel the sync setup when the user hits
@@ -107,155 +109,155 @@ Polymer({
   *
   * @private {?Function}
   */
-  unloadCallback_: null,
+  unloadCallback_ = null
 
   /**
   * Whether the user completed setup successfully.
   * @private {boolean}
   */
-  setupSuccessful_: false,
-
-  /** @override */
-  created: function() {
-    this.browserProxy_ = SyncBrowserProxyImpl.getInstance();
-  },
+  setupSuccessful_ = false
 
-  /** @override */
-  attached: function() {
-    const router = Router.getInstance();
+  attached() {
+    super.attached()
+    const router = Router.getInstance()
     if (router.getCurrentRoute() == router.getRoutes().BRAVE_SYNC_SETUP) {
-      this.onNavigateToPage_();
+      this.onNavigateToPage_()
     }
-  },
+  }
 
   /** @override */
-  detached: function() {
-    const router = Router.getInstance();
+  detached() {
+    const router = Router.getInstance()
     if (router.getRoutes().BRAVE_SYNC_SETUP.contains(router.getCurrentRoute())) {
-      this.onNavigateAwayFromPage_();
+      this.onNavigateAwayFromPage_()
     }
 
     if (this.beforeunloadCallback_) {
-      window.removeEventListener('beforeunload', this.beforeunloadCallback_);
-      this.beforeunloadCallback_ = null;
+      window.removeEventListener('beforeunload', this.beforeunloadCallback_)
+      this.beforeunloadCallback_ = null
     }
     if (this.unloadCallback_) {
-      window.removeEventListener('unload', this.unloadCallback_);
-      this.unloadCallback_ = null;
+      window.removeEventListener('unload', this.unloadCallback_)
+      this.unloadCallback_ = null
     }
-  },
 
-  updatePageStatus_: function () {
+    super.detached()
+  }
+
+  updatePageStatus_(newValue, oldValue) {
     const isFirstSetup = this.syncStatus && this.syncStatus.firstSetupInProgress
     this.pageStatus_ = isFirstSetup ? 'setup' : 'configure'
-  },
+  }
 
   /**
   * @return {boolean}
   * @private
   */
-  computeSyncSectionDisabled_: function() {
+  computeSyncSectionDisabled_() {
     return this.syncStatus !== undefined &&
-        (!!this.syncStatus.disabled ||
+      (!!this.syncStatus.disabled ||
         (!!this.syncStatus.hasError &&
           this.syncStatus.statusAction !==
-              StatusAction.ENTER_PASSPHRASE &&
+          StatusAction.ENTER_PASSPHRASE &&
           this.syncStatus.statusAction !==
-              StatusAction.RETRIEVE_TRUSTED_VAULT_KEYS));
-  },
+          StatusAction.RETRIEVE_TRUSTED_VAULT_KEYS))
+  }
 
   /**
   * @return {boolean}
   * @private
   */
   computeSyncDisabledByAdmin_() {
-    return this.syncStatus != undefined && !!this.syncStatus.managed;
-  },
+    return this.syncStatus != undefined && !!this.syncStatus.managed
+  }
 
   /** @protected */
-  currentRouteChanged: function() {
+  currentRouteChanged() {
     const router = Router.getInstance();
     if (router.getCurrentRoute() == router.getRoutes().BRAVE_SYNC_SETUP) {
-      this.onNavigateToPage_();
-      return;
+      this.onNavigateToPage_()
+      return
     }
 
     if (router.getRoutes().BRAVE_SYNC_SETUP.contains(router.getCurrentRoute())) {
-      return;
+      return
     }
 
-    this.onNavigateAwayFromPage_();
-  },
+    this.onNavigateAwayFromPage_()
+  }
 
   /**
   * @param {!PageStatus} expectedPageStatus
   * @return {boolean}
   * @private
   */
-  isStatus_: function(expectedPageStatus) {
+  isStatus_(expectedPageStatus) {
     return expectedPageStatus == this.pageStatus_;
-  },
+  }
 
   /** @private */
-  onNavigateToPage_: function() {
-    const router = Router.getInstance();
-    assert(router.getCurrentRoute() == router.getRoutes().BRAVE_SYNC_SETUP);
+  onNavigateToPage_() {
+    const router = Router.getInstance()
+    assert(router.getCurrentRoute() == router.getRoutes().BRAVE_SYNC_SETUP)
     if (this.beforeunloadCallback_) {
-      return;
+      return
     }
 
     // Triggers push of prefs to our handler
-    this.browserProxy_.didNavigateToSyncPage();
+    this.browserProxy_.didNavigateToSyncPage()
 
     this.beforeunloadCallback_ = event => {
       // When the user tries to leave the sync setup, show the 'Leave site'
       // dialog.
       if (this.syncStatus && this.syncStatus.firstSetupInProgress) {
-        event.preventDefault();
-        event.returnValue = '';
+        event.preventDefault()
+        event.returnValue = ''
 
         chrome.metricsPrivate.recordUserAction(
-            'Signin_Signin_AbortAdvancedSyncSettings');
+          'Signin_Signin_AbortAdvancedSyncSettings')
       }
     };
-    window.addEventListener('beforeunload', this.beforeunloadCallback_);
+    window.addEventListener('beforeunload', this.beforeunloadCallback_)
 
-    this.unloadCallback_ = this.onNavigateAwayFromPage_.bind(this);
-    window.addEventListener('unload', this.unloadCallback_);
-  },
+    this.unloadCallback_ = this.onNavigateAwayFromPage_.bind(this)
+    window.addEventListener('unload', this.unloadCallback_)
+  }
 
   /** @private */
-  onNavigateAwayFromPage_: function() {
+  onNavigateAwayFromPage_() {
     if (!this.beforeunloadCallback_) {
-      return;
+      return
     }
 
-    this.browserProxy_.didNavigateAwayFromSyncPage(!this.setupSuccessful_);
+    this.browserProxy_.didNavigateAwayFromSyncPage(!this.setupSuccessful_)
 
     // Reset state as this component could actually be kept around even though
     // it is hidden.
     this.setupSuccessful_ = false
 
-    window.removeEventListener('beforeunload', this.beforeunloadCallback_);
-    this.beforeunloadCallback_ = null;
+    window.removeEventListener('beforeunload', this.beforeunloadCallback_)
+    this.beforeunloadCallback_ = null
 
     if (this.unloadCallback_) {
-      window.removeEventListener('unload', this.unloadCallback_);
-      this.unloadCallback_ = null;
+      window.removeEventListener('unload', this.unloadCallback_)
+      this.unloadCallback_ = null
     }
-  },
+  }
 
   /**
   * Called when setup is complete and sync code is set
   * @private
   */
-  onSetupSuccess_: function() {
+  onSetupSuccess_() {
     this.setupSuccessful_ = true
     // This navigation causes the firstSetupInProgress flag to be marked as false
     // via `didNavigateAwayFromSyncPage`.
-    const router = Router.getInstance();
+    const router = Router.getInstance()
     if (router.getCurrentRoute() == router.getRoutes().BRAVE_SYNC_SETUP) {
-      router.navigateTo(router.getRoutes().BRAVE_SYNC);
+      router.navigateTo(router.getRoutes().BRAVE_SYNC)
     }
-  },
-});
+  }
+}
+
+customElements.define(
+  SettingBraveSyncSubpage.is, SettingBraveSyncSubpage)
diff --git a/browser/resources/settings/settings.gni b/browser/resources/settings/settings.gni
index ea0d947fd186..44f334eec520 100644
--- a/browser/resources/settings/settings.gni
+++ b/browser/resources/settings/settings.gni
@@ -15,4 +15,5 @@ settings_namespace_rewrites = [
   "settings.Router|Router",
 ]
 
-settings_auto_imports = [ "chrome/browser/resources/settings/router.html|Router,Route,RouteObserverBehavior" ]
+settings_auto_imports =
+    [ "chrome/browser/resources/settings/router.html|Router,Route" ]
diff --git a/browser/themes/brave_theme_service_browsertest.cc b/browser/themes/brave_theme_service_browsertest.cc
index 24625a9f9ecc..4065a1214efc 100644
--- a/browser/themes/brave_theme_service_browsertest.cc
+++ b/browser/themes/brave_theme_service_browsertest.cc
@@ -204,6 +204,6 @@ IN_PROC_BROWSER_TEST_F(BraveThemeServiceTest, DarkModeChangeByRegTest) {
   hkcu_themes_regkey.WriteValue(L"AppsUseLightTheme", apps_use_light_theme);
 
   // Timeout is used because we can't get notifiication with light theme.
-  RunLoopRunWithTimeout(base::TimeDelta::FromMilliseconds(500));
+  RunLoopRunWithTimeout(base::Milliseconds(500));
 }
 #endif
diff --git a/browser/translate/brave_translate_browsertest.cc b/browser/translate/brave_translate_browsertest.cc
index 94d3e2119ab9..d5fbc218d1ae 100644
--- a/browser/translate/brave_translate_browsertest.cc
+++ b/browser/translate/brave_translate_browsertest.cc
@@ -29,6 +29,7 @@
 #include "components/translate/core/browser/translate_language_list.h"
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/browser/translate_script.h"
+#include "components/translate/core/common/translate_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/test/embedded_test_server/http_request.h"
diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd
index 6091b9b8700d..e034027b9e84 100644
--- a/browser/ui/android/strings/android_chrome_strings.grd
+++ b/browser/ui/android/strings/android_chrome_strings.grd
@@ -469,6 +469,12 @@ CHAR_LIMIT guidelines:
       <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_EXPIRATION_DATE" desc="Label for text input field containing a credit card expiration date. [CHAR_LIMIT=32]">
         Expiration date
       </message>
+      <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_EXPIRATION_MONTH" desc="Accessibility label for a spinner input field containing a list of expiration months for a credit card. [CHAR_LIMIT=32]">
+        Expiration month
+      </message>
+      <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_EXPIRATION_YEAR" desc="Accessibility label for a spinner input field containing a list of expiration years for a credit card. [CHAR_LIMIT=32]">
+        Expiration year
+      </message>
       <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_BILLING_ADDRESS" desc="Label for a spinner input field containing a list of billing addresses for a credit card. [CHAR_LIMIT=32]">
         Billing address
       </message>
@@ -733,7 +739,7 @@ CHAR_LIMIT guidelines:
       <message name="IDS_THEMES_SYSTEM_DEFAULT_SUMMARY_API_29" desc="Summary for the System Default option (Android Q+).">
         Turn on dark theme when your device's dark theme or Battery Saver is on
       </message>
-      <message name="IDS_DARKEN_WEBSITES" desc="Title for the Darken websites option. [CHAR_LIMIT=32]">
+      <message name="IDS_DARKEN_WEBSITES" desc="Title for the option to apply auto-darken to websites. If a website has opt-out from auto-darken, the content will stay the same.">
         Apply dark theme to sites, when possible
       </message>
 
@@ -1017,6 +1023,33 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_PREFS_PRIVACY_REVIEW_SUMMARY" desc="The summary of the privacy menu item.">
         Review privacy and security settings
       </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
+      </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
+      </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>
+      <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>
+      <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
+      </message>
+      <message name="IDS_PRIVACY_REVIEW_MSBB_ITEM_TWO" desc="Second bullet point that describes the details of the MSBB toggle.">
+        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
+      </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
+      </message>
 
       <!-- Safety check -->
       <message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [CHAR_LIMIT=32]">
@@ -2095,42 +2128,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         Download will start when on Wi-Fi
       </message>
 
-      <!-- Inline Update Infobar -->
-      <message name="IDS_INLINE_UPDATE_INFOBAR_READY_MESSAGE" desc="Text showing that the update process is almost ready.">
-        Almost finished!
-      </message>
-      <message name="IDS_INLINE_UPDATE_INFOBAR_READY_LINK_TEXT" desc="The clickable link letting the user know they can click to restart Brave.">
-        Restart Brave
-      </message>
-      <message name="IDS_INLINE_UPDATE_INFOBAR_FAILED_MESSAGE" desc="Text showing that the update process failed.">
-        Couldn’t download the update
-      </message>
-
-      <!-- Inline Update Toast -->
-      <message name="IDS_INLINE_UPDATE_TOAST_DOWNLOADING_MESSAGE" desc="Text showing when the user starts the inline update process in Brave which lets the user know that the update is downloading.">
-        Downloading Brave Update…
-      </message>
-
-      <!-- Update Notification-->
-      <message name="IDS_UPDATE_NOTIFICATION_TITLE_DEFAULT" desc="Default title of update notification to remind user to update Brave.">
-        Update Brave
-      </message>
-      <message name="IDS_UPDATE_NOTIFICATION_TEXT_BODY_DEFAULT" desc="Default text showing in the update notification body, kindly telling user to update to the latest version of Brave.">
-        For the best browsing experience, open to update Brave
-      </message>
-      <message name="IDS_UPDATE_NOTIFICATION_TITLE_EXPERIMENTAL_UPDATE_CHROME" desc="Experimental version A title of update notification to remind user to update Brave.">
-        Update Brave
-      </message>
-      <message name="IDS_UPDATE_NOTIFICATION_TEXT_BODY_EXPERIMENTAL_UPDATE_CHROME" desc="Experimental version A text showing in the update notification body, kindly telling user to update to the latest version of Brave.">
-        To see the web in your language, get the latest version of Brave
-      </message>
-      <message name="IDS_UPDATE_NOTIFICATION_TITLE_EXPERIMENTAL_TRANSLATE_THE_WEB" desc="Experimental version B title of update notification to remind user to update Brave.">
-        Translate the Web
-      </message>
-      <message name="IDS_UPDATE_NOTIFICATION_TEXT_BODY_EXPERIMENTAL_TRANSLATE_THE_WEB" desc="Experimental version B text showing in the update notification body, kindly telling user to update to the latest version of Brave.">
-        Update to get your language in the latest version of Brave
-      </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>
@@ -2646,6 +2643,14 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         Close all Private tabs
       </message>
 
+     <!-- Private reauthentication page -->
+     <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_INCOGNITO_REAUTH_PAGE_SEE_OTHER_TABS_LABEL" desc="The label of the text which upon click allows user to switch to regular tabs. Users don't need to go through re-authentication when they click on this.">
+       See other tabs
+     </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
@@ -2690,8 +2695,11 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_SIGNIN_FRE_DISMISS_BUTTON" desc="Text for the dismiss button on the welcome sign-in screen. By clicking this button users will continue without signing in,">
         Use without an account
       </message>
-      <message name="IDS_SIGNIN_FRE_FOOTER" desc="Text for asking the user to allow sending diagnostic reports">
-        To help improve the app, Brave sends diagnostic data to Brave. <ph name="BEGIN_LINK">&lt;LINK&gt;</ph>Change<ph name="END_LINK">&lt;/LINK&gt;</ph>
+      <message name="IDS_SIGNIN_FRE_FOOTER" desc="The text is displayed in a footer on the very first screen of Brave. The link ‘Terms of Service’ opens the Brave Terms of Service. Preferably, ensure consistency with the “Usage statistics and crash reports” section of the Brave Privacy Policy (google.com/chrome/privacy). Separate the first and the second part through a line break.">
+        By continuing, you agree to the <ph name="BEGIN_TOS_LINK">&lt;TOS_LINK&gt;</ph>Terms of Service<ph name="END_TOS_LINK">&lt;/TOS_LINK&gt;</ph>.\nTo help improve the app, Brave sends usage and crash data to Brave. <ph name="BEGIN_UMA_LINK">&lt;UMA_LINK&gt;</ph>Manage<ph name="END_UMA_LINK">&lt;/UMA_LINK&gt;</ph>
+      </message>
+      <message name="IDS_SIGNIN_FRE_FOOTER_SUPERVISED_USER" desc="The text is displayed in a footer on the very first screen of Brave. The link 'Terms of Service' opens the Brave Terms of Service. The link 'Privacy Policy' opens the Brave Privacy Policy. Preferably, ensure consistency with the “Usage statistics and crash reports” section of the Brave Privacy Policy (google.com/chrome/privacy). Separate the first and the second sentence through a line break.">
+        By continuing, you agree to the <ph name="BEGIN_TOS_LINK">&lt;TOS_LINK&gt;</ph>Terms of Service<ph name="END_TOS_LINK">&lt;/TOS_LINK&gt;</ph> and <ph name="BEGIN_PRIVACY_LINK">&lt;PRIVACY_LINK&gt;</ph>Privacy\u00A0Policy<ph name="END_PRIVACY_LINK">&lt;/PRIVACY_LINK&gt;</ph>.\nTo help improve the app, Brave sends usage and crash data to Brave. <ph name="BEGIN_UMA_LINK">&lt;UMA_LINK&gt;</ph>Manage<ph name="END_UMA_LINK">&lt;/UMA_LINK&gt;</ph>
       </message>
       <message name="IDS_SIGNIN_FRE_UMA_DIALOG_TITLE" desc="Title for the FRE footer dialog">
         Make Brave better
@@ -2736,6 +2744,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_SIGNIN_ACCOUNT_PICKER_DIALOG_TITLE" desc="The title for the dialog that shows the list of accounts on the device and asks the user to select one of these accounts. [CHAR_LIMIT=27]">
         Choose an account
       </message>
+      <message name="IDS_SIGNIN_ACCOUNT_PICKER_BOTTOM_SHEET_TITLE_FOR_SEND_TAB_TO_SELF" desc="The title for the bottom sheet that shows the list of accounts on the device and asks the user to select one of these accounts, when send-tab-to-self triggered the UI. [CHAR_LIMIT=27]">
+        Sign in to Brave
+      </message>
       <message name="IDS_ACCOUNT_PICKER_BOTTOM_SHEET_ACCESSIBILITY_OPENED" is_accessibility_with_no_ui="true" desc="The accessibility text to read when account picker bottom sheet is opened.">
         Sign in to Brave, opened.
       </message>
@@ -2745,6 +2756,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <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.
       </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
+      </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...
       </message>
@@ -3138,18 +3152,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_MENU_UPDATE_UNSUPPORTED_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that the Android version on the device is unsupported. [CHAR_LIMIT=30]">
         Android version is unsupported
       </message>
-      <message name="IDS_MENU_INLINE_UPDATE_DOWNLOADING" desc="Menu item for when Brave is in the process of updating. [CHAR_LIMIT=24]">
-        Downloading…
-      </message>
-      <message name="IDS_MENU_INLINE_UPDATE_FAILED" desc="Menu item for when Brave failed to download an update. [CHAR_LIMIT=24]">
-        Couldn’t download
-      </message>
-      <message name="IDS_MENU_INLINE_UPDATE_READY" desc="Menu item text that is shown when Brave has downloaded an update for itself and is ready to be restarted, which will apply the update. [CHAR_LIMIT=24]">
-        Update ready
-      </message>
-      <message name="IDS_MENU_INLINE_UPDATE_READY_SUMMARY" desc="Summary text that is shown when Brave has downloaded an update for itself and is ready to be restarted, which will apply the update.  This lets the user know the update will restart. [CHAR_LIMIT=24]">
-        Restart Brave
-      </message>
       <message name="IDS_MENU_NEW_WINDOW" desc="Menu item for opening a new window. [CHAR_LIMIT=27]">
         New window
       </message>
@@ -3207,9 +3209,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_MENU_DELETE_FROM_READING_LIST" desc="Menu item for removing the current page from the reading list. [CHAR_LIMIT=27]">
         Delete from reading list
       </message>
-      <message name="IDS_MENU_EDIT_READING_LIST" desc="Menu item for opening and editing the reading list. Shown only when the current page is already on the reading list. [CHAR_LIMIT=27]">
-        Edit reading list
-      </message>
       <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR_LIMIT=27]">
         Find in page
       </message>
@@ -3395,6 +3394,20 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         in <ph name="PRODUCT_NAME">%1$s<ex>Brave</ex></ph>
       </message>
 
+      <!-- Power bookmarks strings-->
+      <message name="IDS_PRICE_TRACKING_SAVE_FLOW_TITLE" desc="The title when a user chooses to track the price of a product.">
+        Tracking
+      </message>
+      <message name="IDS_PRICE_TRACKING_SAVE_FLOW_SUBTITLE" desc="The subtitle when a user chooses to track the price of a product.">
+        You will be notified if the price drops on any site
+      </message>
+      <message name="IDS_PRICE_TRACKING_SAVE_FLOW_NOTIFICATION_SWITCH_TITLE" desc="The title of an optional switch to track the price for product pages added as bookmarks.">
+        Track price
+      </message>
+      <message name="IDS_PRICE_TRACKING_SAVE_FLOW_NOTIFICATION_SWITCH_SUBTITLE" desc="The subtitle of an optional switch to track the price for product pages added as bookmarks.">
+        Get price drop notifications
+      </message>
+
       <!-- Read later strings -->
       <message name="IDS_READING_LIST_TITLE_NEW" desc="The title for the reading list with a new text.">
         Reading list <ph name="BEGIN_NEW">&lt;new&gt;</ph>New<ph name="END_NEW">&lt;/new&gt;</ph>
@@ -4876,6 +4889,11 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         Share content only
       </message>
 
+      <!-- Lightweight Reactions strings -->
+      <message name="IDS_LIGHTWEIGHT_REACTIONS_CREATING_GIF" desc="Message displayed above the progress bar when the reaction GIF is being generated.">
+        Creating GIF <ph name="PERCENT">%1$d<ex>13</ex></ph>%%
+      </message>
+
       <!-- Share Screenshot strings -->
       <message name="IDS_SCREENSHOT_EDIT_TITLE" desc="The text shown on the share option for screenshots.">
         Edit
@@ -5067,10 +5085,13 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         Sign up for <ph name="SITE_NAME">%1$s<ex>rp.example</ex></ph>
       </message>
       <message name="IDS_ACCOUNT_SELECTION_SHEET_TITLE" desc="Header for Account Selection sheet where the user can pick an account to sign up with." translateable="false">
-        Choose an account to sign up for <ph name="SITE_NAME">%1$s<ex>rp.example</ex></ph>
+        Choose an account for <ph name="SITE_NAME">%1$s<ex>rp.example</ex></ph>
+      </message>
+      <message name="IDS_ACCOUNT_SELECTION_SHEET_IDP_SUBHEADER" desc="Sub-heading for Account Selection sheet where user can pick an account to sign up with." translateable="false">
+        with <ph name="IDENTITY_PROVIDER_URL">%1$s<ex>idp.com</ex></ph>
       </message>
       <message name="IDS_ACCOUNT_SELECTION_DATA_SHARING_CONSENT" desc="The consent text shown to the user before sign up." translateable="false">
-        To sign up, <ph name="PROVIDER_NAME">%1$s<ex>provider.example</ex></ph> will share your name, email, address, and profile picture with the site. See <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>Privacy Policy<ph name="END_LINK1">&lt;/link1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;link2&gt;</ph>Terms of service<ph name="END_LINK2">&lt;/link2&gt;</ph>.
+        To sign up, <ph name="PROVIDER_NAME">%1$s<ex>provider.example</ex></ph> will share your name, email, address, and profile picture with <ph name="RP_URL1">%2$s<ex>recipes.com</ex></ph>. See <ph name="RP_URL2">%3$s<ex>recipes.com</ex></ph>'s <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>privacy policy<ph name="END_LINK1">&lt;/link1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;link2&gt;</ph>terms of service<ph name="END_LINK2">&lt;/link2&gt;</ph>.
       </message>
 
       <message name="IDS_ACCOUNT_SELECTION_CONTINUE" desc="Title of the button that continues filling with the only available set of credentials." translateable="false">
diff --git a/browser/ui/android/strings/android_chrome_strings_override.grd b/browser/ui/android/strings/android_chrome_strings_override.grd
index 8f828165904c..2c4502c3a557 100644
--- a/browser/ui/android/strings/android_chrome_strings_override.grd
+++ b/browser/ui/android/strings/android_chrome_strings_override.grd
@@ -161,7 +161,10 @@ CHAR_LIMIT guidelines:
         Close all Private tabs
       </message>
 
-      <message name="IDS_NEW_INCOGNITO_TAB_TITLE" desc="Title in tab strip when opening a new Private tab.">
+     <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_NEW_INCOGNITO_TAB_TITLE" desc="Title in tab strip when opening a new Private tab.">
         New Private tab
       </message>
       <message name="IDS_BUTTON_NEW_INCOGNITO_TAB" desc="Tooltip for the button to open a new Private browser tab.">
diff --git a/browser/ui/sidebar/sidebar_model.cc b/browser/ui/sidebar/sidebar_model.cc
index d16ec475ee15..3e58582096e9 100644
--- a/browser/ui/sidebar/sidebar_model.cc
+++ b/browser/ui/sidebar/sidebar_model.cc
@@ -163,7 +163,7 @@ void SidebarModel::OnURLVisited(history::HistoryService* history_service,
           FROM_HERE,
           base::BindOnce(&SidebarModel::FetchFavicon,
                          weak_ptr_factory_.GetWeakPtr(), items[i]),
-          base::TimeDelta::FromSeconds(2));
+          base::Seconds(2));
     }
   }
 }
diff --git a/browser/ui/views/brave_ads/ad_notification_popup.cc b/browser/ui/views/brave_ads/ad_notification_popup.cc
index da27eb53338b..a02ae0d03d84 100644
--- a/browser/ui/views/brave_ads/ad_notification_popup.cc
+++ b/browser/ui/views/brave_ads/ad_notification_popup.cc
@@ -399,7 +399,7 @@ void AdNotificationPopup::FadeIn() {
   animation_state_ = AnimationState::kFadeIn;
 
   const base::TimeDelta fade_duration =
-      base::TimeDelta::FromMilliseconds(features::AdNotificationFadeDuration());
+      base::Milliseconds(features::AdNotificationFadeDuration());
   animation_->SetDuration(fade_duration);
 
   StartAnimation();
@@ -409,7 +409,7 @@ void AdNotificationPopup::FadeOut() {
   animation_state_ = AnimationState::kFadeOut;
 
   const base::TimeDelta fade_duration =
-      base::TimeDelta::FromMilliseconds(features::AdNotificationFadeDuration());
+      base::Milliseconds(features::AdNotificationFadeDuration());
   animation_->SetDuration(fade_duration);
 
   StartAnimation();
diff --git a/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc b/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc
index 7e9faf555e86..7dca7e14bec3 100644
--- a/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc
+++ b/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc
@@ -397,8 +397,7 @@ void BraveTooltipPopup::CloseWidgetView() {
 void BraveTooltipPopup::FadeIn() {
   animation_state_ = AnimationState::kFadeIn;
 
-  const base::TimeDelta fade_duration =
-      base::TimeDelta::FromMilliseconds(fade_duration_);
+  const base::TimeDelta fade_duration = base::Milliseconds(fade_duration_);
   animation_->SetDuration(fade_duration);
 
   StartAnimation();
@@ -407,8 +406,7 @@ void BraveTooltipPopup::FadeIn() {
 void BraveTooltipPopup::FadeOut() {
   animation_state_ = AnimationState::kFadeOut;
 
-  const base::TimeDelta fade_duration =
-      base::TimeDelta::FromMilliseconds(fade_duration_);
+  const base::TimeDelta fade_duration = base::Milliseconds(fade_duration_);
   animation_->SetDuration(fade_duration);
 
   StartAnimation();
diff --git a/browser/ui/views/infobars/brave_wayback_machine_infobar_throbber.cc b/browser/ui/views/infobars/brave_wayback_machine_infobar_throbber.cc
index 1f47587981a0..459d6cb14887 100644
--- a/browser/ui/views/infobars/brave_wayback_machine_infobar_throbber.cc
+++ b/browser/ui/views/infobars/brave_wayback_machine_infobar_throbber.cc
@@ -23,7 +23,7 @@ void BraveWaybackMachineInfoBarThrobber::Start() {
 
   start_time_ = base::TimeTicks::Now();
   timer_.Start(
-      FROM_HERE, base::TimeDelta::FromMilliseconds(30),
+      FROM_HERE, base::Milliseconds(30),
       base::BindRepeating(&BraveWaybackMachineInfoBarThrobber::SchedulePaint,
                           base::Unretained(this)));
   SchedulePaint();  // paint right away
diff --git a/browser/ui/views/renderer_context_menu/brave_render_view_context_menu_views.cc b/browser/ui/views/renderer_context_menu/brave_render_view_context_menu_views.cc
index 26eca095a4f8..8e7ac3b75bb0 100644
--- a/browser/ui/views/renderer_context_menu/brave_render_view_context_menu_views.cc
+++ b/browser/ui/views/renderer_context_menu/brave_render_view_context_menu_views.cc
@@ -6,7 +6,7 @@
 #include "brave/browser/ui/views/renderer_context_menu/brave_render_view_context_menu_views.h"
 
 BraveRenderViewContextMenuViews::BraveRenderViewContextMenuViews(
-    content::RenderFrameHost* render_frame_host,
+    content::RenderFrameHost& render_frame_host,
     const content::ContextMenuParams& params)
     : RenderViewContextMenuViews(render_frame_host, params) {}
 
@@ -14,7 +14,7 @@ BraveRenderViewContextMenuViews::~BraveRenderViewContextMenuViews() = default;
 
 // static
 RenderViewContextMenuViews* BraveRenderViewContextMenuViews::Create(
-    content::RenderFrameHost* render_frame_host,
+    content::RenderFrameHost& render_frame_host,
     const content::ContextMenuParams& params) {
   return new BraveRenderViewContextMenuViews(render_frame_host, params);
 }
diff --git a/browser/ui/views/renderer_context_menu/brave_render_view_context_menu_views.h b/browser/ui/views/renderer_context_menu/brave_render_view_context_menu_views.h
index bb20ac4883d0..5cde51cae95b 100644
--- a/browser/ui/views/renderer_context_menu/brave_render_view_context_menu_views.h
+++ b/browser/ui/views/renderer_context_menu/brave_render_view_context_menu_views.h
@@ -18,13 +18,17 @@ class BraveRenderViewContextMenuViews : public RenderViewContextMenuViews {
 
   // Factory function to create an instance.
   static RenderViewContextMenuViews* Create(
-      content::RenderFrameHost* render_frame_host,
+      // Non-const reference passed in the parent class upstream
+      // NOLINTNEXTLINE(runtime/references)
+      content::RenderFrameHost& render_frame_host,
       const content::ContextMenuParams& params);
 
   void Show() override;
 
  protected:
-  BraveRenderViewContextMenuViews(content::RenderFrameHost* render_frame_host,
+  // Non-const reference passed in the parent class upstream
+  // NOLINTNEXTLINE(runtime/references)
+  BraveRenderViewContextMenuViews(content::RenderFrameHost& render_frame_host,
                                   const content::ContextMenuParams& params);
 };
 
diff --git a/browser/ui/views/sidebar/sidebar_container_view.cc b/browser/ui/views/sidebar/sidebar_container_view.cc
index 385699a1dffd..b2d261576541 100644
--- a/browser/ui/views/sidebar/sidebar_container_view.cc
+++ b/browser/ui/views/sidebar/sidebar_container_view.cc
@@ -263,7 +263,7 @@ void SidebarContainerView::ShowSidebar(bool show_sidebar,
   } else {
     constexpr int kHideDelayInMS = 400;
     sidebar_hide_timer_.Start(
-        FROM_HERE, base::TimeDelta::FromMilliseconds(kHideDelayInMS),
+        FROM_HERE, base::Milliseconds(kHideDelayInMS),
         base::BindOnce(&SidebarContainerView::DoHideSidebar,
                        base::Unretained(this), show_event_detect_widget));
   }
diff --git a/browser/ui/views/sidebar/sidebar_item_add_button.cc b/browser/ui/views/sidebar/sidebar_item_add_button.cc
index f7ec0fc9ceb2..dd7a4f52e99a 100644
--- a/browser/ui/views/sidebar/sidebar_item_add_button.cc
+++ b/browser/ui/views/sidebar/sidebar_item_add_button.cc
@@ -63,8 +63,7 @@ void SidebarItemAddButton::ShowBubbleWithDelay() {
     timer_.Stop();
 
   constexpr int kBubbleLaunchDelayInMS = 200;
-  timer_.Start(FROM_HERE,
-               base::TimeDelta::FromMilliseconds(kBubbleLaunchDelayInMS), this,
+  timer_.Start(FROM_HERE, base::Milliseconds(kBubbleLaunchDelayInMS), this,
                &SidebarItemAddButton::DoShowBubble);
 }
 
diff --git a/browser/ui/views/sidebar/sidebar_item_added_feedback_bubble.cc b/browser/ui/views/sidebar/sidebar_item_added_feedback_bubble.cc
index 82c595f37155..4d19dc7bec17 100644
--- a/browser/ui/views/sidebar/sidebar_item_added_feedback_bubble.cc
+++ b/browser/ui/views/sidebar/sidebar_item_added_feedback_bubble.cc
@@ -30,9 +30,7 @@ SidebarItemAddedFeedbackBubble::SidebarItemAddedFeedbackBubble(
     views::View* anchor_view,
     views::View* items_contents_view)
     : BubbleDialogDelegateView(anchor_view, views::BubbleBorder::LEFT_CENTER),
-      animation_(base::TimeDelta::FromMilliseconds(kFadeoutDurationInMs),
-                 60,
-                 this) {
+      animation_(base::Milliseconds(kFadeoutDurationInMs), 60, this) {
   // This bubble uses same color for all themes.
   constexpr SkColor kBubbleBackground = SkColorSetRGB(0x33, 0x9A, 0xF0);
   set_color(kBubbleBackground);
@@ -55,7 +53,7 @@ void SidebarItemAddedFeedbackBubble::OnWidgetVisibilityChanged(
   if (visible && !fade_timer_.IsRunning()) {
     constexpr int kFadeoutStartTimeInMs = 2500;
     fade_timer_.Start(
-        FROM_HERE, base::TimeDelta::FromMilliseconds(kFadeoutStartTimeInMs),
+        FROM_HERE, base::Milliseconds(kFadeoutStartTimeInMs),
         base::BindOnce(&gfx::Animation::Start, base::Unretained(&animation_)));
   }
 }
diff --git a/browser/ui/views/tabs/brave_tab_strip.cc b/browser/ui/views/tabs/brave_tab_strip.cc
index a7af5c0fdd00..b4514d2e6316 100644
--- a/browser/ui/views/tabs/brave_tab_strip.cc
+++ b/browser/ui/views/tabs/brave_tab_strip.cc
@@ -16,20 +16,6 @@
 
 BraveTabStrip::~BraveTabStrip() = default;
 
-bool BraveTabStrip::ShouldHideCloseButtonForTab(Tab* tab) const {
-  bool should_hide = TabStrip::ShouldHideCloseButtonForTab(tab);
-
-  // If upstream logic want to hide, follow it.
-  if (should_hide)
-    return should_hide;
-
-  if (tab->IsActive())
-    return false;
-
-  // Only shows close button on tab when mouse is hovered on tab.
-  return !tab->mouse_hovered();
-}
-
 SkColor BraveTabStrip::GetTabSeparatorColor() const {
   Profile* profile = controller()->GetProfile();
   if (!brave::IsRegularProfile(profile)) {
diff --git a/browser/ui/views/tabs/brave_tab_strip.h b/browser/ui/views/tabs/brave_tab_strip.h
index bae690ba7c0c..4c30dc77b605 100644
--- a/browser/ui/views/tabs/brave_tab_strip.h
+++ b/browser/ui/views/tabs/brave_tab_strip.h
@@ -17,7 +17,6 @@ class BraveTabStrip : public TabStrip {
 
  private:
   // TabStrip overrides:
-  bool ShouldHideCloseButtonForTab(Tab* tab) const override;
   SkColor GetTabSeparatorColor() const override;
 };
 
diff --git a/browser/ui/views/toolbar/wallet_button.cc b/browser/ui/views/toolbar/wallet_button.cc
index 705037283a8e..8b494a3240e2 100644
--- a/browser/ui/views/toolbar/wallet_button.cc
+++ b/browser/ui/views/toolbar/wallet_button.cc
@@ -46,7 +46,6 @@ WalletButton::WalletButton(View* backup_anchor_view, PrefService* prefs)
       kShowWalletIconOnToolbar,
       base::BindRepeating(&WalletButton::OnPreferenceChanged,
                           base::Unretained(this)));
-  InitBubbleManagerAnchor();
   UpdateVisibility();
 
   auto menu_button_controller = std::make_unique<views::MenuButtonController>(
@@ -77,19 +76,11 @@ void WalletButton::UpdateImageAndText() {
   SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_WALLET));
 }
 
-void WalletButton::InitBubbleManagerAnchor() {
-  View* anchor_view = this;
-  if (!prefs_->GetBoolean(kShowWalletIconOnToolbar)) {
-    anchor_view = backup_anchor_view_;
-  }
-}
-
 void WalletButton::UpdateVisibility() {
   SetVisible(prefs_->GetBoolean(kShowWalletIconOnToolbar));
 }
 
 void WalletButton ::OnPreferenceChanged() {
-  InitBubbleManagerAnchor();
   UpdateVisibility();
 }
 
diff --git a/browser/ui/views/toolbar/wallet_button.h b/browser/ui/views/toolbar/wallet_button.h
index 9645c0567fd5..3f92de031603 100644
--- a/browser/ui/views/toolbar/wallet_button.h
+++ b/browser/ui/views/toolbar/wallet_button.h
@@ -33,7 +33,6 @@ class WalletButton : public ToolbarButton {
   bool IsBubbleClosedForTesting();
 
   void UpdateImageAndText();
-  void InitBubbleManagerAnchor();
   void UpdateVisibility();
 
   views::View* GetAsAnchorView();
diff --git a/browser/ui/webui/brave_rewards_page_ui.cc b/browser/ui/webui/brave_rewards_page_ui.cc
index e0daed8c317e..629a6e966c90 100644
--- a/browser/ui/webui/brave_rewards_page_ui.cc
+++ b/browser/ui/webui/brave_rewards_page_ui.cc
@@ -1257,8 +1257,7 @@ void RewardsDOMHandler::GetAdsHistory(base::Value::ConstListView args) {
   const base::Time to_time = base::Time::Now();
   const uint64_t to_timestamp = to_time.ToDoubleT();
 
-  const base::Time from_time =
-      to_time - base::TimeDelta::FromDays(kDaysOfAdsHistory - 1);
+  const base::Time from_time = to_time - base::Days(kDaysOfAdsHistory - 1);
   const base::Time from_time_local_midnight = from_time.LocalMidnight();
   const uint64_t from_timestamp = from_time_local_midnight.ToDoubleT();
 
diff --git a/browser/ui/webui/brave_settings_ui.cc b/browser/ui/webui/brave_settings_ui.cc
index 25b461b09588..aac455054402 100644
--- a/browser/ui/webui/brave_settings_ui.cc
+++ b/browser/ui/webui/brave_settings_ui.cc
@@ -11,7 +11,6 @@
 #include "brave/browser/ntp_background_images/view_counter_service_factory.h"
 #include "brave/browser/resources/settings/grit/brave_settings_resources.h"
 #include "brave/browser/resources/settings/grit/brave_settings_resources_map.h"
-#include "brave/browser/sparkle_buildflags.h"
 #include "brave/browser/ui/webui/navigation_bar_data_provider.h"
 #include "brave/browser/ui/webui/settings/brave_appearance_handler.h"
 #include "brave/browser/ui/webui/settings/brave_default_extensions_handler.h"
@@ -31,10 +30,6 @@
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/content_features.h"
 
-#if BUILDFLAG(ENABLE_SPARKLE)
-#include "brave/browser/ui/webui/settings/brave_relaunch_handler_mac.h"
-#endif
-
 #if BUILDFLAG(ENABLE_SIDEBAR)
 #include "brave/browser/ui/sidebar/sidebar_utils.h"
 #endif
@@ -64,10 +59,6 @@ BraveSettingsUI::BraveSettingsUI(content::WebUI* web_ui,
   web_ui->AddMessageHandler(std::make_unique<BraveAppearanceHandler>());
   web_ui->AddMessageHandler(std::make_unique<BraveSyncHandler>());
   web_ui->AddMessageHandler(std::make_unique<BraveWalletHandler>());
-#if BUILDFLAG(ENABLE_SPARKLE)
-  // Use sparkle's relaunch api for browser relaunch on update.
-  web_ui->AddMessageHandler(std::make_unique<BraveRelaunchHandler>());
-#endif
 #if defined(OS_WIN)
   if (MSEdgeProtocolMessageHandler::CanSetDefaultMSEdgeProtocolHandler())
     web_ui->AddMessageHandler(std::make_unique<MSEdgeProtocolMessageHandler>());
diff --git a/browser/ui/webui/brave_welcome_ui.cc b/browser/ui/webui/brave_welcome_ui.cc
index 026f50d4c427..cd126e541473 100644
--- a/browser/ui/webui/brave_welcome_ui.cc
+++ b/browser/ui/webui/brave_welcome_ui.cc
@@ -152,7 +152,7 @@ BraveWelcomeUI::BraveWelcomeUI(content::WebUI* web_ui, const std::string& name)
     if (country_id == country_codes::CountryStringToCountryID("JP")) {
       base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
           FROM_HERE, base::BindOnce(&OpenJapanWelcomePage, profile),
-          base::TimeDelta::FromSeconds(3));
+          base::Seconds(3));
     }
   }
   source->AddString("countryString", CountryIDToCountryString(country_id));
diff --git a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc
index 2f96058dc719..75149e9b7eb2 100644
--- a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc
+++ b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc
@@ -175,7 +175,7 @@ bool BraveNewTabMessageHandler::CanPromptBraveTalk(base::Time now) {
   // with the switches:kNoFirstRun flag, so we need to allow blocking for that.
   base::ScopedAllowBlockingForTesting allow_blocking;
   base::Time time_first_run = first_run::GetFirstRunSentinelCreationTime();
-  base::Time talk_prompt_trigger_time = now - base::TimeDelta::FromDays(3);
+  base::Time talk_prompt_trigger_time = now - base::Days(3);
   return (time_first_run <= talk_prompt_trigger_time);
 }
 
diff --git a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler_unittest.cc b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler_unittest.cc
index 5d564eb03bf9..fbd65b48c6e5 100644
--- a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler_unittest.cc
+++ b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler_unittest.cc
@@ -14,8 +14,8 @@ TEST(BraveNewTabMessageHandlerTest, TalkPrompt) {
   auto* clock = new base::SimpleTestClock();
   clock->SetNow(first_run::GetFirstRunSentinelCreationTime());
   EXPECT_EQ(BraveNewTabMessageHandler::CanPromptBraveTalk(clock->Now()), false);
-  clock->Advance(base::TimeDelta::FromDays(2));
+  clock->Advance(base::Days(2));
   EXPECT_EQ(BraveNewTabMessageHandler::CanPromptBraveTalk(clock->Now()), false);
-  clock->Advance(base::TimeDelta::FromDays(1));
+  clock->Advance(base::Days(1));
   EXPECT_EQ(BraveNewTabMessageHandler::CanPromptBraveTalk(clock->Now()), true);
 }
diff --git a/browser/ui/webui/settings/brave_relaunch_handler_mac.h b/browser/ui/webui/settings/brave_relaunch_handler_mac.h
index 17d16d7c9f32..fa4a655f13c7 100644
--- a/browser/ui/webui/settings/brave_relaunch_handler_mac.h
+++ b/browser/ui/webui/settings/brave_relaunch_handler_mac.h
@@ -6,24 +6,10 @@
 #ifndef BRAVE_BROWSER_UI_WEBUI_SETTINGS_BRAVE_RELAUNCH_HANDLER_MAC_H_
 #define BRAVE_BROWSER_UI_WEBUI_SETTINGS_BRAVE_RELAUNCH_HANDLER_MAC_H_
 
-#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
+namespace brave_relaunch_handler {
 
-class Profile;
+void RelaunchOnMac();
 
-class BraveRelaunchHandler : public settings::SettingsPageUIHandler {
- public:
-  BraveRelaunchHandler() = default;
-  ~BraveRelaunchHandler() override = default;
-
- private:
-  // SettingsPageUIHandler overrides:
-  void RegisterMessages() override;
-  void OnJavascriptAllowed() override {}
-  void OnJavascriptDisallowed() override {}
-
-  void Relaunch(base::Value::ConstListView args);
-
-  DISALLOW_COPY_AND_ASSIGN(BraveRelaunchHandler);
-};
+}  // namespace brave_relaunch_handler
 
 #endif  // BRAVE_BROWSER_UI_WEBUI_SETTINGS_BRAVE_RELAUNCH_HANDLER_MAC_H_
diff --git a/browser/ui/webui/settings/brave_relaunch_handler_mac.mm b/browser/ui/webui/settings/brave_relaunch_handler_mac.mm
index ef42554bfef6..6d0cc7995bc9 100644
--- a/browser/ui/webui/settings/brave_relaunch_handler_mac.mm
+++ b/browser/ui/webui/settings/brave_relaunch_handler_mac.mm
@@ -1,18 +1,16 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2021 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/ui/webui/settings/brave_relaunch_handler_mac.h"
 
-#include "base/bind.h"
 #import "brave/browser/mac/sparkle_glue.h"
 
-void BraveRelaunchHandler::RegisterMessages() {
-  web_ui()->RegisterMessageCallback(
-      "relaunchOnMac", base::BindRepeating(&BraveRelaunchHandler::Relaunch,
-                                           base::Unretained(this)));
-}
+namespace brave_relaunch_handler {
 
-void BraveRelaunchHandler::Relaunch(base::Value::ConstListView args) {
+void RelaunchOnMac() {
   [[SparkleGlue sharedSparkleGlue] relaunch];
 }
+
+}  // namespace brave_relaunch_handler
\ No newline at end of file
diff --git a/browser/webcompat_reporter/webcompat_reporter_dialog.cc b/browser/webcompat_reporter/webcompat_reporter_dialog.cc
index ac74f77c40f5..21f537117579 100644
--- a/browser/webcompat_reporter/webcompat_reporter_dialog.cc
+++ b/browser/webcompat_reporter/webcompat_reporter_dialog.cc
@@ -14,10 +14,12 @@
 #include "base/values.h"
 #include "brave/common/webui_url_constants.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
@@ -100,9 +102,11 @@ bool WebcompatReporterDialogDelegate::ShouldShowDialogTitle() const {
 }
 
 void OpenWebcompatReporterDialog(content::WebContents* initiator) {
-  GURL site_url = initiator->GetLastCommittedURL();
+  url::Origin site_url_origin =
+      url::Origin::Create(initiator->GetLastCommittedURL());
+
   auto params_dict = std::make_unique<base::DictionaryValue>();
-  params_dict->SetString("siteUrl", site_url.GetOrigin().spec());
+  params_dict->SetString("siteUrl", site_url_origin.Serialize());
 
   gfx::Size min_size(kDialogWidth, kDialogMinHeight);
   gfx::Size max_size(kDialogWidth, kDialogMaxHeight);
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java
index 45cfc9748e33..08c79b63a7e3 100644
--- a/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java
+++ b/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java
@@ -16,10 +16,16 @@ public BraveNewTabPageClassAdapter(ClassVisitor visitor) {
 
         redirectConstructor(sNewTabPageClassName, sBraveNewTabPageClassName);
 
+        deleteField(sBraveNewTabPageClassName, "mBrowserControlsStateProvider");
+        makeProtectedField(sNewTabPageClassName, "mBrowserControlsStateProvider");
+
         deleteField(sBraveNewTabPageClassName, "mNewTabPageLayout");
         makeProtectedField(sNewTabPageClassName, "mNewTabPageLayout");
 
         deleteField(sBraveNewTabPageClassName, "mFeedSurfaceProvider");
         makeProtectedField(sNewTabPageClassName, "mFeedSurfaceProvider");
+
+        deleteField(sBraveNewTabPageClassName, "mToolbarSupplier");
+        makeProtectedField(sNewTabPageClassName, "mToolbarSupplier");
     }
 }
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java
index 64539c1d443b..aae6d0d1f47f 100644
--- a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java
+++ b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java
@@ -108,10 +108,6 @@ public BraveToolbarManagerClassAdapter(ClassVisitor visitor) {
         addMethodAnnotation(
                 sBraveToolbarManagerClassName, "onOrientationChange", "Ljava/lang/Override;");
 
-        makePublicMethod(sToolbarManagerClassName, "updateButtonStatus");
-        addMethodAnnotation(
-                sBraveToolbarManagerClassName, "updateButtonStatus", "Ljava/lang/Override;");
-
         makePublicMethod(sToolbarManagerClassName, "updateBookmarkButtonStatus");
         addMethodAnnotation(sBraveToolbarManagerClassName, "updateBookmarkButtonStatus",
                 "Ljava/lang/Override;");
diff --git a/build/commands/lib/test.js b/build/commands/lib/test.js
index efff23eae3cd..1b30f1b1d333 100644
--- a/build/commands/lib/test.js
+++ b/build/commands/lib/test.js
@@ -28,16 +28,6 @@ const test = (passthroughArgs, suite, buildConfig = config.defaultBuildConfig, o
     '--enable-logging=stderr'
   ]
 
-  // Cr93: browser tests error out on Windows CI with
-  // content/public/test/test_utils.cc(137): error: Failed
-  // RunLoop::Run() timed out. Timeout set at ProxyRunTestOnMainThreadLoop@
-  // content/public/test/browser_test_base.cc:800.
-  // Running with --disable-gpu-sandbox fixes it, but it's unclear ATM what the
-  // issue is.
-  if (suite === 'brave_browser_tests' && process.platform === 'win32' && buildConfig === 'Release') {
-    braveArgs.push('--disable-gpu-sandbox')
-  }
-
   // Android doesn't support --v
   if (config.targetOS !== 'android') {
     braveArgs.push('--v=' + options.v)
diff --git a/build/ios/mojom/mojom_objc_generator.py b/build/ios/mojom/mojom_objc_generator.py
index 346dbb667e06..ddd909e180e0 100644
--- a/build/ios/mojom/mojom_objc_generator.py
+++ b/build/ios/mojom/mojom_objc_generator.py
@@ -68,9 +68,10 @@ def ExpectedCppType(self):
     def DefaultObjCValue(self, default):
         return "[[NSDate alloc] init]"
     def ObjCToCpp(self, accessor):
-        return "base::TimeDelta::FromSecondsD(%s.timeIntervalSince1970)" % accessor
+        return "base::Seconds(%s.timeIntervalSince1970)" % accessor
     def CppToObjC(self, accessor):
-        return "[NSDate dateWithTimeIntervalSince1970:%s.InSecondsF()]" % accessor
+        return ("[NSDate dateWithTimeIntervalSince1970:%s.InSecondsF()]"
+                % accessor)
 
 class URLMojoTypemap(MojoTypemap):
     @staticmethod
@@ -121,7 +122,9 @@ class NumberMojoTypemap(MojoTypemap):
     def IsMojoType(kind):
         return kind in _kind_to_nsnumber_getter
     def ObjCWrappedType(self):
-        return "NSNumber*" if self.is_inside_container else _kind_to_c_type[self.kind]
+        if self.is_inside_container:
+            return "NSNumber*"
+        return _kind_to_c_type[self.kind]
     def ExpectedCppType(self):
         return _kind_to_c_type[self.kind]
     def ObjCToCpp(self, accessor):
@@ -129,7 +132,8 @@ def ObjCToCpp(self, accessor):
             return "%s.%s" % (accessor, _kind_to_nsnumber_getter[self.kind])
         return accessor
     def DefaultObjCValue(self, default):
-        return default # Default for primatives not needed, array/map default is empty
+        # Default for primitives not needed, array/map default is empty
+        return default
     def CppToObjC(self, accessor):
         if self.is_inside_container:
             return "@(%s)" % accessor
@@ -137,7 +141,8 @@ def CppToObjC(self, accessor):
 
 class ArrayMojoTypemap(MojoTypemap):
     def __init__(self, kind, is_inside_container):
-        super(ArrayMojoTypemap, self).__init__(kind, is_inside_container=is_inside_container)
+        super(ArrayMojoTypemap, self).__init__(
+            kind, is_inside_container=is_inside_container)
         self.wrappedTypemap = MojoTypemapForKind(kind.kind, True)
     @staticmethod
     def IsMojoType(kind):
@@ -183,7 +188,8 @@ def DefaultObjCValue(self, default):
     def ObjCToCpp(self, accessor):
         return "%s.cppObjPtr" % accessor
     def CppToObjC(self, accessor):
-        args = (ObjCPrefixFromKind(self.kind), self.kind.name, self.kind.name, accessor)
+        args = (ObjCPrefixFromKind(self.kind), self.kind.name, self.kind.name,
+                accessor)
         return "[[%s%s alloc] initWith%s:*%s]" % args
 
 class EnumMojoTypemap(MojoTypemap):
@@ -205,7 +211,8 @@ def CppToObjC(self, accessor):
 
 class DictionaryMojoTypemap(MojoTypemap):
     def __init__(self, kind, is_inside_container):
-        super(DictionaryMojoTypemap, self).__init__(kind, is_inside_container=is_inside_container)
+        super(DictionaryMojoTypemap,
+              self).__init__(kind, is_inside_container=is_inside_container)
         self.keyTypemap = MojoTypemapForKind(self.kind.key_kind, True)
         self.valueTypemap = MojoTypemapForKind(self.kind.value_kind, True)
     @staticmethod
@@ -220,7 +227,8 @@ def ExpectedCppType(self):
     def DefaultObjCValue(self, default):
         return "@{}"
     def ObjCToCpp(self, accessor):
-        args = (self.keyTypemap.ExpectedCppType(), self.valueTypemap.ExpectedCppType(),
+        args = (self.keyTypemap.ExpectedCppType(),
+                self.valueTypemap.ExpectedCppType(),
                 self.keyTypemap.ObjCWrappedType(), accessor,
                 self.keyTypemap.ObjCToCpp("key"),
                 self.valueTypemap.ObjCToCpp("%s[key]" % accessor))
@@ -247,13 +255,16 @@ class PendingRemoteMojoTypemap(MojoTypemap):
     def IsMojoType(kind):
         return mojom.IsPendingRemoteKind(kind)
     def ObjCWrappedType(self):
-        return "id<%s%s>" % (ObjCPrefixFromKind(self.kind.kind), self.kind.kind.name)
+        return "id<%s%s>" % (ObjCPrefixFromKind(self.kind.kind),
+                             self.kind.kind.name)
     def ExpectedCppType(self):
-        return "%s::%s" % (CppNamespaceFromKind(self.kind.kind), self.kind.kind.name)
+        return "%s::%s" % (CppNamespaceFromKind(self.kind.kind),
+                           self.kind.kind.name)
     def DefaultObjCValue(self, default):
         return None
     def ObjCToCpp(self, accessor):
-        name = ObjCPrefixFromKind(self.kind.kind) + self.kind.kind.name + "Bridge"
+        name = (ObjCPrefixFromKind(self.kind.kind) + self.kind.kind.name +
+                "Bridge")
         args = (name, accessor, UnderToLowerCamel(name))
         return """^{
             auto bridge = std::make_unique<%s>(%s);
@@ -314,7 +325,8 @@ def GetFilters(self):
         objc_filters = {
             "objc_property_modifiers": self._GetObjCPropertyModifiers,
             "objc_property_default": self._GetObjCPropertyDefaultValue,
-            "objc_property_needs_default_assignment": self._ObjcPropertyNeedsDefaultValueAssignment,
+            "objc_property_needs_default_assignment": \
+                self._ObjcPropertyNeedsDefaultValueAssignment,
             "objc_wrapper_type": self._GetObjCWrapperType,
             "objc_property_formatter": self._ObjCPropertyFormatter,
             "objc_method_name_formatter": self._ObjCMethodNameFormatter,
@@ -353,12 +365,15 @@ def is_move_only_kind(kind):
             if mojom.IsAnyHandleOrInterfaceKind(kind):
                 return True
             return False
-        should_pass_param_by_value = (not mojom.IsReferenceKind(kind)) or is_move_only_kind(kind)
+        should_pass_param_by_value = ((not mojom.IsReferenceKind(kind)) or
+                                      is_move_only_kind(kind))
         typemap = MojoTypemapForKind(kind, False)
         typestring = typemap.ExpectedCppType()
         if mojom.IsNullableKind(kind) and not mojom.IsStructKind(kind):
             typestring = "absl::optional<%s>" % typestring
-        return typestring if should_pass_param_by_value else "const %s&" % typestring
+        if should_pass_param_by_value:
+            return typestring
+        return "const %s&" % typestring
 
     def _GetObjCPropertyModifiers(self, kind):
         modifiers = ['nonatomic']
@@ -400,7 +415,8 @@ def _GetObjCArgumentModifiers(self, kind, inside_callback=False):
     def _ObjCPropertyFormatter(self, value):
         """ snake case to camel case, and replaces reserved names """
         name = UnderToCamel(value, lower_initial=True)
-        # A set of reserved names by Obj-C which shouldn't be used as property names
+        # A set of reserved names by Obj-C which shouldn't be used as property
+        # names
         reserved = {
             'description': 'desc',
             'debugDescription': 'debugDesc',
@@ -433,7 +449,8 @@ def _ObjCEnumFormatter(self, value):
 
     def _ObjCToCppAssign(self, field, obj=None):
         kind = field.kind
-        accessor = "%s%s" % (obj + "." if obj else "", self._ObjCPropertyFormatter(field.name))
+        accessor = "%s%s" % (obj + "." if obj else "",
+                             self._ObjCPropertyFormatter(field.name))
         typemap = MojoTypemapForKind(kind)
         if typemap is None:
             raise Exception("No typemap found for the given kind: %s" % kind)
@@ -442,7 +459,8 @@ def _ObjCToCppAssign(self, field, obj=None):
             if mojom.IsStructKind(kind):
                 cpp_assign = "%s ? %s : nullptr" % (accessor, cpp_assign)
             else:
-                cpp_assign = "%s ? absl::make_optional(%s) : absl::nullopt" % (accessor, cpp_assign)
+                cpp_assign = "%s ? absl::make_optional(%s) : absl::nullopt" % (
+                    accessor, cpp_assign)
         return cpp_assign
 
     def _CppToObjCAssign(self, field, obj=None):
@@ -450,32 +468,42 @@ def _CppToObjCAssign(self, field, obj=None):
         accessor = "%s%s" % (obj + "." if obj else "", field.name)
         typemap = MojoTypemapForKind(kind)
         if mojom.IsNullableKind(kind):
-            value_accessor = accessor if mojom.IsStructKind(kind) else "%s.value()" % accessor
-            return "%s ? %s : nil" % (accessor, typemap.CppToObjC(value_accessor))
+            if mojom.IsStructKind(kind):
+                value_accessor = accessor
+            else:
+                value_accessor = "%s.value()" % accessor
+            return "%s ? %s : nil" % (
+                accessor, typemap.CppToObjC(value_accessor))
         return typemap.CppToObjC(accessor)
 
     def _ConstObjCAssign(self, constant):
         kind = constant.kind
         # Obj-C only supports a handful of constant types
         if mojom.IsStringKind(kind):
-            return '@%s' % constant.value # string constant value come with quotes already
+            # string constant value come with quotes already
+            return '@%s' % constant.value
         if kind in _kind_to_nsnumber_getter:
             return constant.value
-        raise Exception("Obj-C constant cannot be generated for the given kind: %s" % kind)
+        raise Exception(
+            "Obj-C constant cannot be generated for the given kind: %s" % kind)
 
     def _GetJinjaExports(self):
-        all_structs = [item for item in self.module.structs if item.name not in self.excludedTypes]
+        all_structs = [item for item in
+                       self.module.structs if item.name not in
+                       self.excludedTypes]
         all_interfaces = [item for item in
-                          self.module.interfaces if item.name not in self.excludedTypes]
+                          self.module.interfaces if item.name not in
+                          self.excludedTypes]
         all_enums = list(self.module.enums)
         for struct in all_structs:
             all_enums.extend(struct.enums)
-            # This allows us to only generate Obj-C++ wrappers for types actually used
-            # within other types
+            # This allows us to only generate Obj-C++ wrappers for types
+            # actually used within other types
             for field in struct.fields:
                 if (field.kind.module is not None and
                         field.kind.module.namespace != self.module.namespace):
-                    if mojom.IsStructKind(field.kind) and field.kind.module == self.module:
+                    if (mojom.IsStructKind(field.kind) and
+                            field.kind.module == self.module):
                         all_structs.append(field.kind)
                         all_enums.extend(field.kind.enums)
                     elif mojom.IsEnumKind(field.kind):
@@ -531,4 +559,5 @@ def GenerateFiles(self, output_dir):
         self.Write(self._GenerateModuleHeader(), output_dir, "%s.objc.h" % name)
         self.Write(self._GeneratePrivateModuleHeader(), output_dir,
                    "%s.objc+private.h" % name)
-        self.Write(self._GenerateModuleSource(), output_dir, "%s.objc.mm" % name)
+        self.Write(self._GenerateModuleSource(), output_dir,
+                   "%s.objc.mm" % name)
diff --git a/chromium_src/chrome/browser/DEPS b/chromium_src/chrome/browser/DEPS
index b81a5477ed0c..0c36ca6bb7ae 100644
--- a/chromium_src/chrome/browser/DEPS
+++ b/chromium_src/chrome/browser/DEPS
@@ -52,6 +52,7 @@ include_rules = [
   "+../../../../../../chrome/browser/ui/bookmarks",
   "+../../../../../../chrome/browser/ui/cocoa",
   "+../../../../../../chrome/browser/ui/content_settings",
+  "+../../../../../../chrome/browser/ui/dialogs",
   "+../../../../../../chrome/browser/ui/extensions",
   "+../../../../../../chrome/browser/ui/omnibox",
   "+../../../../../../chrome/browser/ui/page_info",
@@ -123,6 +124,7 @@ include_rules = [
   "+components/spellcheck/browser",
   "+components/startup_metric_utils/browser",
   "+components/strings",
+  "+components/translate/core/browser",
   "+components/version_info",
   "+extensions/browser",
   "+extensions/buildflags",
diff --git a/chromium_src/chrome/browser/component_updater/registration.cc b/chromium_src/chrome/browser/component_updater/registration.cc
index 97692c46daed..457c5d5894b1 100644
--- a/chromium_src/chrome/browser/component_updater/registration.cc
+++ b/chromium_src/chrome/browser/component_updater/registration.cc
@@ -14,11 +14,8 @@
 
 namespace component_updater {
 
-void RegisterComponentsForUpdate(bool is_off_the_record_profile,
-                                 PrefService* profile_prefs,
-                                 const base::FilePath& profile_path) {
-  RegisterComponentsForUpdate_ChromiumImpl(is_off_the_record_profile,
-                                           profile_prefs, profile_path);
+void RegisterComponentsForUpdate() {
+  RegisterComponentsForUpdate_ChromiumImpl();
   ComponentUpdateService* cus = g_browser_process->component_updater();
   brave_wallet::RegisterWalletDataFilesComponent(cus);
 }
diff --git a/chromium_src/chrome/browser/extensions/chrome_content_verifier_delegate.cc b/chromium_src/chrome/browser/extensions/chrome_content_verifier_delegate.cc
index 7ef13540bcae..e54a5bb6de7f 100644
--- a/chromium_src/chrome/browser/extensions/chrome_content_verifier_delegate.cc
+++ b/chromium_src/chrome/browser/extensions/chrome_content_verifier_delegate.cc
@@ -22,9 +22,9 @@
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
+#include "chrome/browser/extensions/corrupted_extension_reinstaller.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/install_verifier.h"
-#include "chrome/browser/extensions/policy_extension_reinstaller.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "extensions/browser/disable_reason.h"
diff --git a/chromium_src/chrome/browser/prefs/browser_prefs.cc b/chromium_src/chrome/browser/prefs/browser_prefs.cc
index dfc6b059ef59..79f84dc0b012 100644
--- a/chromium_src/chrome/browser/prefs/browser_prefs.cc
+++ b/chromium_src/chrome/browser/prefs/browser_prefs.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/gcm_driver/gcm_buildflags.h"
+#include "components/translate/core/browser/translate_prefs.h"
 #include "third_party/widevine/cdm/buildflags.h"
 
 #if BUILDFLAG(ENABLE_TOR)
diff --git a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_unittest.cc b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_unittest.cc
index 8a380cd78bba..c33e51035c3c 100644
--- a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_unittest.cc
+++ b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_unittest.cc
@@ -696,19 +696,19 @@ TEST_F(PrivacySandboxSettingsTest, GetFlocIdNextUpdateForDisplay) {
   EXPECT_FALSE(privacy_sandbox_settings()->IsFlocAllowed());
 
   std::map<base::TimeDelta, std::u16string> offsets_to_expected_string = {
-      {base::TimeDelta::FromHours(23),
+      {base::Hours(23),
        l10n_util::GetStringUTF16(
            IDS_PRIVACY_SANDBOX_FLOC_TIME_TO_NEXT_COMPUTE_INVALID)},
-      {base::TimeDelta::FromHours(25),
+      {base::Hours(25),
        l10n_util::GetStringUTF16(
            IDS_PRIVACY_SANDBOX_FLOC_TIME_TO_NEXT_COMPUTE_INVALID)},
-      {base::TimeDelta::FromDays(2),
+      {base::Days(2),
        l10n_util::GetStringUTF16(
            IDS_PRIVACY_SANDBOX_FLOC_TIME_TO_NEXT_COMPUTE_INVALID)},
-      {base::TimeDelta::FromHours(60),
+      {base::Hours(60),
        l10n_util::GetStringUTF16(
            IDS_PRIVACY_SANDBOX_FLOC_TIME_TO_NEXT_COMPUTE_INVALID)},
-      {base::TimeDelta::FromHours(167),  // 1 hour less than 7 days.
+      {base::Hours(167),  // 1 hour less than 7 days.
        l10n_util::GetStringUTF16(
            IDS_PRIVACY_SANDBOX_FLOC_TIME_TO_NEXT_COMPUTE_INVALID)}};
 
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 56dd8b5335cd..e7ef8a5aba60 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
@@ -22,6 +22,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "url/origin.h"
 
 #if BUILDFLAG(ENABLE_TOR)
 #include "brave/browser/tor/tor_profile_manager.h"
@@ -147,7 +148,7 @@ void OnTorProfileCreated(const GURL& link_url,
 }  // namespace
 
 BraveRenderViewContextMenu::BraveRenderViewContextMenu(
-    content::RenderFrameHost* render_frame_host,
+    content::RenderFrameHost& render_frame_host,
     const content::ContextMenuParams& params)
     : RenderViewContextMenu_Chromium(render_frame_host, params)
 #if BUILDFLAG(ENABLE_IPFS)
@@ -316,8 +317,9 @@ void BraveRenderViewContextMenu::BuildIPFSMenu() {
   }
 
   auto page_url = source_web_contents_->GetURL();
+  url::Origin page_origin = url::Origin::Create(page_url);
   if (page_url.SchemeIsHTTPOrHTTPS() &&
-      !ipfs::IsAPIGateway(page_url.GetOrigin(), chrome::GetChannel())) {
+      !ipfs::IsAPIGateway(page_origin.GetURL(), chrome::GetChannel())) {
     ipfs_submenu_model_.AddItemWithStringId(
         IDC_CONTENT_CONTEXT_IMPORT_IPFS_PAGE,
         IDS_CONTENT_CONTEXT_IMPORT_IPFS_PAGE);
diff --git a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.h
index 43d4804900cf..4dbad9b2659e 100644
--- a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -29,7 +29,9 @@ class BraveRenderViewContextMenu;
 // Declare our own subclass with overridden methods.
 class BraveRenderViewContextMenu : public RenderViewContextMenu_Chromium {
  public:
-  BraveRenderViewContextMenu(content::RenderFrameHost* render_frame_host,
+  // Non-const reference passed in the parent class upstream
+  // NOLINTNEXTLINE(runtime/references)
+  BraveRenderViewContextMenu(content::RenderFrameHost& render_frame_host,
                              const content::ContextMenuParams& params);
   // RenderViewContextMenuBase:
   bool IsCommandIdEnabled(int command_id) const override;
diff --git a/chromium_src/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chromium_src/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
similarity index 50%
rename from chromium_src/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
rename to chromium_src/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
index 63404e2d6b04..599471d2062c 100644
--- a/chromium_src/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
+++ b/chromium_src/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
@@ -1,7 +1,8 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2021 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/common/url_constants.h"  // for kDownloadBraveUrl
 
-#include "../../../../../../chrome/browser/ui/views/outdated_upgrade_bubble_view.cc"
+#include "../../../../../../chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc"
diff --git a/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc b/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc
index cf85f767bed1..e9c66b48b5c8 100644
--- a/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc
+++ b/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc
@@ -39,5 +39,6 @@
     popup_ids_.push_back(tab_id);                                            \
   }                                                                          \
   void BubbleContentsWrapper::RenderViewHostChanged
-#include "../../../../../../chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc"
+
+#include "../../../../../../../chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc"
 #undef RenderViewHostChanged
diff --git a/chromium_src/chrome/browser/ui/views/first_run_dialog.cc b/chromium_src/chrome/browser/ui/views/first_run_dialog.cc
index 97a9b6a3824d..f5328cd1e797 100644
--- a/chromium_src/chrome/browser/ui/views/first_run_dialog.cc
+++ b/chromium_src/chrome/browser/ui/views/first_run_dialog.cc
@@ -31,7 +31,6 @@
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
@@ -49,31 +48,35 @@ void ShowFirstRunDialog(Profile* profile) {
 }
 
 void ShowFirstRunDialogViews(Profile* profile) {
-  FirstRunDialog::Show(profile);
+  base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed);
+  FirstRunDialog::Show(
+      base::BindRepeating(&platform_util::OpenExternal,
+                          base::Unretained(profile),
+                          GURL(chrome::kLearnMoreReportingURL)),
+      run_loop.QuitClosure());
+  run_loop.Run();
 }
 
 }  // namespace first_run
 
 // static
-void FirstRunDialog::Show(Profile* profile) {
-  FirstRunDialog* dialog = new FirstRunDialog(profile);
+void FirstRunDialog::Show(base::RepeatingClosure learn_more_callback,
+                          base::RepeatingClosure quit_runloop) {
+  FirstRunDialog* dialog = new FirstRunDialog(std::move(learn_more_callback),
+                                              std::move(quit_runloop));
   views::DialogDelegate::CreateDialogWidget(dialog, NULL, NULL)->Show();
-
-  base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed);
-  dialog->quit_runloop_ = run_loop.QuitClosure();
-  run_loop.Run();
 }
 
-FirstRunDialog::FirstRunDialog(Profile* profile) {
+FirstRunDialog::FirstRunDialog(base::RepeatingClosure learn_more_callback,
+                               base::RepeatingClosure quit_runloop)
+    : quit_runloop_(quit_runloop) {
   ALLOW_UNUSED_LOCAL(report_crashes_);
 
   SetTitle(l10n_util::GetStringUTF16(IDS_FIRST_RUN_DIALOG_WINDOW_TITLE));
   SetButtons(ui::DIALOG_BUTTON_OK);
   SetExtraView(
       std::make_unique<views::Link>(l10n_util::GetStringUTF16(IDS_LEARN_MORE)))
-      ->SetCallback(base::BindRepeating(&platform_util::OpenExternal,
-                                        base::Unretained(profile),
-                                        GURL(chrome::kLearnMoreReportingURL)));
+      ->SetCallback(std::move(learn_more_callback));
 
   constexpr int kChildSpacing = 16;
   constexpr int kPadding = 24;
diff --git a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view.cc b/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view.cc
deleted file mode 100644
index a002a8521dc9..000000000000
--- a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright (c) 2021 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/page_info/page_info_bubble_view.h"
-#include "brave/common/webui_url_constants.h"
-#include "brave/components/ipfs/ipfs_constants.h"
-#include "brave/components/ipfs/ipfs_utils.h"
-#include "brave/components/vector_icons/vector_icons.h"
-#include "brave/grit/brave_theme_resources.h"
-#include "chrome/browser/ui/views/page_info/page_info_view_factory.h"
-#include "components/grit/brave_components_strings.h"
-#include "ui/base/l10n/l10n_util.h"
-
-namespace {
-
-const char kIPFSDocsURL[] = "https://docs.ipfs.io/";
-
-std::unique_ptr<PageInfoHoverButton> CreateButton(
-    int logo_resource_id,
-    int text_resource_id,
-    int tooltip_resource_id,
-    views::Button::PressedCallback callback) {
-  auto& bundle = ui::ResourceBundle::GetSharedInstance();
-  const auto& ipfs_logo = *bundle.GetImageSkiaNamed(logo_resource_id);
-  const std::u16string& tooltip =
-      l10n_util::GetStringUTF16(tooltip_resource_id);
-
-  return std::make_unique<PageInfoHoverButton>(
-      std::move(callback), ui::ImageModel::FromImageSkia(ipfs_logo),
-      text_resource_id, std::u16string(),
-      PageInfoViewFactory::VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_COOKIE_DIALOG,
-      tooltip, std::u16string());
-}
-
-}  // namespace
-
-// clang-format off
-#define InitializeUiState InitializeUiState(this); if (ipfs::IsIPFSScheme(url)) BraveAddIPFSButtons  // NOLINT
-// clang-format on
-
-#include "../../../../../../../chrome/browser/ui/views/page_info/page_info_bubble_view.cc"
-#undef InitializeUiState
-
-void PageInfoBubbleView::BraveAddIPFSButtons(PageInfoBubbleView* ui) {
-  site_settings_view_->AddChildViewAt(
-      CreateButton(IDR_BRAVE_IPFS_LOGO, IDS_PAGE_INFO_IPFS_SETTINGS_BUTTON_TEXT,
-                   IDS_PAGE_INFO_IPFS_SETTINGS_BUTTON_TOOLTIP_TEXT,
-                   base::BindRepeating(
-                       [](PageInfoBubbleView* view) {
-                         view->ui_delegate_->AddIPFSTabForURL(
-                             GURL(ipfs::kIPFSSettingsURL));
-                       },
-                       base::Unretained(this))),
-      0);
-  site_settings_view_->AddChildViewAt(
-      CreateButton(
-          IDR_BRAVE_IPFS_LOGO, IDS_PAGE_INFO_IPFS_DIAGNOSTICS_BUTTON_TEXT,
-          IDS_PAGE_INFO_IPFS_DIAGNOSTICS_BUTTON_TOOLTIP_TEXT,
-          base::BindRepeating(
-              [](PageInfoBubbleView* view) {
-                view->ui_delegate_->AddIPFSTabForURL(GURL(kIPFSWebUIURL));
-              },
-              base::Unretained(this))),
-      0);
-  site_settings_view_->AddChildViewAt(
-      CreateButton(IDR_BRAVE_IPFS_LOGO, IDS_PAGE_INFO_IPFS_DOCS_BUTTON_TEXT,
-                   IDS_PAGE_INFO_IPFS_DOCS_BUTTON_TEXT_TOOLTIP_TEXT,
-                   base::BindRepeating(
-                       [](PageInfoBubbleView* view) {
-                         view->ui_delegate_->AddIPFSTabForURL(
-                             GURL(kIPFSDocsURL));
-                       },
-                       base::Unretained(this))),
-      0);
-
-  Layout();
-  SizeToContents();
-}
-
-#undef BRAVE_PAGE_INFO_VIEW_FACTORY_GET_PERMISSION_ICON
diff --git a/chromium_src/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chromium_src/chrome/browser/ui/views/page_info/page_info_main_view.cc
new file mode 100644
index 000000000000..098586e3bffa
--- /dev/null
+++ b/chromium_src/chrome/browser/ui/views/page_info/page_info_main_view.cc
@@ -0,0 +1,40 @@
+/* Copyright (c) 2021 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/components/ipfs/ipfs_utils.h"
+#include "brave/grit/brave_theme_resources.h"
+#include "chrome/browser/ui/views/page_info/page_info_view_factory.h"
+#include "components/page_info/page_info.h"
+#include "ui/base/models/image_model.h"
+#include "ui/base/resource/resource_bundle.h"
+
+namespace {
+
+bool IsIPFSPage(PageInfo* presenter) {
+  return presenter && ipfs::IsIPFSScheme(presenter->site_url());
+}
+
+const ui::ImageModel GetIpfsGetConnectionSecureIcon() {
+  auto& bundle = ui::ResourceBundle::GetSharedInstance();
+  const auto& ipfs_logo = *bundle.GetImageSkiaNamed(IDR_BRAVE_IPFS_LOGO);
+  return ui::ImageModel::FromImageSkia(ipfs_logo);
+}
+
+}  // namespace
+
+#define GetConnectionSecureIcon                                           \
+  GetConnectionSecureIcon() != ui::ImageModel() && IsIPFSPage(presenter_) \
+      ? GetIpfsGetConnectionSecureIcon()                                  \
+      : PageInfoViewFactory::GetConnectionSecureIcon
+#define BRAVE_PAGE_INFO_MAIN_VIEW_CALCULATE_PREFERRED_SIZE                     \
+  if (IsIPFSPage(presenter_)) {                                                \
+    width =                                                                    \
+        std::max(security_container_view_->GetPreferredSize().width(), width); \
+  }
+
+#include "../../../../../../../chrome/browser/ui/views/page_info/page_info_main_view.cc"
+
+#undef BRAVE_PAGE_INFO_MAIN_VIEW_CALCULATE_PREFERRED_SIZE
+#undef GetConnectionSecureIcon
diff --git a/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc
index a7e9fa1037aa..8fb57be5e296 100644
--- a/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc
+++ b/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc
@@ -3,7 +3,75 @@
  * 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/page_info/page_info_view_factory.h"
+#include "brave/components/ipfs/buildflags/buildflags.h"
 #include "brave/components/vector_icons/vector_icons.h"
+#if BUILDFLAG(ENABLE_IPFS)
+#include "brave/common/webui_url_constants.h"
+#include "brave/components/ipfs/ipfs_constants.h"
+#include "brave/components/ipfs/ipfs_utils.h"
+#include "brave/components/vector_icons/vector_icons.h"
+#include "brave/grit/brave_theme_resources.h"
+#include "chrome/browser/ui/page_info/chrome_page_info_ui_delegate.h"
+#include "chrome/browser/ui/views/page_info/page_info_hover_button.h"
+#include "components/grit/brave_components_strings.h"
+#include "ui/base/l10n/l10n_util.h"
+
+namespace {
+
+const char kIPFSDocsURL[] = "https://docs.ipfs.io/";
+
+std::unique_ptr<PageInfoHoverButton> CreateButton(
+    int logo_resource_id,
+    int text_resource_id,
+    int tooltip_resource_id,
+    views::Button::PressedCallback callback) {
+  auto& bundle = ui::ResourceBundle::GetSharedInstance();
+  const auto& ipfs_logo = *bundle.GetImageSkiaNamed(logo_resource_id);
+  const std::u16string& tooltip =
+      l10n_util::GetStringUTF16(tooltip_resource_id);
+
+  return std::make_unique<PageInfoHoverButton>(
+      std::move(callback), ui::ImageModel::FromImageSkia(ipfs_logo),
+      text_resource_id, std::u16string(),
+      PageInfoViewFactory::VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_COOKIE_DIALOG,
+      tooltip, std::u16string());
+}
+
+void BraveAddIPFSButtons(views::View* container,
+                         ChromePageInfoUiDelegate* delegate) {
+  if (!container || !delegate)
+    return;
+  container->AddChildView(CreateButton(
+      IDR_BRAVE_IPFS_LOGO, IDS_PAGE_INFO_IPFS_SETTINGS_BUTTON_TEXT,
+      IDS_PAGE_INFO_IPFS_SETTINGS_BUTTON_TOOLTIP_TEXT,
+      base::BindRepeating(
+          [](ChromePageInfoUiDelegate* ui_delegate, const ui::Event& event) {
+            ui_delegate->AddIPFSTabForURL(GURL(ipfs::kIPFSSettingsURL));
+          },
+          delegate)));
+  container->AddChildView(CreateButton(
+      IDR_BRAVE_IPFS_LOGO, IDS_PAGE_INFO_IPFS_DIAGNOSTICS_BUTTON_TEXT,
+      IDS_PAGE_INFO_IPFS_DIAGNOSTICS_BUTTON_TOOLTIP_TEXT,
+      base::BindRepeating(
+          [](ChromePageInfoUiDelegate* ui_delegate, const ui::Event& event) {
+            ui_delegate->AddIPFSTabForURL(GURL(kIPFSWebUIURL));
+          },
+          delegate)));
+  container->AddChildView(CreateButton(
+      IDR_BRAVE_IPFS_LOGO, IDS_PAGE_INFO_IPFS_DOCS_BUTTON_TEXT,
+      IDS_PAGE_INFO_IPFS_DOCS_BUTTON_TEXT_TOOLTIP_TEXT,
+      base::BindRepeating(
+          [](ChromePageInfoUiDelegate* ui_delegate, const ui::Event& event) {
+            ui_delegate->AddIPFSTabForURL(GURL(kIPFSDocsURL));
+          },
+          delegate)));
+}
+
+}  // namespace
+
+#define CreateSecurityPageView CreateSecurityPageView_ChromiumImpl
+#endif  // BUILDFLAG(ENABLE_IPFS)
 
 #define BRAVE_PAGE_INFO_VIEW_FACTORY_GET_PERMISSION_ICON \
   case ContentSettingsType::AUTOPLAY:                    \
@@ -13,3 +81,15 @@
 #include "../../../../../../../chrome/browser/ui/views/page_info/page_info_view_factory.cc"
 
 #undef BRAVE_PAGE_INFO_VIEW_FACTORY_GET_PERMISSION_ICON
+
+#if BUILDFLAG(ENABLE_IPFS)
+#undef CreateSecurityPageView
+
+std::unique_ptr<views::View> PageInfoViewFactory::CreateSecurityPageView() {
+  auto page_view = CreateSecurityPageView_ChromiumImpl();
+  if (!ipfs::IsIPFSScheme(presenter_->site_url()))
+    return page_view;
+  BraveAddIPFSButtons(page_view.get(), ui_delegate_);
+  return page_view;
+}
+#endif  // BUILDFLAG(ENABLE_IPFS)
diff --git a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view.h b/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.h
similarity index 54%
rename from chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view.h
rename to chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.h
index 003fd9845bf8..d887dfd49fe1 100644
--- a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view.h
+++ b/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.h
@@ -3,16 +3,21 @@
  * 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_UI_VIEWS_PAGE_INFO_PAGE_INFO_BUBBLE_VIEW_H_
-#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_BUBBLE_VIEW_H_
+#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_VIEW_FACTORY_H_
+#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_VIEW_FACTORY_H_
 
-class PageInfoBubbleView;
+#include "brave/components/ipfs/buildflags/buildflags.h"
 
-#define HandleMoreInfoRequest                  \
-  BraveAddIPFSButtons(PageInfoBubbleView* ui); \
-  void HandleMoreInfoRequest
+#if BUILDFLAG(ENABLE_IPFS)
+#define CreateSecurityPageView           \
+  CreateSecurityPageView_ChromiumImpl(); \
+  std::unique_ptr<views::View> CreateSecurityPageView
+#endif  // BUILDFLAG(ENABLE_IPFS)
 
-#include "../../../../../../../chrome/browser/ui/views/page_info/page_info_bubble_view.h"
-#undef HandleMoreInfoRequest
+#include "../../../../../../../chrome/browser/ui/views/page_info/page_info_view_factory.h"
 
-#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_BUBBLE_VIEW_H_
+#if BUILDFLAG(ENABLE_IPFS)
+#undef CreateSecurityPageView
+#endif  // BUILDFLAG(ENABLE_IPFS)
+
+#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_VIEW_FACTORY_H_
diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab.cc b/chromium_src/chrome/browser/ui/views/tabs/tab.cc
index 2719dac2682e..8685465ce432 100644
--- a/chromium_src/chrome/browser/ui/views/tabs/tab.cc
+++ b/chromium_src/chrome/browser/ui/views/tabs/tab.cc
@@ -8,7 +8,6 @@
 // Set alert indicator's pos to start of the title and
 // move title after the alert indicator.
 // Title right should respect close btn's space
-
 #define BRAVE_UI_VIEWS_TABS_TAB_ALERT_INDICATOR_POSITION    \
   alert_indicator_->SetX(title_left - after_title_padding); \
   title_right = close_x - after_title_padding;              \
@@ -16,7 +15,12 @@
     title_right = close_x - after_title_padding;            \
   title_left =                                              \
       alert_indicator_->x() + alert_indicator_->width() + after_title_padding;
+
+#define BRAVE_UI_VIEWS_TABS_TAB_UPDATE_ICON_VISIBILITY \
+  showing_close_button_ &= mouse_hovered();
+
 #define AlertIndicator BraveAlertIndicator
 #include "../../../../../../../chrome/browser/ui/views/tabs/tab.cc"  // NOLINT
 #undef AlertIndicator
+#undef BRAVE_UI_VIEWS_TABS_TAB_UPDATE_ICON_VISIBILITY
 #undef BRAVE_UI_VIEWS_TABS_TAB_ALERT_INDICATOR_POSITION
diff --git a/chromium_src/chrome/browser/ui/webui/about_ui.cc b/chromium_src/chrome/browser/ui/webui/about_ui.cc
index 890a31949fdc..98b99335a7ba 100644
--- a/chromium_src/chrome/browser/ui/webui/about_ui.cc
+++ b/chromium_src/chrome/browser/ui/webui/about_ui.cc
@@ -3,6 +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 "base/containers/contains.h"
 #include "base/strings/string_split.h"
 #include "third_party/re2/src/re2/re2.h"
 
diff --git a/chromium_src/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc b/chromium_src/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc
new file mode 100644
index 000000000000..3c6279786a3d
--- /dev/null
+++ b/chromium_src/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc
@@ -0,0 +1,30 @@
+/* Copyright (c) 2021 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/webui/settings/browser_lifetime_handler.h"
+
+#include "brave/browser/sparkle_buildflags.h"
+
+#if BUILDFLAG(ENABLE_SPARKLE)
+#include "brave/browser/ui/webui/settings/brave_relaunch_handler_mac.h"
+#endif
+
+#define BrowserLifetimeHandler BrowserLifetimeHandler_ChromiumImpl
+#include "../../../../../../../chrome/browser/ui/webui/settings/browser_lifetime_handler.cc"
+#undef BrowserLifetimeHandler
+
+namespace settings {
+
+BrowserLifetimeHandler::~BrowserLifetimeHandler() {}
+
+void BrowserLifetimeHandler::HandleRelaunch(const base::ListValue* args) {
+#if BUILDFLAG(ENABLE_SPARKLE)
+  brave_relaunch_handler::RelaunchOnMac();
+  return;
+#endif
+  BrowserLifetimeHandler_ChromiumImpl::HandleRelaunch(args);
+}
+
+}  // namespace settings
diff --git a/chromium_src/chrome/browser/ui/webui/settings/browser_lifetime_handler.h b/chromium_src/chrome/browser/ui/webui/settings/browser_lifetime_handler.h
new file mode 100644
index 000000000000..d1f7bcd4e406
--- /dev/null
+++ b/chromium_src/chrome/browser/ui/webui/settings/browser_lifetime_handler.h
@@ -0,0 +1,38 @@
+/* Copyright (c) 2021 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_UI_WEBUI_SETTINGS_BROWSER_LIFETIME_HANDLER_H_
+#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_WEBUI_SETTINGS_BROWSER_LIFETIME_HANDLER_H_
+
+#define BrowserLifetimeHandler BrowserLifetimeHandler_ChromiumImpl
+#define HandleRelaunch \
+  Dummy();             \
+                       \
+ protected:            \
+  virtual void HandleRelaunch
+
+#include "../../../../../../../chrome/browser/ui/webui/settings/browser_lifetime_handler.h"
+#undef HandleRelaunch
+#undef BrowserLifetimeHandler
+
+namespace settings {
+
+class BrowserLifetimeHandler : public BrowserLifetimeHandler_ChromiumImpl {
+ public:
+  using BrowserLifetimeHandler_ChromiumImpl::
+      BrowserLifetimeHandler_ChromiumImpl;
+
+  BrowserLifetimeHandler(const BrowserLifetimeHandler&) = delete;
+  BrowserLifetimeHandler& operator=(const BrowserLifetimeHandler&) = delete;
+
+  ~BrowserLifetimeHandler() override;
+
+ private:
+  void HandleRelaunch(const base::ListValue* /*args*/) override;
+};
+
+}  // namespace settings
+
+#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_WEBUI_SETTINGS_BROWSER_LIFETIME_HANDLER_H_
diff --git a/chromium_src/chrome/common/webui_url_constants.cc b/chromium_src/chrome/common/webui_url_constants.cc
index 80ceb5ad7375..7375acb5de8f 100644
--- a/chromium_src/chrome/common/webui_url_constants.cc
+++ b/chromium_src/chrome/common/webui_url_constants.cc
@@ -9,8 +9,8 @@
 #define BRAVE_HOST_URLS                                                  \
   kAdblockHost, kIPFSWebUIHost, kRewardsPageHost, kRewardsInternalsHost, \
       kWelcomeHost, kWalletPageHost, kTorInternalsHost
-#define kChromeUIAppCacheInternalsHost \
-  kChromeUIAppCacheInternalsHost, BRAVE_HOST_URLS
+#define kChromeUIAttributionInternalsHost \
+  kChromeUIAttributionInternalsHost, BRAVE_HOST_URLS
 #include "../../../../chrome/common/webui_url_constants.cc"
-#undef kChromeUIAppCacheInternalsHost
+#undef kChromeUIAttributionInternalsHost
 #undef BRAVE_HOST_URLS
diff --git a/chromium_src/chrome/install_static/brave_install_util_unittest.cc b/chromium_src/chrome/install_static/brave_install_util_unittest.cc
index 42fbf4fecd37..97429daf03ba 100644
--- a/chromium_src/chrome/install_static/brave_install_util_unittest.cc
+++ b/chromium_src/chrome/install_static/brave_install_util_unittest.cc
@@ -590,31 +590,31 @@ TEST_P(InstallStaticUtilTest, GetChromeChannel) {
 
 #if defined(OFFICIAL_BUILD)
 // Stable supports user and system levels.
-INSTANTIATE_TEST_CASE_P(Stable,
-                        InstallStaticUtilTest,
-                        testing::Combine(testing::Values(STABLE_INDEX),
-                                         testing::Values("user", "system")));
+INSTANTIATE_TEST_SUITE_P(Stable,
+                         InstallStaticUtilTest,
+                         testing::Combine(testing::Values(STABLE_INDEX),
+                                          testing::Values("user", "system")));
 // Beta supports user and system levels.
-INSTANTIATE_TEST_CASE_P(Beta,
-                        InstallStaticUtilTest,
-                        testing::Combine(testing::Values(BETA_INDEX),
-                                         testing::Values("user", "system")));
+INSTANTIATE_TEST_SUITE_P(Beta,
+                         InstallStaticUtilTest,
+                         testing::Combine(testing::Values(BETA_INDEX),
+                                          testing::Values("user", "system")));
 // Dev supports user and system levels.
-INSTANTIATE_TEST_CASE_P(Dev,
-                        InstallStaticUtilTest,
-                        testing::Combine(testing::Values(DEV_INDEX),
-                                         testing::Values("user", "system")));
+INSTANTIATE_TEST_SUITE_P(Dev,
+                         InstallStaticUtilTest,
+                         testing::Combine(testing::Values(DEV_INDEX),
+                                          testing::Values("user", "system")));
 // Canary is only at user level.
-INSTANTIATE_TEST_CASE_P(Nightly,
-                        InstallStaticUtilTest,
-                        testing::Combine(testing::Values(NIGHTLY_INDEX),
-                                         testing::Values("user")));
+INSTANTIATE_TEST_SUITE_P(Nightly,
+                         InstallStaticUtilTest,
+                         testing::Combine(testing::Values(NIGHTLY_INDEX),
+                                          testing::Values("user")));
 #else   // OFFICIAL_BUILD
 // Chromium supports user and system levels.
-INSTANTIATE_TEST_CASE_P(Development,
-                        InstallStaticUtilTest,
-                        testing::Combine(testing::Values(DEVELOPER_INDEX),
-                                         testing::Values("user", "system")));
+INSTANTIATE_TEST_SUITE_P(Development,
+                         InstallStaticUtilTest,
+                         testing::Combine(testing::Values(DEVELOPER_INDEX),
+                                          testing::Values("user", "system")));
 #endif  // !OFFICIAL_BUILD
 
 }  // namespace install_static
diff --git a/chromium_src/chrome/install_static/brave_product_install_details_unittest.cc b/chromium_src/chrome/install_static/brave_product_install_details_unittest.cc
index a68ce3200e16..d42f78ff3a6e 100644
--- a/chromium_src/chrome/install_static/brave_product_install_details_unittest.cc
+++ b/chromium_src/chrome/install_static/brave_product_install_details_unittest.cc
@@ -247,8 +247,8 @@ TEST_P(MakeProductDetailsTest, UpdateCohortName) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(All,
-                        MakeProductDetailsTest,
-                        testing::ValuesIn(kTestData));
+INSTANTIATE_TEST_SUITE_P(All,
+                         MakeProductDetailsTest,
+                         testing::ValuesIn(kTestData));
 
 }  // namespace install_static
diff --git a/chromium_src/chrome/installer/mini_installer/mini_installer.cc b/chromium_src/chrome/installer/mini_installer/mini_installer.cc
index be93a0b22ed6..3cff4f4ff522 100644
--- a/chromium_src/chrome/installer/mini_installer/mini_installer.cc
+++ b/chromium_src/chrome/installer/mini_installer/mini_installer.cc
@@ -35,6 +35,10 @@
 
 namespace mini_installer {
 
+namespace {
+const size_t kStandardReferralCodeLen = 6;
+}  // namespace
+
 // Coverts a string in place to uppercase
 void SafeStrASCIIUpper(wchar_t* str, size_t size) {
   if (!str || !size)
@@ -58,29 +62,30 @@ bool ParseStandardReferralCode(const wchar_t* filename,
   if (*scan++ != L'-')
     return false;
 
-  if (anchor - scan + 1 != StandardReferralCodeLen)
+  if (anchor - scan + 1 != kStandardReferralCodeLen)
     return false;
 
   const wchar_t* ref_code = scan;
-  wchar_t ref_code_normalized[StandardReferralCodeLen + 1];
+  wchar_t ref_code_normalized[kStandardReferralCodeLen + 1];
 
   // Ensure that first half of referral code is alphabetic.
-  for (int i = 0; i < StandardReferralCodeLen / 2; ++i) {
+  for (size_t i = 0; i < kStandardReferralCodeLen / 2; ++i) {
     if ((ref_code[i] < L'a' || ref_code[i] > L'z') &&
         (ref_code[i] < L'A' || ref_code[i] > L'Z'))
       return false;
   }
 
   // Ensure that second half of referral code is numeric.
-  for (int i = StandardReferralCodeLen / 2; i < StandardReferralCodeLen; ++i) {
+  for (size_t i = kStandardReferralCodeLen / 2; i < kStandardReferralCodeLen;
+       ++i) {
     if (ref_code[i] < L'0' || ref_code[i] > L'9')
       return false;
   }
 
-  if (!SafeStrCopy(ref_code_normalized, StandardReferralCodeLen + 1, ref_code))
+  if (!SafeStrCopy(ref_code_normalized, kStandardReferralCodeLen + 1, ref_code))
     return false;
 
-  SafeStrASCIIUpper(ref_code_normalized, StandardReferralCodeLen);
+  SafeStrASCIIUpper(ref_code_normalized, kStandardReferralCodeLen);
 
   if (!referral_code->assign(ref_code_normalized))
     return false;
diff --git a/chromium_src/chrome/installer/mini_installer/mini_installer.h b/chromium_src/chrome/installer/mini_installer/mini_installer.h
index 2b203d89fd8b..e54645304a64 100644
--- a/chromium_src/chrome/installer/mini_installer/mini_installer.h
+++ b/chromium_src/chrome/installer/mini_installer/mini_installer.h
@@ -8,8 +8,6 @@
 
 #include "../../../../../chrome/installer/mini_installer/mini_installer.h"
 
-#define StandardReferralCodeLen 6
-
 namespace mini_installer {
 typedef StackString<128> ReferralCodeString;
 
diff --git a/chromium_src/components/autofill/core/browser/autofill_experiments_unittest.cc b/chromium_src/components/autofill/core/browser/autofill_experiments_unittest.cc
index e413914aaecf..2628a9c3d23d 100644
--- a/chromium_src/components/autofill/core/browser/autofill_experiments_unittest.cc
+++ b/chromium_src/components/autofill/core/browser/autofill_experiments_unittest.cc
@@ -72,7 +72,7 @@ TEST_F(
       /*disable_features=*/{});
   // When we have no primary account, Sync will start in Transport-only mode
   // (if allowed).
-  sync_service_.SetIsAuthenticatedAccountPrimary(false);
+  sync_service_.SetHasSyncConsent(false);
 
   // Update the active types to only include Wallet. This disables all other
   // types, including profiles.
diff --git a/chromium_src/components/infobars/core/infobar_delegate.h b/chromium_src/components/infobars/core/infobar_delegate.h
index 1e2409411fdc..e05b794d80f1 100644
--- a/chromium_src/components/infobars/core/infobar_delegate.h
+++ b/chromium_src/components/infobars/core/infobar_delegate.h
@@ -6,10 +6,16 @@
 #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_INFOBARS_CORE_INFOBAR_DELEGATE_H_
 #define BRAVE_CHROMIUM_SRC_COMPONENTS_INFOBARS_CORE_INFOBAR_DELEGATE_H_
 
+// Add corresponding value into
+// brave/android/java/org/chromium/chrome/browser/infobar/BraveInfoBarIdentifier.java
+// When there will be too many items, redo java_cpp_enum.py to generate it
+// automatically
+
 #define BRAVE_INFOBAR_DELEGATE_IDENTIFIERS  \
   BRAVE_CONFIRM_P3A_INFOBAR_DELEGATE = 500, \
   WAYBACK_MACHINE_INFOBAR_DELEGATE = 502,   \
-  SYNC_V2_MIGRATE_INFOBAR_DELEGATE = 503,
+  SYNC_V2_MIGRATE_INFOBAR_DELEGATE = 503,   \
+  ANDROID_SYSTEM_SYNC_DISABLED_INFOBAR = 504,
 
 #include "../../../../../components/infobars/core/infobar_delegate.h"
 
diff --git a/chromium_src/components/optimization_guide/core/DEPS b/chromium_src/components/optimization_guide/core/DEPS
new file mode 100644
index 000000000000..da1f8d3ab321
--- /dev/null
+++ b/chromium_src/components/optimization_guide/core/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+../../../../../components/optimization_guide/core",
+]
diff --git a/chromium_src/components/optimization_guide/core/optimization_guide_features.cc b/chromium_src/components/optimization_guide/core/optimization_guide_features.cc
new file mode 100644
index 000000000000..c5fad2c85bb9
--- /dev/null
+++ b/chromium_src/components/optimization_guide/core/optimization_guide_features.cc
@@ -0,0 +1,21 @@
+/* Copyright (c) 2021 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 "../../../../../components/optimization_guide/core/optimization_guide_features.cc"
+
+#include "base/feature_override.h"
+
+namespace optimization_guide {
+namespace features {
+
+OVERRIDE_FEATURE_DEFAULT_STATES({{
+    {kOptimizationHints, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kRemoteOptimizationGuideFetching, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kRemoteOptimizationGuideFetchingAnonymousDataConsent,
+     base::FEATURE_DISABLED_BY_DEFAULT},
+}});
+
+}  // namespace features
+}  // namespace optimization_guide
diff --git a/chromium_src/components/safe_browsing/content/browser/client_side_model_loader.cc b/chromium_src/components/safe_browsing/content/browser/client_side_model_loader.cc
deleted file mode 100644
index d87decd1840a..000000000000
--- a/chromium_src/components/safe_browsing/content/browser/client_side_model_loader.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (c) 2021 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 "net/base/net_errors.h"
-#include "net/traffic_annotation/network_traffic_annotation.h"
-#include "services/network/public/cpp/simple_url_loader.h"
-
-// Note: The IsCertificateError() call is not used for anything other than
-// preventing the "net::" namespace prefix from getting attached to "return;".
-#define NetworkTrafficAnnotationTag \
-  IsCertificateError(net::OK);      \
-  return;                           \
-  net::NetworkTrafficAnnotationTag
-
-#include "../../../../../../components/safe_browsing/content/browser/client_side_model_loader.cc"
-
-#undef NetworkTrafficAnnotationTag
diff --git a/chromium_src/components/sync_device_info/device_info_sync_bridge.cc b/chromium_src/components/sync_device_info/device_info_sync_bridge.cc
index 95406315d1b6..0d8a0668e4c2 100644
--- a/chromium_src/components/sync_device_info/device_info_sync_bridge.cc
+++ b/chromium_src/components/sync_device_info/device_info_sync_bridge.cc
@@ -77,7 +77,7 @@ void DeviceInfoSyncBridge::DeleteDeviceInfo(const std::string& client_id,
       base::BindOnce(&DeviceInfoSyncBridge::OnDeviceInfoDeleted,
                      weak_ptr_factory_.GetWeakPtr(), client_id, 1,
                      std::move(callback)),
-      base::TimeDelta::FromSeconds(1));
+      base::Seconds(1));
 }
 
 void DeviceInfoSyncBridge::OnDeviceInfoDeleted(const std::string& client_id,
@@ -91,7 +91,7 @@ void DeviceInfoSyncBridge::OnDeviceInfoDeleted(const std::string& client_id,
         base::BindOnce(&DeviceInfoSyncBridge::OnDeviceInfoDeleted,
                        weak_ptr_factory_.GetWeakPtr(), client_id, attempt + 1,
                        std::move(callback)),
-        base::TimeDelta::FromSeconds(1));
+        base::Seconds(1));
   } else {
     std::move(callback).Run();
   }
diff --git a/chromium_src/components/translate/core/browser/translate_prefs.cc b/chromium_src/components/translate/core/browser/translate_prefs.cc
index 24cd8eb55391..079aa70f3ecc 100644
--- a/chromium_src/components/translate/core/browser/translate_prefs.cc
+++ b/chromium_src/components/translate/core/browser/translate_prefs.cc
@@ -3,9 +3,14 @@
  * 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 "../../../../../../components/translate/core/browser/translate_prefs.cc"
-
 #include "base/feature_override.h"
+// This is done to allow the same renaming in
+// chromium_src/chrome/browser/prefs/browser_prefs.cc
+#include "components/translate/core/browser/translate_prefs.h"
+
+#define MigrateObsoleteProfilePrefs MigrateObsoleteProfilePrefs_ChromiumImpl
+#include "../../../../../../components/translate/core/browser/translate_prefs.cc"
+#undef MigrateObsoleteProfilePrefs
 
 namespace translate {
 
diff --git a/chromium_src/components/translate/core/browser/translate_prefs.h b/chromium_src/components/translate/core/browser/translate_prefs.h
new file mode 100644
index 000000000000..bebaa361d1ba
--- /dev/null
+++ b/chromium_src/components/translate/core/browser/translate_prefs.h
@@ -0,0 +1,15 @@
+/* Copyright (c) 2021 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_COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_PREFS_H_
+#define BRAVE_CHROMIUM_SRC_COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_PREFS_H_
+
+// This is done to allow the same renaming in
+// chromium_src/chrome/browser/prefs/browser_prefs.cc
+#define MigrateObsoleteProfilePrefs MigrateObsoleteProfilePrefs_ChromiumImpl
+#include "../../../../../../components/translate/core/browser/translate_prefs.h"
+#undef MigrateObsoleteProfilePrefs
+
+#endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_PREFS_H_
diff --git a/chromium_src/components/translate/core/common/translate_util.cc b/chromium_src/components/translate/core/common/translate_util.cc
index 00aaeac12ccc..559da9872474 100644
--- a/chromium_src/components/translate/core/common/translate_util.cc
+++ b/chromium_src/components/translate/core/common/translate_util.cc
@@ -3,6 +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 "base/feature_override.h"
 #include "brave/components/translate/core/common/brave_translate_constants.h"
 
 #define GetTranslateSecurityOrigin GetTranslateSecurityOrigin_Chromium
@@ -11,6 +12,10 @@
 
 namespace translate {
 
+OVERRIDE_FEATURE_DEFAULT_STATES({{
+    {kTFLiteLanguageDetectionEnabled, base::FEATURE_DISABLED_BY_DEFAULT},
+}});
+
 // Redirect native translate requests to the translate.brave.com (expect the
 // script request).
 GURL GetTranslateSecurityOrigin() {
diff --git a/chromium_src/ios/chrome/browser/application_context_impl.mm b/chromium_src/ios/chrome/browser/application_context_impl.mm
index 478e987cf5e7..98ba3fe82c20 100644
--- a/chromium_src/ios/chrome/browser/application_context_impl.mm
+++ b/chromium_src/ios/chrome/browser/application_context_impl.mm
@@ -13,8 +13,8 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
-#include "base/sequenced_task_runner.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/time/default_clock.h"
 #include "base/time/default_tick_clock.h"
 #include "brave/ios/browser/metrics/ios_brave_metrics_services_manager_client.h"
@@ -38,7 +38,7 @@
 #include "ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.h"
 #include "ios/chrome/browser/chrome_paths.h"
 #include "ios/chrome/browser/component_updater/ios_component_updater_configurator.h"
-#import "ios/chrome/browser/crash_report/breadcrumbs/application_breadcrumbs_logger_ios.h"
+#import "ios/chrome/browser/crash_report/breadcrumbs/application_breadcrumbs_logger.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
 #include "ios/chrome/browser/ios_chrome_io_thread.h"
 #include "ios/chrome/browser/policy/browser_policy_connector_ios.h"
diff --git a/chromium_src/ios/chrome/browser/ios_chrome_field_trials.cc b/chromium_src/ios/chrome/browser/ios_chrome_field_trials.cc
index 23367eec41a0..d83f41e87d48 100644
--- a/chromium_src/ios/chrome/browser/ios_chrome_field_trials.cc
+++ b/chromium_src/ios/chrome/browser/ios_chrome_field_trials.cc
@@ -34,11 +34,11 @@ void DeleteFileMetrics() {
 
 }  // namespace
 
-void IOSChromeFieldTrials::SetupFieldTrials() {
+void IOSChromeFieldTrials::SetUpFieldTrials() {
   DeleteFileMetrics();
 }
 
-void IOSChromeFieldTrials::SetupFeatureControllingFieldTrials(
+void IOSChromeFieldTrials::SetUpFeatureControllingFieldTrials(
     bool has_seed,
     const base::FieldTrial::EntropyProvider* low_entropy_provider,
     base::FeatureList* feature_list) {
diff --git a/chromium_src/net/base/features.cc b/chromium_src/net/base/features.cc
index 1a09e4e880d3..5bd1a16c656f 100644
--- a/chromium_src/net/base/features.cc
+++ b/chromium_src/net/base/features.cc
@@ -11,8 +11,6 @@ namespace net {
 namespace features {
 
 OVERRIDE_FEATURE_DEFAULT_STATES({{
-    {kLegacyTLSEnforced, base::FEATURE_ENABLED_BY_DEFAULT},
-
     {kFirstPartySets, base::FEATURE_DISABLED_BY_DEFAULT},
 }});
 
diff --git a/chromium_src/net/base/url_util.cc b/chromium_src/net/base/url_util.cc
index 7303a70c4d08..ff7140c3983c 100644
--- a/chromium_src/net/base/url_util.cc
+++ b/chromium_src/net/base/url_util.cc
@@ -21,7 +21,7 @@ std::string URLToEphemeralStorageDomain(const GURL& url) {
   // GetDomainAndRegistry might return an empty string if this host is an IP
   // address or a file URL.
   if (domain.empty())
-    domain = url::Origin::Create(url.GetOrigin()).Serialize();
+    domain = url::Origin::Create(url).Serialize();
 
   return domain;
 }
diff --git a/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc b/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc
index 3a80291272ce..6a24bd0f2c02 100644
--- a/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc
+++ b/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc
@@ -11,8 +11,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-using base::TimeDelta;
-
 static const char max_expires_date_cookie[] =
     "test1=yes; expires=Fri, 31 Dec 9999 23:59:59 GMT";
 static const char max_age_cookie[] =
@@ -30,7 +28,7 @@ namespace net {
 
 const base::Time creation_time = base::Time::Now();
 constexpr base::TimeDelta kMaxCookieExpiration =
-    base::TimeDelta::FromDays(30*6);  // 6 months
+    base::Days(30 * 6);  // 6 months
 
 TEST(BraveCanonicalCookieTest, SetMaxExpiration) {
   GURL url("https://www.example.com/test");
@@ -61,7 +59,7 @@ TEST(BraveCanonicalCookieTest, AllowShorterThanMaxExpiration) {
       url, short_expiration_cookie, creation_time,
       /*server_time=*/absl::nullopt, /*cookie_partition_key=*/absl::nullopt);
   EXPECT_TRUE(cookie.get());
-  EXPECT_EQ(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(2));
+  EXPECT_EQ(cookie->ExpiryDate(), creation_time + base::Days(2));
 }
 
 TEST(BraveCanonicalCookieTest, SetHTTPOnlyMaxExpiration) {
diff --git a/chromium_src/net/cookies/canonical_cookie.cc b/chromium_src/net/cookies/canonical_cookie.cc
index 46d6d3fd43d9..5a0adea3d27c 100644
--- a/chromium_src/net/cookies/canonical_cookie.cc
+++ b/chromium_src/net/cookies/canonical_cookie.cc
@@ -11,7 +11,7 @@ namespace {
 
 // Javascript max expiration is handled by blink::CookieStore
 constexpr base::TimeDelta kMaxCookieExpiration =
-    base::TimeDelta::FromDays(30*6);  // 6 months
+    base::Days(30 * 6);  // 6 months
 
 base::Time BraveCanonExpiration(const base::Time& cookie_expires,
                                 const base::Time& creation_time) {
diff --git a/chromium_src/third_party/blink/common/features.cc b/chromium_src/third_party/blink/common/features.cc
index c7aab35ac7cb..5d7b48526357 100644
--- a/chromium_src/third_party/blink/common/features.cc
+++ b/chromium_src/third_party/blink/common/features.cc
@@ -28,7 +28,6 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kNavigatorPluginsFixed, base::FEATURE_DISABLED_BY_DEFAULT},
     {kParakeet, base::FEATURE_DISABLED_BY_DEFAULT},
     {kPrerender2, base::FEATURE_DISABLED_BY_DEFAULT},
-    {kReportAllJavaScriptFrameworks, base::FEATURE_DISABLED_BY_DEFAULT},
     {kSpeculationRulesPrefetchProxy, base::FEATURE_DISABLED_BY_DEFAULT},
     {kTextFragmentAnchor, base::FEATURE_DISABLED_BY_DEFAULT},
     {kWebSQLInThirdPartyContextEnabled, base::FEATURE_DISABLED_BY_DEFAULT},
diff --git a/chromium_src/third_party/blink/renderer/DEPS b/chromium_src/third_party/blink/renderer/DEPS
index ad95ca150ba1..de8e199b0b41 100644
--- a/chromium_src/third_party/blink/renderer/DEPS
+++ b/chromium_src/third_party/blink/renderer/DEPS
@@ -7,6 +7,7 @@ include_rules = [
   "+../../../../../../../third_party/blink/renderer/core/loader",
   "+../../../../../../../third_party/blink/renderer/core/origin_trials",
   "+../../../../../../../third_party/blink/renderer/core/page",
+  "+../../../../../../../third_party/blink/renderer/core/script",
   "+../../../../../../../../third_party/blink/renderer/core/html/canvas",
   "+../../../../../../../../third_party/blink/renderer/core/html/media",
   "+../../../../../../../../third_party/blink/renderer/platform/loader/fetch",
diff --git a/chromium_src/third_party/blink/renderer/core/loader/subresource_redirect_util.cc b/chromium_src/third_party/blink/renderer/core/loader/subresource_redirect_util.cc
index 4f8087ca939e..65e9d470b615 100644
--- a/chromium_src/third_party/blink/renderer/core/loader/subresource_redirect_util.cc
+++ b/chromium_src/third_party/blink/renderer/core/loader/subresource_redirect_util.cc
@@ -9,7 +9,7 @@
 #define ShouldDisableCSPCheckForLitePageSubresourceRedirectOrigin \
   ShouldDisableCSPCheckForLitePageSubresourceRedirectOrigin_ChromiumImpl
 
-#include "../../../../../../third_party/blink/renderer/core/loader/subresource_redirect_util.cc"
+#include "../../../../../../../third_party/blink/renderer/core/loader/subresource_redirect_util.cc"
 #undef ShouldDisableCSPCheckForLitePageSubresourceRedirectOrigin
 
 namespace blink {
diff --git a/chromium_src/third_party/blink/renderer/core/loader/subresource_redirect_util.h b/chromium_src/third_party/blink/renderer/core/loader/subresource_redirect_util.h
index 94d86ba1da97..5b38702c03b8 100644
--- a/chromium_src/third_party/blink/renderer/core/loader/subresource_redirect_util.h
+++ b/chromium_src/third_party/blink/renderer/core/loader/subresource_redirect_util.h
@@ -19,7 +19,7 @@
       ResourceRequest::RedirectStatus redirect_status, const KURL& url);  \
   bool ShouldDisableCSPCheckForLitePageSubresourceRedirectOrigin_ChromiumImpl
 
-#include "../../../../../../third_party/blink/renderer/core/loader/subresource_redirect_util.h"
+#include "../../../../../../../third_party/blink/renderer/core/loader/subresource_redirect_util.h"
 #undef ShouldDisableCSPCheckForLitePageSubresourceRedirectOrigin
 
 #endif  // BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_SUBRESOURCE_REDIRECT_UTIL_H_
diff --git a/chromium_src/third_party/blink/renderer/core/script/detect_javascript_frameworks.cc b/chromium_src/third_party/blink/renderer/core/script/detect_javascript_frameworks.cc
new file mode 100644
index 000000000000..c37b88bc1832
--- /dev/null
+++ b/chromium_src/third_party/blink/renderer/core/script/detect_javascript_frameworks.cc
@@ -0,0 +1,17 @@
+/* Copyright (c) 2021 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 "third_party/blink/renderer/core/script/detect_javascript_frameworks.h"
+
+#define DetectJavascriptFrameworksOnLoad DetectJavascriptFrameworksOnLoad_Unused
+#include "../../../../../../../third_party/blink/renderer/core/script/detect_javascript_frameworks.cc"
+#undef DetectJavascriptFrameworksOnLoad
+
+namespace blink {
+
+// NOLINTNEXTLINE(runtime/references)
+void DetectJavascriptFrameworksOnLoad(Document& document) {}
+
+}  // namespace blink
diff --git a/chromium_src/third_party/blink/renderer/modules/broadcastchannel/broadcast_channel.cc b/chromium_src/third_party/blink/renderer/modules/broadcastchannel/broadcast_channel.cc
index b25601a95e6c..eca6ad88378b 100644
--- a/chromium_src/third_party/blink/renderer/modules/broadcastchannel/broadcast_channel.cc
+++ b/chromium_src/third_party/blink/renderer/modules/broadcastchannel/broadcast_channel.cc
@@ -3,26 +3,22 @@
  * 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 "third_party/blink/public/mojom/broadcastchannel/broadcast_channel.mojom-blink.h"
+#include "third_party/blink/renderer/core/frame/local_frame.h"
 #include "third_party/blink/renderer/modules/storage/brave_dom_window_storage.h"
+#include "third_party/blink/renderer/platform/weborigin/security_origin_hash.h"
 
-// Ephemeral origin substitution is applied only to frame-based
+// Ephemeral origin channel name altering is applied only to frame-based
 // ExecutionContexts. This is fine because any Worker-based context still
 // wouldn't be able to communicate with a frame in both directions because a
 // frame-based BroadcastChannel will use an ephemeral origin instead of the one
 // the worker is using.
-#define ConnectToChannel                                                   \
-  Version_;                                                                \
-  {                                                                        \
-    LocalDOMWindow* window = DynamicTo<LocalDOMWindow>(execution_context); \
-    if (window) {                                                          \
-      if (auto* origin = GetEphemeralStorageOrigin(window)) {              \
-        origin_ = origin;                                                  \
-      }                                                                    \
-    }                                                                      \
-  }                                                                        \
-  provider->ConnectToChannel
+#define GetRemoteNavigationAssociatedInterfaces                          \
+  should_send_resource_timing_info_to_parent(); /* no-op */              \
+  if (auto* origin = GetEphemeralStorageOrigin(window)) {                \
+    name_ = name_ + String::Number(SecurityOriginHash::GetHash(origin)); \
+  }                                                                      \
+  frame->GetRemoteNavigationAssociatedInterfaces
 
 #include "../../../../../../../third_party/blink/renderer/modules/broadcastchannel/broadcast_channel.cc"
 
-#undef ConnectToChannel
+#undef GetRemoteNavigationAssociatedInterfaces
diff --git a/chromium_src/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/chromium_src/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
index 2e2a6ecfaa60..9bdb069c107a 100644
--- a/chromium_src/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
+++ b/chromium_src/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
@@ -9,8 +9,7 @@
 
 namespace {
 
-constexpr base::TimeDelta kJavascriptCookieExpiration =
-    base::TimeDelta::FromDays(7);
+constexpr base::TimeDelta kJavascriptCookieExpiration = base::Days(7);
 
 base::Time BraveCanonExpiration(const base::Time& current) {
   // creation time is always now for new JS cookies
diff --git a/chromium_src/ui/views/window/dialog_delegate.h b/chromium_src/ui/views/window/dialog_delegate.h
index 657488fbc8bc..28551dc199e5 100644
--- a/chromium_src/ui/views/window/dialog_delegate.h
+++ b/chromium_src/ui/views/window/dialog_delegate.h
@@ -6,7 +6,7 @@
 #ifndef BRAVE_CHROMIUM_SRC_UI_VIEWS_WINDOW_DIALOG_DELEGATE_H_
 #define BRAVE_CHROMIUM_SRC_UI_VIEWS_WINDOW_DIALOG_DELEGATE_H_
 
-#define set_use_custom_frame                                              \
+#define ResetViewShownTimeStampForTesting                                 \
   set_should_ignore_snapping(bool should_ignore_snapping) {               \
     should_ignore_snapping_ = should_ignore_snapping;                     \
   }                                                                       \
@@ -16,10 +16,10 @@
   bool should_ignore_snapping_ = false;                                   \
                                                                           \
  public:                                                                  \
-  void set_use_custom_frame
+  void ResetViewShownTimeStampForTesting
 
 #include "../../../../../ui/views/window/dialog_delegate.h"
 
-#undef set_use_custom_frame
+#undef ResetViewShownTimeStampForTesting
 
 #endif  // BRAVE_CHROMIUM_SRC_UI_VIEWS_WINDOW_DIALOG_DELEGATE_H_
diff --git a/components/binance/browser/binance_service.cc b/components/binance/browser/binance_service.cc
index b5cc4df31227..56ebee42c9f3 100644
--- a/components/binance/browser/binance_service.cc
+++ b/components/binance/browser/binance_service.cc
@@ -16,8 +16,8 @@
 #include "base/files/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "base/time/time.h"
 #include "base/token.h"
 #include "brave/common/pref_names.h"
diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc
index 92b3726bfcd5..d8001cf83ec2 100644
--- a/components/brave_ads/browser/ads_service_impl.cc
+++ b/components/brave_ads/browser/ads_service_impl.cc
@@ -26,12 +26,12 @@
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/path_service.h"
-#include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "base/time/time.h"
 #include "bat/ads/ad_history_info.h"
 #include "bat/ads/ad_notification_info.h"
@@ -782,7 +782,7 @@ void AdsServiceImpl::MaybeStart(const bool should_restart) {
         FROM_HERE,
         base::BindOnce(&AdsServiceImpl::Start, AsWeakPtr(),
                        total_number_of_starts_),
-        base::TimeDelta::FromSeconds(1));
+        base::Seconds(1));
   } else {
     Start(total_number_of_starts_);
   }
@@ -969,7 +969,7 @@ void AdsServiceImpl::StartCheckIdleStateTimer() {
 #if !defined(OS_ANDROID)
   idle_poll_timer_.Stop();
 
-  idle_poll_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(1), this,
+  idle_poll_timer_.Start(FROM_HERE, base::Seconds(1), this,
                          &AdsServiceImpl::CheckIdleState);
 #endif
 }
@@ -1961,8 +1961,7 @@ void AdsServiceImpl::StartNotificationTimeoutTimer(const std::string& uuid) {
     return;
   }
 
-  const base::TimeDelta timeout =
-      base::TimeDelta::FromSeconds(timeout_in_seconds);
+  const base::TimeDelta timeout = base::Seconds(timeout_in_seconds);
 
   notification_timers_[uuid] = std::make_unique<base::OneShotTimer>();
   notification_timers_[uuid]->Start(
diff --git a/components/brave_ads/browser/service_sandbox_type.h b/components/brave_ads/browser/service_sandbox_type.h
index 8f32f0c8f08d..76044814c528 100644
--- a/components/brave_ads/browser/service_sandbox_type.h
+++ b/components/brave_ads/browser/service_sandbox_type.h
@@ -16,9 +16,9 @@ class BatAdsService;
 }  // namespace bat_ads
 
 template <>
-inline sandbox::policy::SandboxType
+inline sandbox::mojom::Sandbox
 content::GetServiceSandboxType<bat_ads::mojom::BatAdsService>() {
-  return sandbox::policy::SandboxType::kUtility;
+  return sandbox::mojom::Sandbox::kUtility;
 }
 
 #endif  // BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_SERVICE_SANDBOX_TYPE_H_
diff --git a/components/brave_component_updater/browser/brave_component.cc b/components/brave_component_updater/browser/brave_component.cc
index 30a26160dfee..c7e7a1051ced 100644
--- a/components/brave_component_updater/browser/brave_component.cc
+++ b/components/brave_component_updater/browser/brave_component.cc
@@ -9,7 +9,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/sequenced_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
 
 namespace brave_component_updater {
 
diff --git a/components/brave_component_updater/browser/brave_component.h b/components/brave_component_updater/browser/brave_component.h
index 3713b58baf61..10b5f9a6d818 100644
--- a/components/brave_component_updater/browser/brave_component.h
+++ b/components/brave_component_updater/browser/brave_component.h
@@ -12,7 +12,7 @@
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/sequenced_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
 #include "components/component_updater/component_updater_service.h"
 
 class PrefService;
diff --git a/components/brave_component_updater/browser/extension_whitelist_service.cc b/components/brave_component_updater/browser/extension_whitelist_service.cc
index b5458ea4894b..d595194e7fff 100644
--- a/components/brave_component_updater/browser/extension_whitelist_service.cc
+++ b/components/brave_component_updater/browser/extension_whitelist_service.cc
@@ -9,7 +9,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/task_runner_util.h"
+#include "base/task/task_runner_util.h"
 #include "brave/components/brave_component_updater/browser/local_data_files_service.h"
 #include "brave/vendor/extension-whitelist/extension_whitelist_parser.h"
 #include "extensions/common/extension.h"
diff --git a/components/brave_federated_learning/brave_operational_patterns.cc b/components/brave_federated_learning/brave_operational_patterns.cc
index 4437a1a7af4f..67107fd327c2 100644
--- a/components/brave_federated_learning/brave_operational_patterns.cc
+++ b/components/brave_federated_learning/brave_operational_patterns.cc
@@ -83,16 +83,15 @@ void BraveOperationalPatterns::Start() {
       std::make_unique<base::RetainingOneShotTimer>();
   simulate_local_training_step_timer_->Start(
       FROM_HERE,
-      base::TimeDelta::FromSeconds(
-          operational_patterns::features::
-              GetSimulateLocalTrainingStepDurationValue() *
-          60),
+      base::Seconds(operational_patterns::features::
+                        GetSimulateLocalTrainingStepDurationValue() *
+                    60),
       this, &BraveOperationalPatterns::OnSimulateLocalTrainingStepTimerFired);
 
   collection_slot_periodic_timer_ = std::make_unique<base::RepeatingTimer>();
   collection_slot_periodic_timer_->Start(
       FROM_HERE,
-      base::TimeDelta::FromSeconds(
+      base::Seconds(
           operational_patterns::features::GetCollectionSlotSizeValue() * 60 /
           2),
       this, &BraveOperationalPatterns::OnCollectionSlotStartTimerFired);
@@ -191,7 +190,7 @@ void BraveOperationalPatterns::MaybeResetCollectionId() {
     collection_id_ =
         base::ToUpperASCII(base::UnguessableToken::Create().ToString());
     collection_id_expiration_time_ =
-        now + base::TimeDelta::FromSeconds(
+        now + base::Seconds(
                   operational_patterns::features::GetCollectionIdLifetime() *
                   24 * 60 * 60);
     SavePrefs();
diff --git a/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc b/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
index 50c8b4d3c4de..403b2dd8f24f 100644
--- a/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
+++ b/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
@@ -56,22 +56,19 @@ TEST_F(BandwidthSavingsPredictorTest, FeaturiseTiming) {
 
   auto timing = page_load_metrics::CreatePageLoadTiming();
   timing->document_timing->dom_content_loaded_event_start =
-      base::TimeDelta::FromMilliseconds(1000);
+      base::Milliseconds(1000);
   predictor_->OnPageLoadTimingUpdated(*timing);
   EXPECT_EQ(predictor_->feature_map_["metrics.observedDomContentLoaded"], 1000);
 
-  timing->document_timing->load_event_start =
-      base::TimeDelta::FromMilliseconds(2000);
+  timing->document_timing->load_event_start = base::Milliseconds(2000);
   predictor_->OnPageLoadTimingUpdated(*timing);
   EXPECT_EQ(predictor_->feature_map_["metrics.observedLoad"], 2000);
 
-  timing->paint_timing->first_meaningful_paint =
-      base::TimeDelta::FromMilliseconds(1500);
+  timing->paint_timing->first_meaningful_paint = base::Milliseconds(1500);
   predictor_->OnPageLoadTimingUpdated(*timing);
   EXPECT_EQ(predictor_->feature_map_["metrics.firstMeaningfulPaint"], 1500);
 
-  timing->paint_timing->first_contentful_paint =
-      base::TimeDelta::FromMilliseconds(800);
+  timing->paint_timing->first_contentful_paint = base::Milliseconds(800);
   predictor_->OnPageLoadTimingUpdated(*timing);
   EXPECT_EQ(predictor_->feature_map_["metrics.observedFirstVisualChange"], 800);
 }
diff --git a/components/brave_referrals/browser/brave_referrals_service.cc b/components/brave_referrals/browser/brave_referrals_service.cc
index 5fcb9c4c8180..a76665b2eaac 100644
--- a/components/brave_referrals/browser/brave_referrals_service.cc
+++ b/components/brave_referrals/browser/brave_referrals_service.cc
@@ -233,7 +233,7 @@ void BraveReferralsService::Start() {
   finalization_checks_timer_ = std::make_unique<base::RepeatingTimer>();
   finalization_checks_timer_->Start(
       FROM_HERE,
-      base::TimeDelta::FromSeconds(
+      base::Seconds(
           brave_base::random::Geometric(kFinalizationChecksFrequency)),
       this, &BraveReferralsService::OnFinalizationChecksTimerFired);
   DCHECK(finalization_checks_timer_->IsRunning());
@@ -298,11 +298,10 @@ void BraveReferralsService::OnReferralInitLoadComplete(
                << ", payload: " << safe_response_body
                << ", url: " << referral_init_loader_->GetFinalURL().spec();
     initialization_timer_ = std::make_unique<base::OneShotTimer>();
-    initialization_timer_->Start(
-        FROM_HERE,
-        base::TimeDelta::FromSeconds(
-            brave_base::random::Geometric(kReportInitializationFrequency)),
-        this, &BraveReferralsService::InitReferral);
+    initialization_timer_->Start(FROM_HERE,
+                                 base::Seconds(brave_base::random::Geometric(
+                                     kReportInitializationFrequency)),
+                                 this, &BraveReferralsService::InitReferral);
     DCHECK(initialization_timer_->IsRunning());
     return;
   }
@@ -475,7 +474,7 @@ void BraveReferralsService::MaybeCheckForReferralFinalization() {
     base::StringToUint64(check_time_str, &check_time);
 
   base::Time now = base::Time::Now();
-  if (now - first_run_timestamp_ < base::TimeDelta::FromSeconds(check_time))
+  if (now - first_run_timestamp_ < base::Seconds(check_time))
     return;
 
   // Only check for referral finalization 30 times, with a 24-hour
@@ -489,7 +488,7 @@ void BraveReferralsService::MaybeCheckForReferralFinalization() {
     return;
   }
 
-  if (now - timestamp < base::TimeDelta::FromHours(24))
+  if (now - timestamp < base::Hours(24))
     return;
 
   pref_service_->SetTime(kReferralAttemptTimestamp, now);
@@ -509,7 +508,7 @@ void BraveReferralsService::MaybeDeletePromoCodePref() const {
     base::StringToUint64(delete_time_str, &delete_time);
 
   base::Time now = base::Time::Now();
-  if (now - first_run_timestamp_ >= base::TimeDelta::FromSeconds(delete_time))
+  if (now - first_run_timestamp_ >= base::Seconds(delete_time))
     pref_service_->ClearPref(kReferralPromoCode);
 }
 
diff --git a/components/brave_referrals/browser/brave_referrals_service.h b/components/brave_referrals/browser/brave_referrals_service.h
index c12ca5f1a316..8b02a067723e 100644
--- a/components/brave_referrals/browser/brave_referrals_service.h
+++ b/components/brave_referrals/browser/brave_referrals_service.h
@@ -14,7 +14,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/no_destructor.h"
-#include "base/sequenced_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile_manager_observer.h"
diff --git a/components/brave_rewards/browser/diagnostic_log.h b/components/brave_rewards/browser/diagnostic_log.h
index 35085203fbef..d8a5a5154f03 100644
--- a/components/brave_rewards/browser/diagnostic_log.h
+++ b/components/brave_rewards/browser/diagnostic_log.h
@@ -11,7 +11,7 @@
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/sequence_checker.h"
-#include "base/sequenced_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
 
 namespace brave_rewards {
 
diff --git a/components/brave_rewards/browser/rewards_service.cc b/components/brave_rewards/browser/rewards_service.cc
index a27d4e7ec4d6..23cee0dd6e97 100644
--- a/components/brave_rewards/browser/rewards_service.cc
+++ b/components/brave_rewards/browser/rewards_service.cc
@@ -33,11 +33,11 @@ void RewardsService::RemoveObserver(RewardsServiceObserver* observer) {
 void RewardsService::RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kNotifications, "");
   registry->RegisterTimeDeltaPref(prefs::kNotificationTimerInterval,
-                                  base::TimeDelta::FromDays(1));
+                                  base::Days(1));
   registry->RegisterTimeDeltaPref(prefs::kBackupNotificationInterval,
-                                  base::TimeDelta::FromDays(30));
+                                  base::Days(30));
   registry->RegisterTimeDeltaPref(prefs::kNotificationStartupDelay,
-                                  base::TimeDelta::FromSeconds(30));
+                                  base::Seconds(30));
   registry->RegisterBooleanPref(prefs::kBackupSucceeded, false);
   registry->RegisterBooleanPref(prefs::kUserHasFunded, false);
   registry->RegisterBooleanPref(prefs::kUserHasClaimedGrant, false);
diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
index 1b90b0bdd9b6..b9b2f1cefba3 100644
--- a/components/brave_rewards/browser/rewards_service_impl.cc
+++ b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -25,15 +25,15 @@
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
-#include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/time/time.h"
 #include "bat/ads/pref_names.h"
@@ -83,6 +83,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 #include "url/url_canon_stdstring.h"
 #include "url/url_util.h"
 
@@ -365,7 +366,7 @@ void RewardsServiceImpl::ConnectionClosed() {
       FROM_HERE,
       base::BindOnce(&RewardsServiceImpl::StartLedgerProcessIfNecessary,
                      AsWeakPtr()),
-      base::TimeDelta::FromSeconds(1));
+      base::Seconds(1));
 }
 
 bool RewardsServiceImpl::IsInitialized() {
@@ -661,7 +662,7 @@ void RewardsServiceImpl::OnLoad(SessionID tab_id, const GURL& url) {
     return;
   }
 
-  auto origin = url.GetOrigin().host();
+  auto origin = url.host();
   std::string baseDomain =
       GetDomainAndRegistry(url.host(), INCLUDE_PRIVATE_REGISTRIES);
 #if BUILDFLAG(ENABLE_IPFS)
@@ -1791,7 +1792,7 @@ void RewardsServiceImpl::GetPublisherActivityFromUrl(
     return;
   }
 
-  auto origin = parsed_url.GetOrigin().spec();
+  auto origin = url::Origin::Create(parsed_url).Serialize();
   std::string baseDomain =
       GetDomainAndRegistry(parsed_url.host(), INCLUDE_PRIVATE_REGISTRIES);
   std::string path = parsed_url.has_path() ? parsed_url.PathForRequest() : "";
@@ -2264,7 +2265,7 @@ bool RewardsServiceImpl::ShouldShowNotificationAddFunds() const {
 void RewardsServiceImpl::ShowNotificationAddFunds(bool sufficient) {
   if (sufficient) return;
 
-  base::Time next_time = base::Time::Now() + base::TimeDelta::FromDays(3);
+  base::Time next_time = base::Time::Now() + base::Days(3);
   profile_->GetPrefs()->SetTime(prefs::kAddFundsNotification, next_time);
   RewardsNotificationService::RewardsNotificationArgs args;
   notification_service_->AddNotification(
diff --git a/components/brave_rewards/browser/service_sandbox_type.h b/components/brave_rewards/browser/service_sandbox_type.h
index 443e1f368a7d..85c620614b17 100644
--- a/components/brave_rewards/browser/service_sandbox_type.h
+++ b/components/brave_rewards/browser/service_sandbox_type.h
@@ -15,12 +15,12 @@ class BatLedgerService;
 }  // namespace bat_ledger
 
 template <>
-inline sandbox::policy::SandboxType
+inline sandbox::mojom::Sandbox
 content::GetServiceSandboxType<bat_ledger::mojom::BatLedgerService>() {
 #if !defined(OS_ANDROID)
-  return sandbox::policy::SandboxType::kNoSandbox;
+  return sandbox::mojom::Sandbox::kNoSandbox;
 #else
-  return sandbox::policy::SandboxType::kUtility;
+  return sandbox::mojom::Sandbox::kUtility;
 #endif  // !defined(OS_ANDROID)
 }
 
diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.cc b/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.cc
index 1d233cc89ff6..fca93db5806d 100644
--- a/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.cc
+++ b/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.cc
@@ -165,7 +165,7 @@ void RewardsBrowserTestContextHelper::VisitPublisher(
 
   // The minimum publisher duration when testing is 1 second (and the
   // granularity is seconds), so wait for just over 2 seconds to elapse
-  base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(2100));
+  base::PlatformThread::Sleep(base::Milliseconds(2100));
 
   // Load rewards page
   rewards_browsertest_util::ActivateTabAtIndex(browser_, 0);
diff --git a/components/brave_shields/browser/ad_block_subscription_service_manager.cc b/components/brave_shields/browser/ad_block_subscription_service_manager.cc
index 301e7f263c34..44decc7ece37 100644
--- a/components/brave_shields/browser/ad_block_subscription_service_manager.cc
+++ b/components/brave_shields/browser/ad_block_subscription_service_manager.cc
@@ -37,9 +37,9 @@ base::TimeDelta* g_testing_subscription_retry_interval;
 
 namespace {
 
-const base::TimeDelta kListUpdateInterval = base::TimeDelta::FromDays(7);
-const base::TimeDelta kListRetryInterval = base::TimeDelta::FromHours(1);
-const base::TimeDelta kListCheckInitialDelay = base::TimeDelta::FromMinutes(1);
+const base::TimeDelta kListUpdateInterval = base::Days(7);
+const base::TimeDelta kListRetryInterval = base::Hours(1);
+const base::TimeDelta kListCheckInitialDelay = base::Minutes(1);
 
 SubscriptionInfo BuildInfoFromDict(const GURL& sub_url,
                                    const base::Value* dict) {
diff --git a/components/brave_shields/browser/base_brave_shields_service.h b/components/brave_shields/browser/base_brave_shields_service.h
index c787e8729f22..10fe368a602c 100644
--- a/components/brave_shields/browser/base_brave_shields_service.h
+++ b/components/brave_shields/browser/base_brave_shields_service.h
@@ -14,7 +14,7 @@
 #include <mutex>  // NOLINT
 
 #include "base/files/file_path.h"
-#include "base/sequenced_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
 #include "brave/components/brave_component_updater/browser/brave_component.h"
 #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
 #include "url/gurl.h"
diff --git a/components/brave_shields/browser/brave_shields_util.cc b/components/brave_shields/browser/brave_shields_util.cc
index 62653c1f087a..112034c83a9f 100644
--- a/components/brave_shields/browser/brave_shields_util.cc
+++ b/components/brave_shields/browser/brave_shields_util.cc
@@ -22,6 +22,7 @@
 #include "content/public/common/referrer.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 using content::Referrer;
 
@@ -450,9 +451,10 @@ bool MaybeChangeReferrer(bool allow_referrers,
   // Cap the referrer to "strict-origin-when-cross-origin". More restrictive
   // policies should be already applied.
   // See https://github.com/brave/brave-browser/issues/13464
+  url::Origin current_referrer_origin = url::Origin::Create(current_referrer);
   *output_referrer = Referrer::SanitizeForRequest(
       target_url,
-      Referrer(current_referrer.GetOrigin(),
+      Referrer(current_referrer_origin.GetURL(),
                network::mojom::ReferrerPolicy::kStrictOriginWhenCrossOrigin));
 
   return true;
diff --git a/components/brave_shields/browser/domain_block_page.cc b/components/brave_shields/browser/domain_block_page.cc
index fdb2a08784f9..0a411a1ee6ea 100644
--- a/components/brave_shields/browser/domain_block_page.cc
+++ b/components/brave_shields/browser/domain_block_page.cc
@@ -15,6 +15,7 @@
 #include "components/grit/brave_components_strings.h"
 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "url/origin.h"
 
 namespace brave_shields {
 
@@ -74,7 +75,10 @@ void DomainBlockPage::PopulateInterstitialStrings(base::Value* load_time_data) {
   load_time_data->SetStringKey(
       "primaryParagraph",
       l10n_util::GetStringUTF16(IDS_DOMAIN_BLOCK_PRIMARY_PARAGRAPH));
-  load_time_data->SetStringKey("domain", request_url().GetOrigin().spec());
+
+  url::Origin request_url_origin = url::Origin::Create(request_url());
+  load_time_data->SetStringKey("domain", request_url_origin.Serialize());
+
   load_time_data->SetStringKey(
       "explanationParagraph",
       l10n_util::GetStringUTF16(IDS_DOMAIN_BLOCK_EXPLANATION));
diff --git a/components/brave_shields/browser/https_everywhere_recently_used_cache.h b/components/brave_shields/browser/https_everywhere_recently_used_cache.h
index 27e40411f3a3..28e2b724b918 100644
--- a/components/brave_shields/browser/https_everywhere_recently_used_cache.h
+++ b/components/brave_shields/browser/https_everywhere_recently_used_cache.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "base/containers/mru_cache.h"
+#include "base/containers/lru_cache.h"
 #include "base/synchronization/lock.h"
 
 template <class T> class HTTPSERecentlyUsedCache {
@@ -38,7 +38,7 @@ template <class T> class HTTPSERecentlyUsedCache {
   }
 
  private:
-  base::MRUCache<std::string, T> data_;
+  base::LRUCache<std::string, T> data_;
   base::Lock lock_;
 };
 
diff --git a/components/brave_today/browser/brave_news_controller.cc b/components/brave_today/browser/brave_news_controller.cc
index 888ca925452a..1c0dcb773793 100644
--- a/components/brave_today/browser/brave_news_controller.cc
+++ b/components/brave_today/browser/brave_news_controller.cc
@@ -362,16 +362,16 @@ void BraveNewsController::ConditionallyStartOrStopTimer() {
   if (is_enabled) {
     VLOG(1) << "STARTING TIMERS";
     if (!timer_feed_update_.IsRunning()) {
-      timer_feed_update_.Start(FROM_HERE, base::TimeDelta::FromHours(3), this,
+      timer_feed_update_.Start(FROM_HERE, base::Hours(3), this,
                                &BraveNewsController::CheckForFeedsUpdate);
     }
     if (!timer_publishers_update_.IsRunning()) {
       timer_publishers_update_.Start(
-          FROM_HERE, base::TimeDelta::FromDays(1), this,
+          FROM_HERE, base::Days(1), this,
           &BraveNewsController::CheckForPublishersUpdate);
     }
     if (!timer_prefetch_.IsRunning()) {
-      timer_prefetch_.Start(FROM_HERE, base::TimeDelta::FromMinutes(1), this,
+      timer_prefetch_.Start(FROM_HERE, base::Minutes(1), this,
                             &BraveNewsController::Prefetch);
     }
   } else {
diff --git a/components/brave_today/browser/feed_building.cc b/components/brave_today/browser/feed_building.cc
index ca26a41c8db1..8231fb37bc02 100644
--- a/components/brave_today/browser/feed_building.cc
+++ b/components/brave_today/browser/feed_building.cc
@@ -137,7 +137,7 @@ void BuildFeedPageItem(std::list<mojom::ArticlePtr>* articles,
   if (is_random) {
     // Additional difference for is_random is that we only consider items from
     // the last 48hrs.
-    base::Time time_limit = base::Time::Now() - base::TimeDelta::FromDays(2);
+    base::Time time_limit = base::Time::Now() - base::Days(2);
     auto match_is_recent = [time_limit](mojom::Article* article) {
       return (article->data->publish_time >= time_limit);
     };
diff --git a/components/brave_vpn/brave_vpn_os_connection_api_sim.cc b/components/brave_vpn/brave_vpn_os_connection_api_sim.cc
index 9859cd3dc3c3..b2caebde01d6 100644
--- a/components/brave_vpn/brave_vpn_os_connection_api_sim.cc
+++ b/components/brave_vpn/brave_vpn_os_connection_api_sim.cc
@@ -49,7 +49,7 @@ void BraveVPNOSConnectionAPISim::Connect(const std::string& name) {
         FROM_HERE,
         base::BindOnce(&BraveVPNOSConnectionAPISim::OnConnected,
                        weak_factory_.GetWeakPtr(), name, true),
-        base::TimeDelta::FromSeconds(1));
+        base::Seconds(1));
     return;
   }
 
@@ -61,7 +61,7 @@ void BraveVPNOSConnectionAPISim::Connect(const std::string& name) {
       FROM_HERE,
       base::BindOnce(&BraveVPNOSConnectionAPISim::OnConnected,
                      weak_factory_.GetWeakPtr(), name, false),
-      base::TimeDelta::FromSeconds(1));
+      base::Seconds(1));
 }
 
 void BraveVPNOSConnectionAPISim::Disconnect(const std::string& name) {
diff --git a/components/brave_vpn/brave_vpn_service_desktop.cc b/components/brave_vpn/brave_vpn_service_desktop.cc
index 1ad8ad3a6153..82dc6cd9a758 100644
--- a/components/brave_vpn/brave_vpn_service_desktop.cc
+++ b/components/brave_vpn/brave_vpn_service_desktop.cc
@@ -127,8 +127,8 @@ void BraveVpnServiceDesktop::ScheduleFetchRegionDataIfNeeded() {
   FetchRegionData();
   constexpr int kRegionDataUpdateIntervalInHours = 5;
   region_data_update_timer_.Start(
-      FROM_HERE, base::TimeDelta::FromHours(kRegionDataUpdateIntervalInHours),
-      this, &BraveVpnServiceDesktop::FetchRegionData);
+      FROM_HERE, base::Hours(kRegionDataUpdateIntervalInHours), this,
+      &BraveVpnServiceDesktop::FetchRegionData);
 }
 
 void BraveVpnServiceDesktop::Shutdown() {
diff --git a/components/brave_wallet/browser/asset_ratio_controller_unittest.cc b/components/brave_wallet/browser/asset_ratio_controller_unittest.cc
index 64627fc7f3f2..c7709878ff94 100644
--- a/components/brave_wallet/browser/asset_ratio_controller_unittest.cc
+++ b/components/brave_wallet/browser/asset_ratio_controller_unittest.cc
@@ -234,12 +234,12 @@ TEST_F(AssetRatioControllerUnitTest, GetPriceHistory) {
       expected_price_history_response;
 
   auto asset_time_price = brave_wallet::mojom::AssetTimePrice::New();
-  asset_time_price->date = base::TimeDelta::FromMilliseconds(1622733088498);
+  asset_time_price->date = base::Milliseconds(1622733088498);
   asset_time_price->price = "0.8201346624954003";
   expected_price_history_response.push_back(std::move(asset_time_price));
 
   asset_time_price = brave_wallet::mojom::AssetTimePrice::New();
-  asset_time_price->date = base::TimeDelta::FromMilliseconds(1622737203757);
+  asset_time_price->date = base::Milliseconds(1622737203757);
   asset_time_price->price = "0.8096978545029869";
   expected_price_history_response.push_back(std::move(asset_time_price));
 
diff --git a/components/brave_wallet/browser/asset_ratio_response_parser.cc b/components/brave_wallet/browser/asset_ratio_response_parser.cc
index 6743a92645bb..9c910b0cf0c1 100644
--- a/components/brave_wallet/browser/asset_ratio_response_parser.cc
+++ b/components/brave_wallet/browser/asset_ratio_response_parser.cc
@@ -171,8 +171,7 @@ bool ParseAssetPriceHistory(
 
     base::Time date = base::Time::FromJsTime(date_dbl);
     auto asset_time_price = brave_wallet::mojom::AssetTimePrice::New();
-    asset_time_price->date =
-        base::TimeDelta::FromMilliseconds(date.ToJavaTime());
+    asset_time_price->date = base::Milliseconds(date.ToJavaTime());
     asset_time_price->price = base::NumberToString(price);
     values->push_back(std::move(asset_time_price));
   }
diff --git a/components/brave_wallet/browser/brave_wallet_service.cc b/components/brave_wallet/browser/brave_wallet_service.cc
index 5a57950132a4..70047746770a 100644
--- a/components/brave_wallet/browser/brave_wallet_service.cc
+++ b/components/brave_wallet/browser/brave_wallet_service.cc
@@ -136,9 +136,8 @@ BraveWalletService::BraveWalletService(
       base::BindRepeating(&BraveWalletService::OnNetworkListChanged,
                           base::Unretained(this)));
 
-  p3a_periodic_timer_.Start(
-      FROM_HERE, base::TimeDelta::FromHours(kRefreshP3AFrequencyHours), this,
-      &BraveWalletService::OnP3ATimerFired);
+  p3a_periodic_timer_.Start(FROM_HERE, base::Hours(kRefreshP3AFrequencyHours),
+                            this, &BraveWalletService::OnP3ATimerFired);
   OnP3ATimerFired();  // Also call on startup
 }
 
diff --git a/components/brave_wallet/browser/eth_block_tracker_unittest.cc b/components/brave_wallet/browser/eth_block_tracker_unittest.cc
index 1b07ae50de8c..03266e6d77de 100644
--- a/components/brave_wallet/browser/eth_block_tracker_unittest.cc
+++ b/components/brave_wallet/browser/eth_block_tracker_unittest.cc
@@ -77,25 +77,25 @@ TEST_F(EthBlockTrackerUnitTest, Timer) {
   url_loader_factory_.SetInterceptor(base::BindLambdaForTesting(
       [&](const network::ResourceRequest& request) { request_sent = true; }));
   EXPECT_FALSE(tracker.IsRunning());
-  tracker.Start(base::TimeDelta::FromSeconds(5));
-  task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
+  tracker.Start(base::Seconds(5));
+  task_environment_.FastForwardBy(base::Seconds(1));
   EXPECT_TRUE(tracker.IsRunning());
   EXPECT_FALSE(request_sent);
-  task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(4));
+  task_environment_.FastForwardBy(base::Seconds(4));
   EXPECT_TRUE(request_sent);
 
   // interval will be changed
-  tracker.Start(base::TimeDelta::FromSeconds(30));
+  tracker.Start(base::Seconds(30));
   request_sent = false;
-  task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(5));
+  task_environment_.FastForwardBy(base::Seconds(5));
   EXPECT_FALSE(request_sent);
-  task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(25));
+  task_environment_.FastForwardBy(base::Seconds(25));
   EXPECT_TRUE(request_sent);
 
   request_sent = false;
   tracker.Stop();
   EXPECT_FALSE(tracker.IsRunning());
-  task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(40));
+  task_environment_.FastForwardBy(base::Seconds(40));
   EXPECT_FALSE(request_sent);
 }
 
@@ -111,8 +111,8 @@ TEST_F(EthBlockTrackerUnitTest, GetBlockNumber) {
   TrackerObserver observer;
   tracker.AddObserver(&observer);
 
-  tracker.Start(base::TimeDelta::FromSeconds(5));
-  task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(5));
+  tracker.Start(base::Seconds(5));
+  task_environment_.FastForwardBy(base::Seconds(5));
   EXPECT_EQ(observer.block_num_, uint256_t(1));
   EXPECT_EQ(observer.block_num_from_new_block_, uint256_t(1));
   EXPECT_EQ(observer.latest_block_fired_, 1u);
@@ -120,8 +120,8 @@ TEST_F(EthBlockTrackerUnitTest, GetBlockNumber) {
   EXPECT_EQ(tracker.GetCurrentBlock(), uint256_t(1));
 
   response_block_num_ = 3;
-  tracker.Start(base::TimeDelta::FromSeconds(5));
-  task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(5));
+  tracker.Start(base::Seconds(5));
+  task_environment_.FastForwardBy(base::Seconds(5));
   EXPECT_EQ(observer.block_num_, uint256_t(3));
   EXPECT_EQ(observer.block_num_from_new_block_, uint256_t(3));
   EXPECT_EQ(observer.latest_block_fired_, 2u);
@@ -129,7 +129,7 @@ TEST_F(EthBlockTrackerUnitTest, GetBlockNumber) {
   EXPECT_EQ(tracker.GetCurrentBlock(), uint256_t(3));
 
   // Still response_block_num_ 3
-  task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(5));
+  task_environment_.FastForwardBy(base::Seconds(5));
   EXPECT_EQ(observer.block_num_, uint256_t(3));
   EXPECT_EQ(observer.block_num_from_new_block_, uint256_t(3));
   EXPECT_EQ(observer.latest_block_fired_, 3u);
@@ -169,8 +169,8 @@ TEST_F(EthBlockTrackerUnitTest, GetBlockNumberError) {
   TrackerObserver observer;
   tracker.AddObserver(&observer);
 
-  tracker.Start(base::TimeDelta::FromSeconds(5));
-  task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(5));
+  tracker.Start(base::Seconds(5));
+  task_environment_.FastForwardBy(base::Seconds(5));
   EXPECT_EQ(observer.latest_block_fired_, 0u);
   EXPECT_EQ(observer.block_num_, uint256_t(0));
   EXPECT_EQ(observer.block_num_from_new_block_, uint256_t(0));
diff --git a/components/brave_wallet/browser/eth_json_rpc_controller.cc b/components/brave_wallet/browser/eth_json_rpc_controller.cc
index 13d91a9cf125..be3ed928b775 100644
--- a/components/brave_wallet/browser/eth_json_rpc_controller.cc
+++ b/components/brave_wallet/browser/eth_json_rpc_controller.cc
@@ -27,6 +27,7 @@
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "third_party/re2/src/re2/re2.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "url/origin.h"
 
 namespace {
 
@@ -163,7 +164,7 @@ void EthJsonRpcController::GetPendingChainRequests(
 void EthJsonRpcController::AddEthereumChain(mojom::EthereumChainPtr chain,
                                             const GURL& origin,
                                             AddEthereumChainCallback callback) {
-  DCHECK_EQ(origin, origin.GetOrigin());
+  DCHECK_EQ(origin, url::Origin::Create(origin).GetURL());
   if (!origin.is_valid() ||
       add_chain_pending_requests_.contains(chain->chain_id) ||
       HasRequestFromOrigin(origin)) {
diff --git a/components/brave_wallet/browser/eth_json_rpc_controller_unittest.cc b/components/brave_wallet/browser/eth_json_rpc_controller_unittest.cc
index aa4b6f9a1026..3c3b41af451d 100644
--- a/components/brave_wallet/browser/eth_json_rpc_controller_unittest.cc
+++ b/components/brave_wallet/browser/eth_json_rpc_controller_unittest.cc
@@ -35,6 +35,7 @@
 #include "services/network/test/test_url_loader_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace {
 
@@ -375,7 +376,8 @@ TEST_F(EthJsonRpcControllerUnitTest, SetNetwork) {
     const std::string& expected_url = network->rpc_urls.front();
     rpc_controller_->GetNetworkUrl(base::BindLambdaForTesting(
         [&callback_is_called, &expected_url](const std::string& spec) {
-          EXPECT_EQ(GURL(spec).GetOrigin(), GURL(expected_url).GetOrigin());
+          EXPECT_EQ(url::Origin::Create(GURL(spec)),
+                    url::Origin::Create(GURL(expected_url)));
           callback_is_called = true;
         }));
     ASSERT_TRUE(callback_is_called);
@@ -411,7 +413,8 @@ TEST_F(EthJsonRpcControllerUnitTest, SetCustomNetwork) {
   const std::string& expected_url = chain1.rpc_urls.front();
   rpc_controller_->GetNetworkUrl(base::BindLambdaForTesting(
       [&callback_is_called, &expected_url](const std::string& spec) {
-        EXPECT_EQ(GURL(spec).GetOrigin(), GURL(expected_url).GetOrigin());
+        EXPECT_EQ(url::Origin::Create(GURL(spec)),
+                  url::Origin::Create(GURL(expected_url)));
         callback_is_called = true;
       }));
   ASSERT_TRUE(callback_is_called);
diff --git a/components/brave_wallet/browser/eth_tx_controller.cc b/components/brave_wallet/browser/eth_tx_controller.cc
index 127e4fd909c6..80329ccc4c23 100644
--- a/components/brave_wallet/browser/eth_tx_controller.cc
+++ b/components/brave_wallet/browser/eth_tx_controller.cc
@@ -814,8 +814,7 @@ void EthTxController::CheckIfBlockTrackerShouldRun() {
   bool locked = keyring_controller_->IsLocked();
   bool running = eth_block_tracker_->IsRunning();
   if (!locked && !running) {
-    eth_block_tracker_->Start(
-        base::TimeDelta::FromSeconds(kBlockTrackerDefaultTimeInSeconds));
+    eth_block_tracker_->Start(base::Seconds(kBlockTrackerDefaultTimeInSeconds));
   } else if ((locked || known_no_pending_tx) && running) {
     eth_block_tracker_->Stop();
   }
diff --git a/components/brave_wallet/browser/eth_tx_controller_unittest.cc b/components/brave_wallet/browser/eth_tx_controller_unittest.cc
index 370c1ae11ad0..0d61cf4bba54 100644
--- a/components/brave_wallet/browser/eth_tx_controller_unittest.cc
+++ b/components/brave_wallet/browser/eth_tx_controller_unittest.cc
@@ -1425,13 +1425,13 @@ TEST_F(EthTxControllerUnitTest, TestSubmittedToConfirmed) {
 
   // Nothing is triggered after 10s
   task_environment_.FastForwardBy(
-      base::TimeDelta::FromSeconds(kBlockTrackerDefaultTimeInSeconds - 1));
+      base::Seconds(kBlockTrackerDefaultTimeInSeconds - 1));
   auto tx_meta1 = eth_tx_controller()->GetTxForTesting("001");
   EXPECT_EQ(mojom::TransactionStatus::Submitted, tx_meta1->status);
   auto tx_meta2 = eth_tx_controller()->GetTxForTesting("002");
   EXPECT_EQ(mojom::TransactionStatus::Submitted, tx_meta1->status);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
+  task_environment_.FastForwardBy(base::Seconds(1));
   tx_meta1 = eth_tx_controller()->GetTxForTesting("001");
   EXPECT_EQ(mojom::TransactionStatus::Confirmed, tx_meta1->status);
   tx_meta2 = eth_tx_controller()->GetTxForTesting("002");
@@ -1449,7 +1449,7 @@ TEST_F(EthTxControllerUnitTest, TestSubmittedToConfirmed) {
   eth_tx_controller()->tx_state_manager_->AddOrUpdateTx(meta);
   keyring_controller_->Lock();
   task_environment_.FastForwardBy(
-      base::TimeDelta::FromSeconds(kBlockTrackerDefaultTimeInSeconds + 1));
+      base::Seconds(kBlockTrackerDefaultTimeInSeconds + 1));
   tx_meta1 = eth_tx_controller()->GetTxForTesting("001");
   EXPECT_EQ(mojom::TransactionStatus::Submitted, tx_meta1->status);
   tx_meta2 = eth_tx_controller()->GetTxForTesting("002");
diff --git a/components/brave_wallet/browser/eth_tx_state_manager.cc b/components/brave_wallet/browser/eth_tx_state_manager.cc
index 2eaa9c2ff297..142cf17cc50c 100644
--- a/components/brave_wallet/browser/eth_tx_state_manager.cc
+++ b/components/brave_wallet/browser/eth_tx_state_manager.cc
@@ -119,9 +119,9 @@ mojom::TransactionInfoPtr EthTxStateManager::TxMetaToTransactionInfo(
           chain_id, max_priority_fee_per_gas, max_fee_per_gas,
           std::move(gas_estimation_1559_ptr)),
       meta.status, tx_type, tx_params, tx_args,
-      base::TimeDelta::FromMilliseconds(meta.created_time.ToJavaTime()),
-      base::TimeDelta::FromMilliseconds(meta.submitted_time.ToJavaTime()),
-      base::TimeDelta::FromMilliseconds(meta.confirmed_time.ToJavaTime()));
+      base::Milliseconds(meta.created_time.ToJavaTime()),
+      base::Milliseconds(meta.submitted_time.ToJavaTime()),
+      base::Milliseconds(meta.confirmed_time.ToJavaTime()));
 }
 
 std::unique_ptr<EthTxStateManager::TxMeta> EthTxStateManager::ValueToTxMeta(
diff --git a/components/brave_wallet/browser/ethereum_permission_utils.cc b/components/brave_wallet/browser/ethereum_permission_utils.cc
index 23be83fd1d4b..4e7483d73596 100644
--- a/components/brave_wallet/browser/ethereum_permission_utils.cc
+++ b/components/brave_wallet/browser/ethereum_permission_utils.cc
@@ -11,6 +11,7 @@
 #include "base/strings/stringprintf.h"
 #include "third_party/re2/src/re2/re2.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace {
 
@@ -38,7 +39,7 @@ void ExtractAddresses(const GURL& origin,
                       std::queue<std::string>* address_queue) {
   static const base::NoDestructor<re2::RE2> kAddrRegex(kAddrPattern);
   DCHECK(origin.is_valid() && address_queue);
-  DCHECK_EQ(origin, origin.GetOrigin());
+  DCHECK_EQ(origin, url::Origin::Create(origin).GetURL());
 
   re2::StringPiece input(origin.spec());
   std::string match;
@@ -54,7 +55,7 @@ bool ParseRequestingOriginInternal(const GURL& origin,
                                    std::string* requesting_origin,
                                    std::string* account,
                                    std::queue<std::string>* address_queue) {
-  if (!origin.is_valid() || origin != origin.GetOrigin())
+  if (!origin.is_valid() || origin != url::Origin::Create(origin).GetURL())
     return false;
 
   std::string scheme_host_group;
diff --git a/components/brave_wallet/browser/keyring_controller.cc b/components/brave_wallet/browser/keyring_controller.cc
index fdb9c74eb744..d3fa6c2c5262 100644
--- a/components/brave_wallet/browser/keyring_controller.cc
+++ b/components/brave_wallet/browser/keyring_controller.cc
@@ -1039,9 +1039,8 @@ void KeyringController::ResetAutoLockTimer() {
   } else {
     size_t auto_lock_minutes =
         (size_t)prefs_->GetInteger(kBraveWalletAutoLockMinutes);
-    auto_lock_timer_->Start(FROM_HERE,
-                            base::TimeDelta::FromMinutes(auto_lock_minutes),
-                            this, &KeyringController::OnAutoLockFired);
+    auto_lock_timer_->Start(FROM_HERE, base::Minutes(auto_lock_minutes), this,
+                            &KeyringController::OnAutoLockFired);
   }
 }
 
diff --git a/components/child_process_monitor/child_process_monitor.cc b/components/child_process_monitor/child_process_monitor.cc
index b10c6db7298d..fb5d0f016fca 100644
--- a/components/child_process_monitor/child_process_monitor.cc
+++ b/components/child_process_monitor/child_process_monitor.cc
@@ -18,10 +18,10 @@
 
 #include <utility>
 
-#include "base/bind_post_task.h"
 #include "base/logging.h"
 #include "base/process/kill.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/bind_post_task.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/task/task_traits.h"
 #include "base/task/thread_pool.h"
 #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/child_process_monitor/child_process_monitor_unittest.cc b/components/child_process_monitor/child_process_monitor_unittest.cc
index 6468b5e332fe..373f93477d61 100644
--- a/components/child_process_monitor/child_process_monitor_unittest.cc
+++ b/components/child_process_monitor/child_process_monitor_unittest.cc
@@ -29,7 +29,7 @@ void WaitForChildTermination(base::ProcessHandle handle) {
   base::TerminationStatus status = base::TERMINATION_STATUS_STILL_RUNNING;
   do {
     status = base::GetTerminationStatus(handle, &exit_code);
-    base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(30));
+    base::PlatformThread::Sleep(base::Milliseconds(30));
   } while (status == base::TERMINATION_STATUS_STILL_RUNNING);
 }
 }  // namespace
diff --git a/components/components_strings.grd b/components/components_strings.grd
index f242a08a541f..f6e7ef01a284 100644
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -300,6 +300,7 @@
       <part file="find_in_page_strings.grdp" />
       <part file="flags_strings.grdp" />
       <part file="fullscreen_control_strings.grdp" />
+      <part file="global_media_controls_strings.grdp" />
       <part file="heavy_ad_intervention_strings.grdp" />
       <part file="history_strings.grdp" />
       <part file="javascript_dialogs_strings.grdp" />
@@ -321,7 +322,6 @@
       <part file="reset_password_strings.grdp" />
       <part file="safe_browsing_strings.grdp" />
       <part file="security_interstitials_strings.grdp" />
-      <part file="security_state_strings.grdp" />
       <part file="send_tab_to_self_strings.grdp" />
       <part file="site_settings_strings.grdp" />
       <part file="sms_strings.grdp" />
diff --git a/components/content_settings/core/browser/brave_content_settings_utils.cc b/components/content_settings/core/browser/brave_content_settings_utils.cc
index ef782382595b..bf62c4f66293 100644
--- a/components/content_settings/core/browser/brave_content_settings_utils.cc
+++ b/components/content_settings/core/browser/brave_content_settings_utils.cc
@@ -124,8 +124,8 @@ base::Time GetTimeStampFromDictionary(const base::DictionaryValue* dictionary,
   int64_t timestamp = 0;
   if (const std::string* timestamp_str = dictionary->FindStringKey(key))
     base::StringToInt64(*timestamp_str, &timestamp);
-  base::Time last_modified = base::Time::FromDeltaSinceWindowsEpoch(
-      base::TimeDelta::FromMicroseconds(timestamp));
+  base::Time last_modified =
+      base::Time::FromDeltaSinceWindowsEpoch(base::Microseconds(timestamp));
   return last_modified;
 }
 
diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl.cc b/components/content_settings/renderer/brave_content_settings_agent_impl.cc
index f43bd1ba181f..aa62db698bf8 100644
--- a/components/content_settings/renderer/brave_content_settings_agent_impl.cc
+++ b/components/content_settings/renderer/brave_content_settings_agent_impl.cc
@@ -27,6 +27,7 @@
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_frame.h"
 #include "third_party/blink/public/web/web_local_frame.h"
+#include "url/origin.h"
 #include "url/url_constants.h"
 
 namespace content_settings {
@@ -99,7 +100,7 @@ bool BraveContentSettingsAgentImpl::IsScriptTemporilyAllowed(
   // Also matches the full script URL to support data URL cases which we use
   // the full URL to allow it.
   return base::Contains(temporarily_allowed_scripts_,
-                        script_url.GetOrigin().spec()) ||
+                        url::Origin::Create(script_url).Serialize()) ||
          base::Contains(temporarily_allowed_scripts_, script_url.spec());
 }
 
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 64423b6fbe83..cdbfd22262b0 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
@@ -30,6 +30,7 @@
 #include "net/test/embedded_test_server/default_handlers.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "url/origin.h"
 
 using brave_shields::ControlType;
 
@@ -79,6 +80,10 @@ const char kReferrerScript[] =
 
 const char kTitleScript[] = "domAutomationController.send(document.title);";
 
+GURL GetOriginURL(const GURL& url) {
+  return url::Origin::Create(url).GetURL();
+}
+
 }  // namespace
 
 class BraveContentSettingsAgentImplBrowserTest : public InProcessBrowserTest {
@@ -330,7 +335,7 @@ class BraveContentSettingsAgentImplBrowserTest : public InProcessBrowserTest {
 
   void NavigateToPageWithIframe() {
     ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url()));
-    ASSERT_EQ(contents()->GetAllFrames().size(), 2u)
+    ASSERT_EQ(CollectAllRenderFrameHosts(contents()).size(), 2u)
         << "Two frames (main + iframe) should be created.";
     content::RenderFrameHost* main_frame = contents()->GetMainFrame();
     EXPECT_EQ(main_frame->GetLastCommittedURL(), url());
@@ -618,7 +623,8 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
   EXPECT_EQ(
       ExecScriptGetStr(create_image_script(cross_site_image_url()), contents()),
       cross_site_image_url().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_image_url()), url().GetOrigin().spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_image_url()),
+            GetOriginURL(url()).spec());
 
   // Same-origin iframe navigations get the page URL as referrer.
   NavigateIframe(same_origin_url());
@@ -628,8 +634,8 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
   // Cross-site iframe navigations should follow the default referrer policy.
   NavigateIframe(cross_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, child_frame()),
-            url().GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), url().GetOrigin().spec());
+            GetOriginURL(url()).spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(url()).spec());
 
   // Same-origin navigations get the original page origin as the referrer.
   NavigateDirectlyToPageWithLink(same_origin_url());
@@ -640,14 +646,14 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
   // referrer.
   NavigateDirectlyToPageWithLink(same_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            link_url().GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(same_site_url()), link_url().GetOrigin().spec());
+            GetOriginURL(link_url()).spec());
+  EXPECT_EQ(GetLastReferrer(same_site_url()), GetOriginURL(link_url()).spec());
 
   // Cross-site navigations should follow the default referrer policy.
   NavigateDirectlyToPageWithLink(cross_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            link_url().GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), link_url().GetOrigin().spec());
+            GetOriginURL(link_url()).spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(link_url()).spec());
 }
 
 IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
@@ -669,20 +675,21 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
       ExecScriptGetStr(create_image_script(redirect_to_cross_site_image_url()),
                        contents()),
       redirect_to_cross_site_image_url().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_image_url()), url().GetOrigin().spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_image_url()),
+            GetOriginURL(url()).spec());
 
   // Cross-site iframe navigations should follow the default referrer policy.
   NavigateCrossSiteRedirectIframe();
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, child_frame()),
-            url().GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), url().GetOrigin().spec());
+            GetOriginURL(url()).spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(url()).spec());
 
   // Cross-site navigations  should follow the default referrer policy.
   RedirectToPageWithLink(redirect_to_cross_site_url(), cross_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            redirect_to_cross_site_url().GetOrigin().spec());
+            GetOriginURL(redirect_to_cross_site_url()).spec());
   EXPECT_EQ(GetLastReferrer(cross_site_url()),
-            redirect_to_cross_site_url().GetOrigin().spec());
+            GetOriginURL(redirect_to_cross_site_url()).spec());
   EXPECT_EQ(GetLastReferrer(redirect_to_cross_site_url()), link_url().spec());
 }
 
@@ -706,7 +713,8 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
   EXPECT_EQ(
       ExecScriptGetStr(create_image_script(cross_site_image_url()), contents()),
       cross_site_image_url().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_image_url()), url().GetOrigin().spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_image_url()),
+            GetOriginURL(url()).spec());
 
   // Same-origin iframe navigations get the page URL as referrer.
   NavigateIframe(same_origin_url());
@@ -716,8 +724,8 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
   // Cross-site iframe navigations should follow the default referrer policy.
   NavigateIframe(cross_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, child_frame()),
-            url().GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), url().GetOrigin().spec());
+            GetOriginURL(url()).spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(url()).spec());
 
   // Same-origin navigations get the original page URL as the referrer.
   NavigateDirectlyToPageWithLink(same_origin_url());
@@ -726,7 +734,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
 
   // Same-site but cross-origin navigations get the original page origin as the
   // referrer.
-  const std::string expected_referrer = link_url().GetOrigin().spec();
+  const std::string expected_referrer = GetOriginURL(link_url()).spec();
   NavigateDirectlyToPageWithLink(same_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()), expected_referrer);
   EXPECT_EQ(GetLastReferrer(same_site_url()), expected_referrer);
@@ -772,20 +780,21 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
       ExecScriptGetStr(create_image_script(redirect_to_cross_site_image_url()),
                        contents()),
       redirect_to_cross_site_image_url().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_image_url()), url().GetOrigin().spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_image_url()),
+            GetOriginURL(url()).spec());
 
   // Cross-site iframe navigations should follow the default referrer policy.
   NavigateCrossSiteRedirectIframe();
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, child_frame()),
-            url().GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), url().GetOrigin().spec());
+            GetOriginURL(url()).spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(url()).spec());
 
   // Cross-site navigations should follow the default referrer policy.
   RedirectToPageWithLink(redirect_to_cross_site_url(), cross_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            redirect_to_cross_site_url().GetOrigin().spec());
+            GetOriginURL(redirect_to_cross_site_url()).spec());
   EXPECT_EQ(GetLastReferrer(cross_site_url()),
-            redirect_to_cross_site_url().GetOrigin().spec());
+            GetOriginURL(redirect_to_cross_site_url()).spec());
   // Intermidiate same-origin navigation gets full referrer.
   EXPECT_EQ(GetLastReferrer(redirect_to_cross_site_url()), link_url().spec());
 }
@@ -803,27 +812,28 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
   EXPECT_EQ(
       ExecScriptGetStr(create_image_script(cross_site_image_url()), contents()),
       cross_site_image_url().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_image_url()), url().GetOrigin().spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_image_url()),
+            GetOriginURL(url()).spec());
 
   // A cross-site iframe navigation gets the origin of the first one as
   // referrer.
   NavigateIframe(cross_site_url());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), url().GetOrigin());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(url()));
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, child_frame()),
-            url().GetOrigin().spec());
+            GetOriginURL(url()).spec());
 
   // Same-site but cross-origin navigations get the original page origin as the
   // referrer.
   NavigateDirectlyToPageWithLink(same_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            link_url().GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(same_site_url()), link_url().GetOrigin().spec());
+            GetOriginURL(link_url()).spec());
+  EXPECT_EQ(GetLastReferrer(same_site_url()), GetOriginURL(link_url()).spec());
 
   // Cross-site navigations get origin as a referrer.
   NavigateDirectlyToPageWithLink(cross_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            url().GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), url().GetOrigin().spec());
+            GetOriginURL(url()).spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(url()).spec());
 
   // Check that a less restrictive policy is respected.
   GURL link = NavigateDirectlyToPageWithLink(cross_site_url(),
@@ -852,24 +862,24 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
   // Check that "strict-origin" policy is respected.
   link = NavigateDirectlyToPageWithLink(same_site_url(), "strict-origin");
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            link.GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(same_site_url()), link.GetOrigin().spec());
+            GetOriginURL(link).spec());
+  EXPECT_EQ(GetLastReferrer(same_site_url()), GetOriginURL(link).spec());
 
   NavigateDirectlyToPageWithLink(same_origin_url(), "strict-origin");
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            link.GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(same_origin_url()), link.GetOrigin().spec());
+            GetOriginURL(link).spec());
+  EXPECT_EQ(GetLastReferrer(same_origin_url()), GetOriginURL(link).spec());
 
   NavigateDirectlyToPageWithLink(cross_site_url(), "strict-origin");
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            link.GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), link.GetOrigin().spec());
+            GetOriginURL(link).spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(link).spec());
 
   // Check cross-site navigations with redirect.
   RedirectToPageWithLink(redirect_to_cross_site_url(), cross_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            link.GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), link.GetOrigin().spec());
+            GetOriginURL(link).spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(link).spec());
 }
 
 IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
@@ -886,20 +896,21 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
   EXPECT_EQ(
       ExecScriptGetStr(create_image_script(cross_site_image_url()), contents()),
       cross_site_image_url().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_image_url()), url().GetOrigin().spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_image_url()),
+            GetOriginURL(url()).spec());
 
   // A cross-origin iframe navigation gets the origin of the first one as
   // referrer.
   NavigateIframe(cross_site_url());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), url().GetOrigin());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(url()));
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, child_frame()),
-            url().GetOrigin().spec());
+            GetOriginURL(url()).spec());
 
   // Cross-site navigations get origin as a referrer.
   NavigateDirectlyToPageWithLink(cross_site_url());
   EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()),
-            url().GetOrigin().spec());
-  EXPECT_EQ(GetLastReferrer(cross_site_url()), url().GetOrigin().spec());
+            GetOriginURL(url()).spec());
+  EXPECT_EQ(GetLastReferrer(cross_site_url()), GetOriginURL(url()).spec());
 }
 
 IN_PROC_BROWSER_TEST_F(
@@ -1128,14 +1139,14 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest, BlockScripts) {
   BlockScripts();
 
   NavigateToURLUntilLoadStop("a.test", "/load_js_from_origins.html");
-  EXPECT_EQ(contents()->GetAllFrames().size(), 1u);
+  EXPECT_EQ(CollectAllRenderFrameHosts(contents()).size(), 1u);
 }
 
 IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest, AllowScripts) {
   AllowScripts();
 
   NavigateToURLUntilLoadStop("a.test", "/load_js_from_origins.html");
-  EXPECT_EQ(contents()->GetAllFrames().size(), 4u);
+  EXPECT_EQ(CollectAllRenderFrameHosts(contents()).size(), 4u);
 }
 
 IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
@@ -1144,7 +1155,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
   ShieldsDown();
 
   NavigateToURLUntilLoadStop("a.test", "/load_js_from_origins.html");
-  EXPECT_EQ(contents()->GetAllFrames().size(), 4u);
+  EXPECT_EQ(CollectAllRenderFrameHosts(contents()).size(), 4u);
 }
 
 IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
@@ -1157,5 +1168,5 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
       ContentSettingsType::JAVASCRIPT, CONTENT_SETTING_BLOCK);
 
   NavigateToURLUntilLoadStop("b.test", "/load_js_from_origins.html");
-  EXPECT_EQ(contents()->GetAllFrames().size(), 1u);
+  EXPECT_EQ(CollectAllRenderFrameHosts(contents()).size(), 1u);
 }
diff --git a/components/crypto_dot_com/browser/crypto_dot_com_service.cc b/components/crypto_dot_com/browser/crypto_dot_com_service.cc
index 3e0d3b1ea0fe..dcfa7b9bd445 100644
--- a/components/crypto_dot_com/browser/crypto_dot_com_service.cc
+++ b/components/crypto_dot_com/browser/crypto_dot_com_service.cc
@@ -15,8 +15,8 @@
 #include "base/files/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "base/time/time.h"
 #include "base/token.h"
 #include "brave/components/crypto_dot_com/browser/crypto_dot_com_json_parser.h"
diff --git a/components/flags_strings.grdp b/components/flags_strings.grdp
index 12cb231a13d8..9860bda8f0b9 100644
--- a/components/flags_strings.grdp
+++ b/components/flags_strings.grdp
@@ -50,6 +50,26 @@
     <message name="IDS_FLAGS_UI_RELAUNCH" translateable="false" desc="Label for button that restarts chrome os.">
       Restart
     </message>
+    <message name="IDS_FLAGS_UI_OS_FLAGS_TEXT1" translateable="false" desc="Begin label text which directs a user to a second dialog in BraveOS showing OS specific flags - enclosing url link.">
+      Looking for browser flags? Visit
+    </message>
+    <message name="IDS_FLAGS_UI_OS_FLAGS_TEXT2" translateable="false" desc="End label text which directs a user to a second dialog in BraveOS showing OS specific flags - enclosing url link.">
+      .
+    </message>
+    <message name="IDS_FLAGS_UI_OS_FLAGS_LINK" translateable="false" desc="Label for button that will call a new window which allows to change BraveOS system flags.">
+      chrome://flags
+    </message>
+  </if>
+  <if expr="lacros">
+    <message name="IDS_FLAGS_UI_OS_FLAGS_TEXT1" translateable="false" desc="Begin label text which directs a user to a second dialog in BraveOS showing OS specific flags - enclosing url link.">
+      Looking for the BraveOS flags? Visit
+    </message>
+    <message name="IDS_FLAGS_UI_OS_FLAGS_TEXT2" translateable="false" desc="End label text which directs a user to a second dialog in BraveOS showing OS specific flags - enclosing url link.">
+      .
+    </message>
+    <message name="IDS_FLAGS_UI_OS_FLAGS_LINK" translateable="false" desc="Label for button that will call a new window which allows to change BraveOS system flags.">
+      os://flags
+    </message>
   </if>
   <if expr="not chromeos">
     <message name="IDS_FLAGS_UI_RELAUNCH" translateable="false" desc="Label for button that relaunches chrome.">
@@ -104,6 +124,26 @@
     <message name="IDS_DEPRECATED_FEATURES_RELAUNCH" desc="Label for button that restarts chrome os.">
       Restart
     </message>
+    <message name="IDS_DEPRECATED_FLAGS_UI_OS_FLAGS_TEXT1" desc="Begin label text which directs a user to a second dialog in BraveOS showing OS specific flags - enclosing url link.">
+      Looking for browser flags? Visit
+    </message>
+    <message name="IDS_DEPRECATED_FLAGS_UI_OS_FLAGS_TEXT2" desc="End label text which directs a user to a second dialog in BraveOS showing OS specific flags - enclosing url link.">
+      .
+    </message>
+    <message name="IDS_DEPRECATED_FLAGS_UI_OS_FLAGS_LINK" desc="Label for button that will call a new window which allows to change BraveOS system flags.">
+      chrome://flags
+    </message>
+  </if>
+  <if expr="lacros">
+    <message name="IDS_DEPRECATED_FLAGS_UI_OS_FLAGS_TEXT1" desc="Begin label text which directs a user to a second dialog in BraveOS showing OS specific flags - enclosing url link.">
+      Looking for the BraveOS flags? Visit
+    </message>
+    <message name="IDS_DEPRECATED_FLAGS_UI_OS_FLAGS_TEXT2" desc="End label text which directs a user to a second dialog in BraveOS showing OS specific flags - enclosing url link.">
+      .
+    </message>
+    <message name="IDS_DEPRECATED_FLAGS_UI_OS_FLAGS_LINK" desc="Label for button that will call a new window which allows to change BraveOS system flags.">
+      os://flags
+    </message>
   </if>
   <if expr="not chromeos">
     <message name="IDS_DEPRECATED_FEATURES_RELAUNCH" desc="Label for button that relaunches chrome.">
diff --git a/components/ftx/browser/ftx_service.cc b/components/ftx/browser/ftx_service.cc
index 519455587ee6..c96618de4c39 100644
--- a/components/ftx/browser/ftx_service.cc
+++ b/components/ftx/browser/ftx_service.cc
@@ -12,8 +12,8 @@
 #include "base/json/json_writer.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/post_task.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "brave/components/ftx/browser/ftx_json_parser.h"
 #include "brave/components/ftx/common/pref_names.h"
 #include "brave/components/ntp_widget_utils/browser/ntp_widget_utils_oauth.h"
diff --git a/components/gemini/browser/gemini_service.cc b/components/gemini/browser/gemini_service.cc
index 60b39dfd9d86..4ec50c5915fe 100644
--- a/components/gemini/browser/gemini_service.cc
+++ b/components/gemini/browser/gemini_service.cc
@@ -18,8 +18,8 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "base/time/time.h"
 #include "base/token.h"
 #include "brave/components/gemini/browser/gemini_json_parser.h"
diff --git a/components/global_media_controls_strings.grdp b/components/global_media_controls_strings.grdp
new file mode 100644
index 000000000000..143c85ff8e29
--- /dev/null
+++ b/components/global_media_controls_strings.grdp
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--This file is created by l10nUtil.js. Do not edit manually.-->
+<grit-part>
+  <message name="IDS_GLOBAL_MEDIA_CONTROLS_BACK_TO_TAB" desc="A11y text for the Global Media Controls container describing how clicking it takes you back to the tab.">
+   Back to tab
+  </message>
+  <message name="IDS_GLOBAL_MEDIA_CONTROLS_DISMISS_ICON_TOOLTIP_TEXT" desc="Tooltip for the dismiss button within the Global Media Controls dialog. The tooltip appears on mouseover of the icon.">
+   Dismiss
+  </message>
+</grit-part>
diff --git a/components/greaselion/browser/greaselion_download_service.cc b/components/greaselion/browser/greaselion_download_service.cc
index 2b158174fd7b..c06b4f260023 100644
--- a/components/greaselion/browser/greaselion_download_service.cc
+++ b/components/greaselion/browser/greaselion_download_service.cc
@@ -19,8 +19,8 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/version.h"
 #include "brave/components/brave_component_updater/browser/dat_file_util.h"
diff --git a/components/greaselion/browser/greaselion_download_service.h b/components/greaselion/browser/greaselion_download_service.h
index 08878bd34081..0887caae78a3 100644
--- a/components/greaselion/browser/greaselion_download_service.h
+++ b/components/greaselion/browser/greaselion_download_service.h
@@ -15,7 +15,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/sequence_checker.h"
-#include "base/sequenced_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/values.h"
 #include "brave/components/brave_component_updater/browser/local_data_files_observer.h"
 #include "brave/components/greaselion/browser/greaselion_service.h"
diff --git a/components/greaselion/browser/greaselion_service_impl.cc b/components/greaselion/browser/greaselion_service_impl.cc
index 1cebd9321113..d35ac9eca18d 100644
--- a/components/greaselion/browser/greaselion_service_impl.cc
+++ b/components/greaselion/browser/greaselion_service_impl.cc
@@ -20,11 +20,11 @@
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/one_shot_event.h"
-#include "base/sequenced_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
-#include "base/task_runner_util.h"
+#include "base/task/sequenced_task_runner.h"
+#include "base/task/task_runner_util.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "brave/components/brave_component_updater/browser/features.h"
diff --git a/components/history_clusters_strings.grdp b/components/history_clusters_strings.grdp
index 7e7e2df850e3..b0d719d3eecc 100644
--- a/components/history_clusters_strings.grdp
+++ b/components/history_clusters_strings.grdp
@@ -17,6 +17,12 @@
   <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.">
     List
   </message>
+  <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.">
+    Open all in new tab group
+  </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>
diff --git a/components/ipfs/brave_ipfs_client_updater.cc b/components/ipfs/brave_ipfs_client_updater.cc
index 66f2ce3e86fc..81ba3d2a2f39 100644
--- a/components/ipfs/brave_ipfs_client_updater.cc
+++ b/components/ipfs/brave_ipfs_client_updater.cc
@@ -10,9 +10,9 @@
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/task/post_task.h"
+#include "base/task/task_runner.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner.h"
-#include "base/task_runner_util.h"
 #include "brave/components/ipfs/ipfs_utils.h"
 #include "components/component_updater/component_updater_service.h"
 
diff --git a/components/ipfs/brave_ipfs_client_updater.h b/components/ipfs/brave_ipfs_client_updater.h
index be1c2bd6d4d4..e9fb54300632 100644
--- a/components/ipfs/brave_ipfs_client_updater.h
+++ b/components/ipfs/brave_ipfs_client_updater.h
@@ -13,7 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observation.h"
-#include "base/sequenced_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
 #include "brave/components/brave_component_updater/browser/brave_component.h"
 #include "components/component_updater/component_updater_service.h"
 
diff --git a/components/ipfs/import/ipfs_import_worker_base.cc b/components/ipfs/import/ipfs_import_worker_base.cc
index 4e38f9f120c9..672a49744359 100644
--- a/components/ipfs/import/ipfs_import_worker_base.cc
+++ b/components/ipfs/import/ipfs_import_worker_base.cc
@@ -15,8 +15,8 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/post_task.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "base/time/time.h"
 #include "brave/components/ipfs/ipfs_constants.h"
 #include "brave/components/ipfs/ipfs_json_parser.h"
diff --git a/components/ipfs/import/ipfs_link_import_worker.cc b/components/ipfs/import/ipfs_link_import_worker.cc
index 94fc73b3f8d2..c7f8fc92cc19 100644
--- a/components/ipfs/import/ipfs_link_import_worker.cc
+++ b/components/ipfs/import/ipfs_link_import_worker.cc
@@ -8,8 +8,8 @@
 #include <utility>
 
 #include "base/task/post_task.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "brave/components/ipfs/ipfs_network_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/mime_util.h"
@@ -65,11 +65,9 @@ void IpfsLinkImportWorker::DownloadLinkContent(const GURL& url) {
 void IpfsLinkImportWorker::OnImportDataAvailable(base::FilePath path) {
   int error_code = url_loader_->NetError();
   int response_code = -1;
-  int64_t content_length = -1;
   std::string mime_type = kLinkMimeType;
   if (url_loader_->ResponseInfo() && url_loader_->ResponseInfo()->headers) {
     response_code = url_loader_->ResponseInfo()->headers->response_code();
-    content_length = url_loader_->ResponseInfo()->headers->GetContentLength();
     url_loader_->ResponseInfo()->headers->GetMimeType(&mime_type);
   }
   bool success =
diff --git a/components/ipfs/ipfs_cookie_store_unittest.cc b/components/ipfs/ipfs_cookie_store_unittest.cc
index ccc6c37a0494..ce07a2ef5ec3 100644
--- a/components/ipfs/ipfs_cookie_store_unittest.cc
+++ b/components/ipfs/ipfs_cookie_store_unittest.cc
@@ -6,7 +6,7 @@
 #include "net/cookies/cookie_monster_store_test.h"  // For CookieStore mock
 #include "net/cookies/cookie_store.h"
 #include "net/cookies/cookie_store_unittest.h"
-#include "net/log/test_net_log.h"
+#include "net/log/net_log.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ -43,13 +43,12 @@ class IPFSCookieStoreTest : public CookieStoreTest<IPFSCookieStoreTestTraits> {
   GURL GetIPNSURL(const std::string& cid) {
     return GURL("http://" + cid + ".ipns.localhost:48080");
   }
-
-  RecordingTestNetLog net_log_;
 };
 
 TEST_F(IPFSCookieStoreTest, SetCookie) {
   scoped_refptr<MockPersistentCookieStore> store(new MockPersistentCookieStore);
-  std::unique_ptr<CookieMonster> cm(new CookieMonster(store.get(), &net_log_));
+  std::unique_ptr<CookieMonster> cm(
+      new CookieMonster(store.get(), net::NetLog::Get()));
 
   // Verify
   // 1. {CID}.ipfs.localhost can set cookies for itself
diff --git a/components/ipfs/ipfs_navigation_throttle.cc b/components/ipfs/ipfs_navigation_throttle.cc
index c892667984f3..4e86e44ebb54 100644
--- a/components/ipfs/ipfs_navigation_throttle.cc
+++ b/components/ipfs/ipfs_navigation_throttle.cc
@@ -35,7 +35,7 @@ const int kMinimalPeersRetryIntervalMs = 50;
 const int kPeersRetryRate = 3;
 
 base::TimeDelta CalculatePeersRetryTime() {
-  return base::TimeDelta::FromMilliseconds(
+  return base::Milliseconds(
       base::RandInt(kMinimalPeersRetryIntervalMs,
                     kPeersRetryRate * kMinimalPeersRetryIntervalMs));
 }
diff --git a/components/ipfs/ipfs_onboarding_page.cc b/components/ipfs/ipfs_onboarding_page.cc
index 49752145bba6..99893e8c9f53 100644
--- a/components/ipfs/ipfs_onboarding_page.cc
+++ b/components/ipfs/ipfs_onboarding_page.cc
@@ -117,7 +117,7 @@ void IPFSOnboardingPage::OnGetConnectedPeers(
           FROM_HERE,
           base::BindOnce(&IPFSOnboardingPage::GetConnectedPeers,
                          weak_ptr_factory_.GetWeakPtr()),
-          base::TimeDelta::FromSeconds(kConnectedPeersRetryStepSec));
+          base::Seconds(kConnectedPeersRetryStepSec));
     } else {
       RespondToPage(NO_PEERS_LIMIT, l10n_util::GetStringUTF16(
                                         IDS_IPFS_ONBOARDING_PEERS_LIMIT_ERROR));
diff --git a/components/ipfs/ipfs_p3a.cc b/components/ipfs/ipfs_p3a.cc
index 07c1e3ea8aa2..89ee82f557b2 100644
--- a/components/ipfs/ipfs_p3a.cc
+++ b/components/ipfs/ipfs_p3a.cc
@@ -29,13 +29,13 @@ int GetIPFSDetectionPromptBucket(PrefService* prefs) {
 }
 
 int GetDaemonUsageBucket(base::TimeDelta elapsed_time) {
-  if (elapsed_time <= base::TimeDelta::FromMinutes(5)) {
+  if (elapsed_time <= base::Minutes(5)) {
     return 0;
   }
-  if (elapsed_time <= base::TimeDelta::FromHours(1)) {
+  if (elapsed_time <= base::Hours(1)) {
     return 1;
   }
-  if (elapsed_time <= base::TimeDelta::FromHours(24)) {
+  if (elapsed_time <= base::Hours(24)) {
     return 2;
   }
   return 3;
@@ -91,7 +91,7 @@ void IpfsP3A::OnIpfsLaunched(bool result, int64_t pid) {
 
   daemon_start_time_ = base::TimeTicks::Now();
   timer_.Start(
-      FROM_HERE, base::TimeDelta::FromMinutes(kP3ATimerInterval),
+      FROM_HERE, base::Minutes(kP3ATimerInterval),
       base::BindRepeating(&IpfsP3A::RecordDaemonUsage, base::Unretained(this)));
 }
 
diff --git a/components/ipfs/ipfs_p3a_unittest.cc b/components/ipfs/ipfs_p3a_unittest.cc
index 6f85c89a988f..5ea63cc1906f 100644
--- a/components/ipfs/ipfs_p3a_unittest.cc
+++ b/components/ipfs/ipfs_p3a_unittest.cc
@@ -44,14 +44,14 @@ TEST_F(IPFSP3ATest, TestGetIPFSDetectionPromptBucket) {
 }
 
 TEST_F(IPFSP3ATest, TestGetDaemonUsageBucket) {
-  ASSERT_EQ(GetDaemonUsageBucket(base::TimeDelta::FromMinutes(0)), 0);
-  ASSERT_EQ(GetDaemonUsageBucket(base::TimeDelta::FromMinutes(5)), 0);
-  ASSERT_EQ(GetDaemonUsageBucket(base::TimeDelta::FromMinutes(6)), 1);
-  ASSERT_EQ(GetDaemonUsageBucket(base::TimeDelta::FromMinutes(60)), 1);
-  ASSERT_EQ(GetDaemonUsageBucket(base::TimeDelta::FromMinutes(61)), 2);
-  ASSERT_EQ(GetDaemonUsageBucket(base::TimeDelta::FromHours(24)), 2);
-  ASSERT_EQ(GetDaemonUsageBucket(base::TimeDelta::FromHours(25)), 3);
-  ASSERT_EQ(GetDaemonUsageBucket(base::TimeDelta::FromDays(1337)), 3);
+  ASSERT_EQ(GetDaemonUsageBucket(base::Minutes(0)), 0);
+  ASSERT_EQ(GetDaemonUsageBucket(base::Minutes(5)), 0);
+  ASSERT_EQ(GetDaemonUsageBucket(base::Minutes(6)), 1);
+  ASSERT_EQ(GetDaemonUsageBucket(base::Minutes(60)), 1);
+  ASSERT_EQ(GetDaemonUsageBucket(base::Minutes(61)), 2);
+  ASSERT_EQ(GetDaemonUsageBucket(base::Hours(24)), 2);
+  ASSERT_EQ(GetDaemonUsageBucket(base::Hours(25)), 3);
+  ASSERT_EQ(GetDaemonUsageBucket(base::Days(1337)), 3);
 }
 
 }  // namespace ipfs
diff --git a/components/ipfs/ipfs_service.cc b/components/ipfs/ipfs_service.cc
index ef5de4a41d5a..24f1389b8845 100644
--- a/components/ipfs/ipfs_service.cc
+++ b/components/ipfs/ipfs_service.cc
@@ -17,8 +17,8 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/post_task.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "brave/components/ipfs/blob_context_getter_factory.h"
 #include "brave/components/ipfs/buildflags/buildflags.h"
 #include "brave/components/ipfs/ipfs_constants.h"
@@ -288,8 +288,7 @@ bool IpfsService::WaitUntilExecutionFinished(base::Process process) {
   bool exited = false;
   int exit_code = 0;
   base::ScopedAllowBaseSyncPrimitives allow_wait_for_process;
-  exited = process.WaitForExitWithTimeout(base::TimeDelta::FromSeconds(10),
-                                          &exit_code);
+  exited = process.WaitForExitWithTimeout(base::Seconds(10), &exit_code);
   if (!exited)
     process.Terminate(0, true);
   return exited && !exit_code;
@@ -508,7 +507,7 @@ void IpfsService::GetConnectedPeers(GetConnectedPeersCallback callback,
 base::TimeDelta IpfsService::CalculatePeersRetryTime() {
   if (zero_peer_time_for_test_)
     return base::TimeDelta();
-  return base::TimeDelta::FromMilliseconds(
+  return base::Milliseconds(
       base::RandInt(kMinimalPeersRetryIntervalMs,
                     kPeersRetryRate * kMinimalPeersRetryIntervalMs));
 }
diff --git a/components/ipfs/ipfs_utils.cc b/components/ipfs/ipfs_utils.cc
index 5f1faa4aedda..4845d8516f72 100644
--- a/components/ipfs/ipfs_utils.cc
+++ b/components/ipfs/ipfs_utils.cc
@@ -23,6 +23,7 @@
 #include "net/base/url_util.h"
 #include "third_party/re2/src/re2/re2.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace {
 
@@ -137,11 +138,12 @@ bool IsDefaultGatewayURL(const GURL& url, PrefService* prefs) {
 bool IsAPIGateway(const GURL& url, version_info::Channel channel) {
   if (!url.is_valid())
     return false;
-  auto api_origin = ipfs::GetAPIServer(channel).GetOrigin();
-  if (api_origin == url)
+  auto api_origin_url =
+      url::Origin::Create(ipfs::GetAPIServer(channel)).GetURL();
+  if (api_origin_url == url)
     return true;
-  if (net::IsLocalhost(api_origin) && net::IsLocalhost(url)) {
-    return api_origin.port() == url.port();
+  if (net::IsLocalhost(api_origin_url) && net::IsLocalhost(url)) {
+    return api_origin_url.port() == url.port();
   }
   return false;
 }
diff --git a/components/ipfs/keys/ipns_keys_manager.cc b/components/ipfs/keys/ipns_keys_manager.cc
index e3f5effce145..37d74304f705 100644
--- a/components/ipfs/keys/ipns_keys_manager.cc
+++ b/components/ipfs/keys/ipns_keys_manager.cc
@@ -44,7 +44,7 @@ const int kMinimalRequestRetryIntervalMs = 350;
 const int kRequestsRetryRate = 3;
 
 base::TimeDelta CalculateKeysRetryTime() {
-  return base::TimeDelta::FromMilliseconds(
+  return base::Milliseconds(
       base::RandInt(kMinimalRequestRetryIntervalMs,
                     kRequestsRetryRate * kMinimalRequestRetryIntervalMs));
 }
diff --git a/components/ipfs/service_sandbox_type.h b/components/ipfs/service_sandbox_type.h
index 6d097035d9f4..d1da24bb6a42 100644
--- a/components/ipfs/service_sandbox_type.h
+++ b/components/ipfs/service_sandbox_type.h
@@ -16,9 +16,9 @@ class IpfsService;
 }  // namespace ipfs
 
 template <>
-inline sandbox::policy::SandboxType
+inline sandbox::mojom::Sandbox
 content::GetServiceSandboxType<ipfs::mojom::IpfsService>() {
-  return sandbox::policy::SandboxType::kNoSandbox;
+  return sandbox::mojom::Sandbox::kNoSandbox;
 }
 
 #endif  // BRAVE_COMPONENTS_IPFS_SERVICE_SANDBOX_TYPE_H_
diff --git a/components/ntp_background_images/browser/ntp_background_images_service.cc b/components/ntp_background_images/browser/ntp_background_images_service.cc
index b836195ea48c..ae0d9ba4bc44 100644
--- a/components/ntp_background_images/browser/ntp_background_images_service.cc
+++ b/components/ntp_background_images/browser/ntp_background_images_service.cc
@@ -148,7 +148,7 @@ void NTPBackgroundImagesService::CheckNTPSIComponentUpdateIfNeeded() {
 
   // If previous update check is missed, do update check now.
   if (base::Time::Now() - last_update_check_time_ >
-      base::TimeDelta::FromMinutes(kSIComponentUpdateCheckIntervalMins)) {
+      base::Minutes(kSIComponentUpdateCheckIntervalMins)) {
     si_update_check_callback_.Run();
   }
 }
@@ -196,8 +196,7 @@ void NTPBackgroundImagesService::RegisterSponsoredImagesComponent() {
 
   last_update_check_time_ = base::Time::Now();
   si_update_check_timer_.Start(
-      FROM_HERE,
-      base::TimeDelta::FromMinutes(kSIComponentUpdateCheckIntervalMins),
+      FROM_HERE, base::Minutes(kSIComponentUpdateCheckIntervalMins),
       si_update_check_callback_);
 }
 
diff --git a/components/omnibox_strings.grdp b/components/omnibox_strings.grdp
index a36bacd2cce7..57fe559b00c2 100644
--- a/components/omnibox_strings.grdp
+++ b/components/omnibox_strings.grdp
@@ -1,6 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--This file is created by l10nUtil.js. Do not edit manually.-->
 <grit-part>
+  <!-- Note, referenced part .grdp files must be in the same directory as the
+       referencing .grdp file or translation console pipeline breaks. -->
+  <part file="omnibox_pedal_ui_strings.grdp" />
 
   <message name="IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION" desc="Description for the default search match.">
     <ph name="ENGINE">$1<ex>Brave</ex></ph> Search
@@ -133,465 +136,6 @@
     Resume your research button, press Enter to resume your research and see relevant activity in your Brave history
   </message>
 
-
-  <!-- Omnibox Pedals -->
-  <message name="IDS_OMNIBOX_PEDAL_CLEAR_BROWSING_DATA_HINT" desc="The button text contents to suggest pedal action, clear browsing data.">
-    Clear browsing data
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CLEAR_BROWSING_DATA_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, clear browsing data.">
-    Clear your browsing history, cookies, cache, and more in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CLEAR_BROWSING_DATA_SUFFIX" desc="Suffix for spoken suggestion description with clear data pedal action to explain keystroke used to clear browsing data.">
-    <ph name="CLEAR_BROWSING_DATA_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to Clear your browsing history, cookies, cache, and more in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CLEAR_BROWSING_DATA" desc="Announcement when clear browsing data pedal button is focused.">
-    Clear browsing data button, press Enter to clear your browsing history, cookies, cache, and more in Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_PASSWORDS_HINT" desc="The button text contents to suggest pedal action, manage passwords.">
-    Manage passwords
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_PASSWORDS_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, change language.">
-    View and manage your passwords in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_PASSWORDS_SUFFIX" desc="Suffix for spoken suggestion description with manage passwords pedal action to explain keystroke used to manage passwords.">
-    <ph name="MANAGE_PASSWORDS_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to view and manage your passwords in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_PASSWORDS" desc="Announcement when manage passwords pedal button is focused.">
-    Manage passwords button, press Enter to view and manage your passwords in Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_HINT" desc="The button text contents to suggest pedal action, update credit card.">
-    Manage payment methods
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, update credit card.">
-    Manage your payments and credit card info in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_SUFFIX" desc="Suffix for spoken suggestion description with update credit card pedal action to explain keystroke used to update credit card.">
-    <ph name="UPDATE_CREDIT_CARD_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to manage your payments and credit card info in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD" desc="Announcement when update credit card pedal button is focused.">
-    Manage payment methods button, press Enter to manage your payments and credit card info in Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_HINT" desc="The button text contents to suggest pedal action, launch Private.">
-    Open Private window
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, launch Private.">
-    Open a new Private window to browse privately
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_SUFFIX" desc="Suffix for spoken suggestion description with launch Private pedal action to explain keystroke used to launch Private.">
-    <ph name="LAUNCH_INCOGNITO_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to open a new Private window to browse privately
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_LAUNCH_INCOGNITO" desc="Announcement when launch Private pedal button is focused.">
-    Open Private Window button, press Enter to open a new Private window to browse privately
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_TRANSLATE_HINT" desc="The button text contents to suggest pedal action, translate.">
-    Translate page
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_TRANSLATE_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, translate.">
-    Translate this page with Brave Translate
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_TRANSLATE_SUFFIX" desc="Suffix for spoken suggestion description with translate pedal action to explain keystroke used to translate this page.">
-    <ph name="TRANSLATE_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to translate this page with Brave Translate
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_TRANSLATE" desc="Announcement when translate pedal button is focused.">
-    Translate page button, press Enter to translate this page with Brave Translate
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_UPDATE_CHROME_HINT" desc="The button text contents to suggest pedal action, update chrome.">
-    Update Brave
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_UPDATE_CHROME_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, update chrome.">
-    Update Brave from your Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_UPDATE_CHROME_SUFFIX" desc="Suffix for spoken suggestion description with update chrome pedal action to explain keystroke used to update Brave.">
-    <ph name="UPDATE_CHROME_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to update Brave from your Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_UPDATE_CHROME" desc="Announcement when update chrome pedal button is focused.">
-    Update Brave button, press Enter to update Brave from your Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_HINT" desc="The button text contents to suggest pedal action, run Brave Safety Check.">
-    Run Brave Safety Check
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, run Brave Safety Check.">
-    Run a Safety Check in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_SUFFIX" desc="Suffix for spoken suggestion description with run Brave Safety Check pedal action to explain keystroke used to run Brave Safety Check.">
-    <ph name="RUN_CHROME_SAFETY_CHECK_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to run Safety Check in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK" desc="Announcement when the Run Brave Safety Check pedal button is focused.">
-    Run Brave Safety Check button, press Enter to run Safety Check in Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_SECURITY_SETTINGS_HINT" desc="The button text contents to suggest pedal action, Manage security settings.">
-    Manage security settings
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_SECURITY_SETTINGS_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, Manage security settings.">
-    Manage your Safe Browsing and more in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_SECURITY_SETTINGS_SUFFIX" desc="Suffix for spoken suggestion description with Manage security settings pedal action to explain keystroke used to Manage security settings.">
-    <ph name="MANAGE_SECURITY_SETTINGS_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to Manage your Safe Browsing and more in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_SECURITY_SETTINGS" desc="Announcement when the Manage security settings pedal button is focused.">
-    Manage security settings button, press Enter to Manage your Safe Browsing and more in Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_COOKIES_HINT" desc="The button text contents to suggest pedal action, Manage cookies.">
-    Manage cookies
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_COOKIES_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, Manage cookies.">
-    Manage your cookie preferences in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_COOKIES_SUFFIX" desc="Suffix for spoken suggestion description with Manage cookies pedal action to explain keystroke used to Manage cookies.">
-    <ph name="MANAGE_COOKIES_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to manage your cookie preferences in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_COOKIES" desc="Announcement when the Manage cookies pedal button is focused.">
-    Manage cookies button, press Enter to manage your cookie preferences in Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_ADDRESSES_HINT" desc="The button text contents to suggest pedal action, Manage addresses.">
-    Manage addresses
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_ADDRESSES_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, Manage addresses.">
-    Add and manage addresses in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_ADDRESSES_SUFFIX" desc="Suffix for spoken suggestion description with Manage addresses pedal action to explain keystroke used to Manage addresses.">
-    <ph name="MANAGE_ADDRESSES_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to add and manage addresses in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_ADDRESSES" desc="Announcement when the Manage addresses pedal button is focused.">
-    Manage addresses button, press Enter to add and manage addresses in Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_SYNC_HINT" desc="The button text contents to suggest pedal action, Manage sync.">
-    Manage sync
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_SYNC_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, Manage sync.">
-    Manage what info you sync in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_SYNC_SUFFIX" desc="Suffix for spoken suggestion description with Manage sync pedal action to explain keystroke used to Manage sync.">
-    <ph name="MANAGE_SYNC_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to manage what info you sync in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_SYNC" desc="Announcement when the Manage sync pedal button is focused.">
-    Manage sync button, press Enter to manage what info you sync in Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_SITE_SETTINGS_HINT" desc="The button text contents to suggest pedal action, Manage site settings.">
-    Manage site settings
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_SITE_SETTINGS_SUGGESTION_CONTENTS" desc="The suggestion content text to suggest pedal action, Manage site settings.">
-    Manage permissions and data stored across sites in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_SITE_SETTINGS_SUFFIX" desc="Suffix for spoken suggestion description with Manage site settings pedal action to explain keystroke used to Manage site settings.">
-    <ph name="MANAGE_SITE_SETTINGS_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to manage permissions and data stored across sites in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_SITE_SETTINGS" desc="Announcement when the Manage site settings pedal button is focused.">
-    Manage site settings button, press Enter to manage permissions and data stored across sites in Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC_HINT" desc="The button text contents to suggest pedal action, CREATE_GOOGLE_DOC">
-    Create doc
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CREATE_GOOGLE_DOC">
-    Create a new Brave Doc quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to create Brave doc.">
-    <ph name="CREATE_GOOGLE_DOC_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to create a new Brave Doc quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC" desc="Announcement when pedal action button is focused, CREATE_GOOGLE_DOC">
-    Create doc button, press Enter to create a new Brave Doc quickly
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_HINT" desc="The button text contents to suggest pedal action, CREATE_GOOGLE_SHEET">
-    Create sheet
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CREATE_GOOGLE_SHEET">
-    Create a new Brave Sheet quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to create Brave sheet.">
-    <ph name="CREATE_GOOGLE_SHEET_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to create a new Brave Sheet quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET" desc="Announcement when pedal action button is focused, CREATE_GOOGLE_SHEET">
-    Create sheet button, press Enter to create a new Brave Sheet quickly
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_HINT" desc="The button text contents to suggest pedal action, CREATE_GOOGLE_SLIDE">
-    Create presentation
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CREATE_GOOGLE_SLIDE">
-    Create a new Brave presentation in Slides quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to create presentation.">
-    <ph name="CREATE_GOOGLE_SLIDE_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to create a new Brave presentation in Slides quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE" desc="Announcement when pedal action button is focused, CREATE_GOOGLE_SLIDE">
-    Create presentation button, press Enter to create a new Brave presentation in Slides quickly
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_HINT" desc="The button text contents to suggest pedal action, CREATE_GOOGLE_CALENDAR_EVENT">
-    Create event
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CREATE_GOOGLE_CALENDAR_EVENT">
-    Create a new event in Brave Calendar quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to create calendar event.">
-    <ph name="CREATE_GOOGLE_CALENDAR_EVENT_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to create a new event in Brave Calendar quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT" desc="Announcement when pedal action button is focused, CREATE_GOOGLE_CALENDAR_EVENT">
-    Create event button, press Enter to create a new event in Brave Calendar quickly
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_HINT" desc="The button text contents to suggest pedal action, CREATE_GOOGLE_SITE">
-    Create site
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CREATE_GOOGLE_SITE">
-    Create a new site in Brave Sites quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to create site.">
-    <ph name="CREATE_GOOGLE_SITE_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to create a new site in Brave Sites quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE" desc="Announcement when pedal action button is focused, CREATE_GOOGLE_SITE">
-    Create site button, press Enter to create a new site in Brave Sites quickly
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_HINT" desc="The button text contents to suggest pedal action, CREATE_GOOGLE_KEEP_NOTE">
-    Create note
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CREATE_GOOGLE_KEEP_NOTE">
-    Create a new note in Brave Keep quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to create note.">
-    <ph name="CREATE_GOOGLE_KEEP_NOTE_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to create a new note in Brave Keep quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE" desc="Announcement when pedal action button is focused, CREATE_GOOGLE_KEEP_NOTE">
-    Create note button, press Enter to create a new note in Brave Keep quickly
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_HINT" desc="The button text contents to suggest pedal action, CREATE_GOOGLE_FORM">
-    Create form
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CREATE_GOOGLE_FORM">
-    Create a new form in Brave Forms quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to create form.">
-    <ph name="CREATE_GOOGLE_FORM_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to create a new form in Brave Forms quickly
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM" desc="Announcement when pedal action button is focused, CREATE_GOOGLE_FORM">
-    Create form button, press Enter to create a new form in Brave Forms quickly
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_SEE_CHROME_TIPS_HINT" desc="The button text contents to suggest pedal action, SEE_CHROME_TIPS">
-    See Brave tips
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_SEE_CHROME_TIPS_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, SEE_CHROME_TIPS">
-    Learn about Brave features
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_SEE_CHROME_TIPS_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to see Brave tips.">
-    <ph name="SEE_CHROME_TIPS_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to learn about Brave features
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_SEE_CHROME_TIPS" desc="Announcement when pedal action button is focused, SEE_CHROME_TIPS">
-    See Brave tips button, press Enter to learn about Brave features
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_HINT" desc="The button text contents to suggest pedal action, MANAGE_GOOGLE_ACCOUNT">
-    Manage Brave sync chain
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, MANAGE_GOOGLE_ACCOUNT">
-    Manage your info, privacy, and security in your Brave sync chain
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to manage Brave sync chain.">
-    <ph name="MANAGE_GOOGLE_ACCOUNT_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to manage your info, privacy, and security in your Brave sync chain
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT" desc="Announcement when pedal action button is focused, MANAGE_GOOGLE_ACCOUNT">
-    Manage Brave sync chain, press Enter to manage your info, privacy, and security in your Brave sync chain
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_HINT" desc="The button text contents to suggest pedal action, CHANGE_GOOGLE_PASSWORD">
-    Change Brave password
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CHANGE_GOOGLE_PASSWORD">
-    Change your Brave sync chain password
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to change Brave password.">
-    <ph name="CHANGE_GOOGLE_PASSWORD_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to change your Brave sync chain password
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD" desc="Announcement when pedal action button is focused, CHANGE_GOOGLE_PASSWORD">
-    Change Brave password button, press Enter to change your Brave sync chain password
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CLOSE_INCOGNITO_WINDOWS_HINT" desc="The button text contents to suggest pedal action, CLOSE_INCOGNITO_WINDOWS">
-    Close all Private windows
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CLOSE_INCOGNITO_WINDOWS_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CLOSE_INCOGNITO_WINDOWS">
-    Close all Private windows that are currently open.
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CLOSE_INCOGNITO_WINDOWS_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to CLOSE_INCOGNITO_WINDOWS.">
-    <ph name="CLOSE_INCOGNITO_WINDOWS_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press tab then Enter to close all Private windows that are currently open.
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CLOSE_INCOGNITO_WINDOWS" desc="Announcement when pedal action button is focused, CLOSE_INCOGNITO_WINDOWS">
-    Close Private windows button, press Enter to close all Private windows that are currently open.
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_PLAY_CHROME_DINO_GAME_HINT" desc="The button text contents to suggest pedal action, PLAY_CHROME_DINO_GAME">
-    Play Brave Dino game
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_PLAY_CHROME_DINO_GAME_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, PLAY_CHROME_DINO_GAME">
-    Play the Dino Run game in Brave
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_PLAY_CHROME_DINO_GAME_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to PLAY_CHROME_DINO_GAME.">
-    <ph name="PLAY_CHROME_DINO_GAME_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press tab then Enter to play the Dino Run game in Brave
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_PLAY_CHROME_DINO_GAME" desc="Announcement when pedal action button is focused, PLAY_CHROME_DINO_GAME">
-    Play Brave Dino game button, press Enter to play the Dino Run game in Brave
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_FIND_MY_PHONE_HINT" desc="The button text contents to suggest pedal action, FIND_MY_PHONE">
-    Find your phone
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_FIND_MY_PHONE_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, FIND_MY_PHONE">
-    Find, secure, or erase your device
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_FIND_MY_PHONE_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to FIND_MY_PHONE.">
-    <ph name="FIND_MY_PHONE_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press Tab then Enter to Find your device in the Brave sync chain
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_FIND_MY_PHONE" desc="Announcement when pedal action button is focused, FIND_MY_PHONE">
-    Find my device button, press Enter to visit find your device in the Brave sync chain
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY_HINT" desc="The button text contents to suggest pedal action, MANAGE_GOOGLE_PRIVACY">
-    Manage Brave sync chain privacy settings
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, MANAGE_GOOGLE_PRIVACY">
-    Manage Brave privacy settings in your Brave sync chain
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to MANAGE_GOOGLE_PRIVACY.">
-    <ph name="MANAGE_GOOGLE_PRIVACY_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press Tab then Enter to manage your Brave sync chain privacy settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY" desc="Announcement when pedal action button is focused, MANAGE_GOOGLE_PRIVACY">
-    Manage Brave Privacy settings button, press Enter to visit your Brave sync chain privacy settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_CHROME_SETTINGS_HINT" desc="The button text contents to suggest pedal action, MANAGE_CHROME_SETTINGS">
-    Manage settings
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_CHROME_SETTINGS_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, MANAGE_CHROME_SETTINGS">
-    Manage your Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_SETTINGS_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to MANAGE_CHROME_SETTINGS.">
-    <ph name="MANAGE_CHROME_SETTINGS_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press Tab then Enter to manage your Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_SETTINGS" desc="Announcement when pedal action button is focused, MANAGE_CHROME_SETTINGS">
-    Manage Brave settings button, press Enter to visit your Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_CHROME_DOWNLOADS_HINT" desc="The button text contents to suggest pedal action, MANAGE_CHROME_DOWNLOADS">
-    Manage downloads
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_CHROME_DOWNLOADS_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, MANAGE_CHROME_DOWNLOADS">
-    Manage files you have downloaded in Brave
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_DOWNLOADS_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to MANAGE_CHROME_DOWNLOADS.">
-    <ph name="MANAGE_CHROME_DOWNLOADS_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press Tab then Enter to manage files you have downloaded in Brave
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_DOWNLOADS" desc="Announcement when pedal action button is focused, MANAGE_CHROME_DOWNLOADS">
-    Manage downloads in Brave button, press Enter to manage files you have downloaded in Brave.
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_VIEW_CHROME_HISTORY_HINT" desc="The button text contents to suggest pedal action, VIEW_CHROME_HISTORY">
-    View your Brave history
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_VIEW_CHROME_HISTORY_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, VIEW_CHROME_HISTORY">
-    View and manage your browsing history in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_VIEW_CHROME_HISTORY_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to VIEW_CHROME_HISTORY.">
-    <ph name="VIEW_CHROME_HISTORY_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press tab then Enter to view your browsing history in Brave
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_VIEW_CHROME_HISTORY" desc="Announcement when pedal action button is focused, VIEW_CHROME_HISTORY">
-    View your Brave history button, press Enter to view and manage your browsing history in Brave settings
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_SHARE_THIS_PAGE_HINT" desc="The button text contents to suggest pedal action, SHARE_THIS_PAGE">
-    Share this tab
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_SHARE_THIS_PAGE_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, SHARE_THIS_PAGE">
-    Share this tab by sharing the link, creating a QR code, casting, and more.
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_SHARE_THIS_PAGE_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to SHARE_THIS_PAGE.">
-    <ph name="SHARE_THIS_PAGE_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press tab then Enter to share this tab by sharing the link, creating a QR code, casting, and more.
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_SHARE_THIS_PAGE" desc="Announcement when pedal action button is focused, SHARE_THIS_PAGE">
-    Share this tab button, press Enter to share this tab by sharing the link, creating a QR code, casting, and more.
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_CHROME_ACCESSIBILITY_HINT" desc="The button text contents to suggest pedal action, MANAGE_CHROME_ACCESSIBILITY">
-    Manage accessibility settings
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_CHROME_ACCESSIBILITY_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, MANAGE_CHROME_ACCESSIBILITY">
-    Personalize your accessibility tools in Brave settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_ACCESSIBILITY_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to MANAGE_CHROME_ACCESSIBILITY.">
-    <ph name="MANAGE_CHROME_ACCESSIBILITY_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press tab then Enter to personalize your accessibility tools in Brave settings.
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_ACCESSIBILITY" desc="Announcement when pedal action button is focused, MANAGE_CHROME_ACCESSIBILITY">
-    Manage accessibility settings button, press Enter to personalize your accessibility tools in Brave settings.
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CUSTOMIZE_CHROME_FONTS_HINT" desc="The button text contents to suggest pedal action, CUSTOMIZE_CHROME_FONTS">
-    Customize fonts
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CUSTOMIZE_CHROME_FONTS_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CUSTOMIZE_CHROME_FONTS">
-    Customize font sizes and typefaces in Brave
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CUSTOMIZE_CHROME_FONTS_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to CUSTOMIZE_CHROME_FONTS.">
-    <ph name="CUSTOMIZE_CHROME_FONTS_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press tab then Enter to customize font sizes and typefaces in Brave
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CUSTOMIZE_CHROME_FONTS" desc="Announcement when pedal action button is focused, CUSTOMIZE_CHROME_FONTS">
-    Customize fonts in Brave button, press Enter to customize font sizes and typefaces in Brave
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_CHROME_THEMES_HINT" desc="The button text contents to suggest pedal action, MANAGE_CHROME_THEMES">
-    Customize Brave
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_CHROME_THEMES_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, MANAGE_CHROME_THEMES">
-    Customize the look of your browser
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_THEMES_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to MANAGE_CHROME_THEMES.">
-    <ph name="MANAGE_CHROME_THEMES_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press tab then Enter to customize the look of your browser.
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_THEMES" desc="Announcement when pedal action button is focused, MANAGE_CHROME_THEMES">
-    Customize Brave button, press Enter to customize the look of your browser.
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_CUSTOMIZE_SEARCH_ENGINES_HINT" desc="The button text contents to suggest pedal action, CUSTOMIZE_SEARCH_ENGINES">
-    Manage search engines
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_CUSTOMIZE_SEARCH_ENGINES_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, CUSTOMIZE_SEARCH_ENGINES">
-    Manage your default search engine and site search
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CUSTOMIZE_SEARCH_ENGINES_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to CUSTOMIZE_SEARCH_ENGINES.">
-    <ph name="CUSTOMIZE_SEARCH_ENGINES_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press tab then Enter to manage site search and your default search engine
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_CUSTOMIZE_SEARCH_ENGINES" desc="Announcement when pedal action button is focused, CUSTOMIZE_SEARCH_ENGINES">
-    Manage search engines button, press Enter to manage your default search engine and site search
-  </message>
-
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_CHROMEOS_ACCESSIBILITY_HINT" desc="The button text contents to suggest pedal action, MANAGE_CHROMEOS_ACCESSIBILITY">
-    Manage accessibility settings
-  </message>
-  <message name="IDS_OMNIBOX_PEDAL_MANAGE_CHROMEOS_ACCESSIBILITY_SUGGESTION_CONTENTS" desc="The button hover tooltip text to describe pedal action, MANAGE_CHROMEOS_ACCESSIBILITY">
-    Personalize your accessibility tools in Chrome OS settings
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROMEOS_ACCESSIBILITY_SUFFIX" desc="Suffix for spoken suggestion description with pedal action button, to explain keystroke used to MANAGE_CHROMEOS_ACCESSIBILITY.">
-    <ph name="MANAGE_CHROMEOS_ACCESSIBILITY_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Brave Projects http://www.chromium.org bookmark</ex></ph>, Press tab then Enter to personalize your accessibility tools in Chrome OS settings.
-  </message>
-  <message name="IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROMEOS_ACCESSIBILITY" desc="Announcement when pedal action button is focused, MANAGE_CHROMEOS_ACCESSIBILITY">
-    Manage accessibility settings button, Enter to personalize your accessibility tools in Chrome OS settings
-  </message>
-  <!-- End of Pedals -->
-
-
   <!-- Accessibility labels for autocomplete match types.
        These are parameterized on the text being completed into the omnibox.
   -->
diff --git a/components/p3a/brave_p3a_scheduler.cc b/components/p3a/brave_p3a_scheduler.cc
index c6cdc151ffc0..0014a770cb62 100644
--- a/components/p3a/brave_p3a_scheduler.cc
+++ b/components/p3a/brave_p3a_scheduler.cc
@@ -30,11 +30,10 @@ constexpr int64_t kInitialBackoffIntervalSeconds = 5;
 // where the server is having issues.
 base::TimeDelta BackOffUploadInterval(base::TimeDelta interval) {
   DCHECK_GT(kBackoffMultiplier, 1.0);
-  interval = base::TimeDelta::FromMicroseconds(
+  interval = base::Microseconds(
       static_cast<int64_t>(kBackoffMultiplier * interval.InMicroseconds()));
 
-  base::TimeDelta max_interval =
-      base::TimeDelta::FromHours(kMaxBackoffIntervalHours);
+  base::TimeDelta max_interval = base::Hours(kMaxBackoffIntervalHours);
   if (interval > max_interval || interval.InSeconds() < 0) {
     interval = max_interval;
   }
@@ -49,10 +48,8 @@ BraveP3AScheduler::BraveP3AScheduler(
     : metrics::MetricsScheduler(upload_callback,
                                 false /* fast_startup_for_testing */),
       get_interval_callback_(get_interval_callback),
-      initial_backoff_interval_(
-          base::TimeDelta::FromSeconds(kInitialBackoffIntervalSeconds)),
-      backoff_interval_(
-          base::TimeDelta::FromSeconds(kInitialBackoffIntervalSeconds)) {}
+      initial_backoff_interval_(base::Seconds(kInitialBackoffIntervalSeconds)),
+      backoff_interval_(base::Seconds(kInitialBackoffIntervalSeconds)) {}
 
 BraveP3AScheduler::~BraveP3AScheduler() {}
 
diff --git a/components/p3a/brave_p3a_service.cc b/components/p3a/brave_p3a_service.cc
index af7df0e52a52..703eea5e5d56 100644
--- a/components/p3a/brave_p3a_service.cc
+++ b/components/p3a/brave_p3a_service.cc
@@ -178,7 +178,7 @@ bool IsSuspendedMetric(base::StringPiece metric_name,
 
 base::TimeDelta GetRandomizedUploadInterval(
     base::TimeDelta average_upload_interval) {
-  const auto delta = base::TimeDelta::FromSecondsD(
+  const auto delta = base::Seconds(
       brave_base::random::Geometric(average_upload_interval.InSecondsF()));
   return delta;
 }
@@ -237,8 +237,7 @@ void BraveP3AService::Init(
   // Init basic prefs.
   initialized_ = true;
 
-  average_upload_interval_ =
-      base::TimeDelta::FromSeconds(kDefaultUploadIntervalSeconds);
+  average_upload_interval_ = base::Seconds(kDefaultUploadIntervalSeconds);
 
   upload_server_url_ = GURL(kP3AServerUrl);
   MaybeOverrideSettingsFromCommandLine();
@@ -326,7 +325,7 @@ void BraveP3AService::MaybeOverrideSettingsFromCommandLine() {
         cmdline->GetSwitchValueASCII(switches::kP3AUploadIntervalSeconds);
     int64_t seconds;
     if (base::StringToInt64(seconds_str, &seconds) && seconds > 0) {
-      average_upload_interval_ = base::TimeDelta::FromSeconds(seconds);
+      average_upload_interval_ = base::Seconds(seconds);
     }
   }
 
@@ -339,7 +338,7 @@ void BraveP3AService::MaybeOverrideSettingsFromCommandLine() {
         cmdline->GetSwitchValueASCII(switches::kP3ARotationIntervalSeconds);
     int64_t seconds;
     if (base::StringToInt64(seconds_str, &seconds) && seconds > 0) {
-      rotation_interval_ = base::TimeDelta::FromSeconds(seconds);
+      rotation_interval_ = base::Seconds(seconds);
     }
   }
 
diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp
index c2968b3aa9cf..a930ac4293b7 100644
--- a/components/page_info_strings.grdp
+++ b/components/page_info_strings.grdp
@@ -694,4 +694,15 @@
   <message name="IDS_PAGE_INFO_RESET_PERMISSIONS" desc="The label of the button to reset permissions for a site.">
     {NUM_PERMISSIONS, plural, =1 {Reset permission} other {Reset permissions}}
   </message>
+
+  <!-- About this site strings -->
+  <message name="IDS_PAGE_INFO_ABOUT_THIS_SITE_HEADER" desc="The header label of the 'About this site' subpage in Page Info bubble.">
+    About this site
+  </message>
+  <message name="IDS_PAGE_INFO_ABOUT_THIS_SITE_TOOLTIP" desc="The tooltip of the button that opens 'About this site' subpage in Page Info bubble.">
+    Show information about this site
+  </message>
+  <message name="IDS_PAGE_INFO_ABOUT_THIS_SITE_SUBPAGE_FROM_LABEL" desc="The label containing the source of the description in the 'About this site' subpage in Page Info bubble.">
+    From <ph name="SOURCE_NAME">$1<ex>Wikipedia</ex></ph>
+  </message>
 </grit-part>
diff --git a/components/permissions/brave_permission_manager.cc b/components/permissions/brave_permission_manager.cc
index 65fc7680c716..cc98728c8da4 100644
--- a/components/permissions/brave_permission_manager.cc
+++ b/components/permissions/brave_permission_manager.cc
@@ -9,6 +9,7 @@
 
 #include "components/permissions/permission_context_base.h"
 #include "content/public/browser/browser_thread.h"
+#include "url/origin.h"
 
 namespace permissions {
 
@@ -39,7 +40,7 @@ void BravePermissionManager::ResetPermissionViaContentSetting(
     return;
   context->ResetPermission(
       GetCanonicalOrigin(type, requesting_origin, embedding_origin),
-      embedding_origin.GetOrigin());
+      url::Origin::Create(embedding_origin).GetURL());
 }
 
 }  // namespace permissions
diff --git a/components/permissions/contexts/brave_ethereum_permission_context.cc b/components/permissions/contexts/brave_ethereum_permission_context.cc
index 40523b8b2034..de56c8fa09d7 100644
--- a/components/permissions/contexts/brave_ethereum_permission_context.cc
+++ b/components/permissions/contexts/brave_ethereum_permission_context.cc
@@ -20,6 +20,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom.h"
+#include "url/origin.h"
 
 namespace permissions {
 
@@ -62,7 +63,7 @@ void BraveEthereumPermissionContext::RequestPermission(
     bool user_gesture,
     BrowserPermissionCallback callback) {
   const std::string id_str = id.ToString();
-  GURL requesting_origin = requesting_frame.GetOrigin();
+  GURL requesting_origin = url::Origin::Create(requesting_frame).GetURL();
   std::string origin;
 
   // Parse address list from the requesting frame and save it to the map when
@@ -72,7 +73,8 @@ void BraveEthereumPermissionContext::RequestPermission(
   bool is_new_id = addr_queue_it == request_address_queues_.end();
   if (!brave_wallet::ParseRequestingOrigin(
           requesting_origin, &origin, is_new_id ? &address_queue : nullptr)) {
-    GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
+    GURL embedding_origin =
+        url::Origin::Create(web_contents->GetLastCommittedURL()).GetURL();
     NotifyPermissionSet(id, requesting_origin, embedding_origin,
                         std::move(callback), /*persist=*/false,
                         CONTENT_SETTING_BLOCK, /*is_one_time=*/false);
@@ -128,7 +130,7 @@ void BraveEthereumPermissionContext::Cancel(
   DCHECK(manager);
 
   // Dismiss all requests.
-  manager->Closing();
+  manager->Dismiss();
 }
 
 // static
@@ -143,8 +145,8 @@ void BraveEthereumPermissionContext::RequestPermissions(
 
   auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
   // Fail the request came from 3p origin.
-  if (web_contents->GetMainFrame()->GetLastCommittedURL().GetOrigin() !=
-      rfh->GetLastCommittedURL().GetOrigin()) {
+  if (web_contents->GetMainFrame()->GetLastCommittedOrigin() !=
+      rfh->GetLastCommittedOrigin()) {
     std::move(callback).Run(std::vector<ContentSetting>());
     return;
   }
@@ -166,7 +168,7 @@ void BraveEthereumPermissionContext::RequestPermissions(
   // parameter to be passes in.
   GURL origin;
   if (!brave_wallet::GetConcatOriginFromWalletAddresses(
-          rfh->GetLastCommittedURL().GetOrigin(), addresses, &origin)) {
+          rfh->GetLastCommittedOrigin().GetURL(), addresses, &origin)) {
     std::move(callback).Run(std::vector<ContentSetting>());
     return;
   }
@@ -190,8 +192,8 @@ void BraveEthereumPermissionContext::GetAllowedAccounts(
 
   auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
   // Fail the request came from 3p origin.
-  if (web_contents->GetMainFrame()->GetLastCommittedURL().GetOrigin() !=
-      rfh->GetLastCommittedURL().GetOrigin()) {
+  if (web_contents->GetMainFrame()->GetLastCommittedOrigin() !=
+      rfh->GetLastCommittedOrigin()) {
     std::move(callback).Run(false, std::vector<std::string>());
     return;
   }
@@ -211,7 +213,7 @@ void BraveEthereumPermissionContext::GetAllowedAccounts(
   }
 
   std::vector<std::string> allowed_accounts;
-  GURL origin = rfh->GetLastCommittedURL().GetOrigin();
+  GURL origin = rfh->GetLastCommittedOrigin().GetURL();
   for (const auto& address : addresses) {
     GURL sub_request_origin;
     bool success =
@@ -241,8 +243,9 @@ bool BraveEthereumPermissionContext::AddEthereumPermission(
     return true;
 
   GURL origin_wallet_address;
-  if (!brave_wallet::GetSubRequestOrigin(GURL(origin_spec).GetOrigin(), account,
-                                         &origin_wallet_address))
+  if (!brave_wallet::GetSubRequestOrigin(
+          url::Origin::Create(GURL(origin_spec)).GetURL(), account,
+          &origin_wallet_address))
     return false;
 
   PermissionsClient::Get()
@@ -270,8 +273,9 @@ bool BraveEthereumPermissionContext::HasEthereumPermission(
     return false;
 
   GURL origin_wallet_address;
-  if (!brave_wallet::GetSubRequestOrigin(GURL(origin_spec).GetOrigin(), account,
-                                         &origin_wallet_address)) {
+  if (!brave_wallet::GetSubRequestOrigin(
+          url::Origin::Create(GURL(origin_spec)).GetURL(), account,
+          &origin_wallet_address)) {
     return false;
   }
 
@@ -296,8 +300,9 @@ bool BraveEthereumPermissionContext::ResetEthereumPermission(
     return false;
 
   GURL origin_wallet_address;
-  if (!brave_wallet::GetSubRequestOrigin(GURL(origin_spec).GetOrigin(), account,
-                                         &origin_wallet_address)) {
+  if (!brave_wallet::GetSubRequestOrigin(
+          url::Origin::Create(GURL(origin_spec)).GetURL(), account,
+          &origin_wallet_address)) {
     return false;
   }
 
diff --git a/components/permissions/permission_expiration_key.cc b/components/permissions/permission_expiration_key.cc
index 7bbae1765335..335229f4af0c 100644
--- a/components/permissions/permission_expiration_key.cc
+++ b/components/permissions/permission_expiration_key.cc
@@ -20,7 +20,7 @@ base::Time ParseExpirationTime(const std::string& key_str) {
     return base::Time();
   }
   return base::Time::FromDeltaSinceWindowsEpoch(
-      base::TimeDelta::FromMicroseconds(expiration_time));
+      base::Microseconds(expiration_time));
 }
 
 std::string ExpirationTimeToStr(base::Time expiration_time) {
diff --git a/components/permissions/permission_expirations_unittest.cc b/components/permissions/permission_expirations_unittest.cc
index afc0f6eb6170..6b1c1229a844 100644
--- a/components/permissions/permission_expirations_unittest.cc
+++ b/components/permissions/permission_expirations_unittest.cc
@@ -150,8 +150,8 @@ class PermissionExpirationsTest : public testing::Test {
   const GURL kOrigin{"https://example.com"};
   const GURL kOrigin2{"https://brave1.com"};
   const GURL kOrigin3{"https://brave2.com"};
-  const base::TimeDelta kLifetime{base::TimeDelta::FromSeconds(5)};
-  const base::TimeDelta kOneSecond{base::TimeDelta::FromSeconds(1)};
+  const base::TimeDelta kLifetime{base::Seconds(5)};
+  const base::TimeDelta kOneSecond{base::Seconds(1)};
 
   const base::Time now_{base::Time::Now()};
 
@@ -160,7 +160,7 @@ class PermissionExpirationsTest : public testing::Test {
 };
 
 TEST_F(PermissionExpirationsTest, AddAndRemoveAfterExpiration) {
-  const auto expiration_delta = base::TimeDelta::FromSeconds(10);
+  const auto expiration_delta = base::Seconds(10);
   const auto expiration_time = now_ + expiration_delta;
   AddExpiringPermission(ContentSettingsType::NOTIFICATIONS, expiration_delta,
                         kOrigin);
@@ -183,7 +183,7 @@ TEST_F(PermissionExpirationsTest, AddAndRemoveAfterExpiration) {
 }
 
 TEST_F(PermissionExpirationsTest, AddWithAllAndRemoveDataAfterExpiration) {
-  const auto expiration_delta = base::TimeDelta::FromSeconds(10);
+  const auto expiration_delta = base::Seconds(10);
   const auto expiration_time = now_ + expiration_delta;
   PermissionOrigins permission_origins(kOrigin, kOrigin2,
                                        CONTENT_SETTING_BLOCK);
@@ -210,11 +210,11 @@ TEST_F(PermissionExpirationsTest, AddWithAllAndRemoveDataAfterExpiration) {
 }
 
 TEST_F(PermissionExpirationsTest, AddAndRemoveExpiring) {
-  const auto expiration_delta = base::TimeDelta::FromSeconds(10);
+  const auto expiration_delta = base::Seconds(10);
   const auto expiration_time = now_ + expiration_delta;
   AddExpiringPermission(ContentSettingsType::NOTIFICATIONS, expiration_delta,
                         kOrigin);
-  const auto expiration_delta2 = base::TimeDelta::FromSeconds(15);
+  const auto expiration_delta2 = base::Seconds(15);
   const auto expiration_time2 = now_ + expiration_delta2;
   AddExpiringPermission(ContentSettingsType::NOTIFICATIONS, expiration_delta2,
                         kOrigin2);
@@ -250,7 +250,7 @@ TEST_F(PermissionExpirationsTest, AddAndRemoveExpiring) {
 }
 
 TEST_F(PermissionExpirationsTest, RemoveExpiredDifferentTypes) {
-  const auto expiration_delta = base::TimeDelta::FromSeconds(10);
+  const auto expiration_delta = base::Seconds(10);
   const auto expiration_time = now_ + expiration_delta;
   AddExpiringPermission(ContentSettingsType::NOTIFICATIONS, expiration_delta,
                         kOrigin);
@@ -328,7 +328,7 @@ TEST_F(PermissionExpirationsTest, AddRemoveDomainExpiration) {
 }
 
 TEST_F(PermissionExpirationsTest, RemoveDomainThenTimeExpirations) {
-  const auto expiration_delta = base::TimeDelta::FromSeconds(10);
+  const auto expiration_delta = base::Seconds(10);
   const auto expiration_time = now_ + expiration_delta;
   AddExpiringPermission(ContentSettingsType::NOTIFICATIONS, expiration_delta,
                         kOrigin);
@@ -357,7 +357,7 @@ TEST_F(PermissionExpirationsTest, RemoveDomainThenTimeExpirations) {
 }
 
 TEST_F(PermissionExpirationsTest, RemoveTimeThenDomainExpirations) {
-  const auto expiration_delta = base::TimeDelta::FromSeconds(10);
+  const auto expiration_delta = base::Seconds(10);
   const auto expiration_time = now_ + expiration_delta;
   AddExpiringPermission(ContentSettingsType::NOTIFICATIONS, expiration_delta,
                         kOrigin);
@@ -385,7 +385,7 @@ TEST_F(PermissionExpirationsTest, RemoveTimeThenDomainExpirations) {
 }
 
 TEST_F(PermissionExpirationsTest, RemoveAllDomainExpirations) {
-  const auto expiration_delta = base::TimeDelta::FromSeconds(10);
+  const auto expiration_delta = base::Seconds(10);
   const auto expiration_time = now_ + expiration_delta;
   AddExpiringPermission(ContentSettingsType::NOTIFICATIONS, expiration_delta,
                         kOrigin);
diff --git a/components/permissions/permission_lifetime_utils.cc b/components/permissions/permission_lifetime_utils.cc
index af15d56741bd..1b4a3c20b576 100644
--- a/components/permissions/permission_lifetime_utils.cc
+++ b/components/permissions/permission_lifetime_utils.cc
@@ -41,7 +41,7 @@ absl::optional<PermissionLifetimeOption> GetTestSecondsOption() {
   }
   return PermissionLifetimeOption(
       base::UTF8ToUTF16(base::StringPrintf("%d seconds", *test_seconds)),
-      base::TimeDelta::FromSeconds(*test_seconds));
+      base::Seconds(*test_seconds));
 }
 
 }  // namespace
@@ -60,10 +60,10 @@ std::vector<PermissionLifetimeOption> CreatePermissionLifetimeOptions() {
   options.emplace_back(PermissionLifetimeOption(
       l10n_util::GetStringUTF16(
           IDS_PERMISSIONS_BUBBLE_24_HOURS_LIFETIME_OPTION),
-      base::TimeDelta::FromHours(24)));
+      base::Hours(24)));
   options.emplace_back(PermissionLifetimeOption(
       l10n_util::GetStringUTF16(IDS_PERMISSIONS_BUBBLE_1_WEEK_LIFETIME_OPTION),
-      base::TimeDelta::FromDays(7)));
+      base::Days(7)));
   options.emplace_back(PermissionLifetimeOption(
       l10n_util::GetStringUTF16(IDS_PERMISSIONS_BUBBLE_FOREVER_LIFETIME_OPTION),
       absl::nullopt));
diff --git a/components/permissions_strings.grdp b/components/permissions_strings.grdp
index 1a240ddbce58..734052ee4e16 100644
--- a/components/permissions_strings.grdp
+++ b/components/permissions_strings.grdp
@@ -260,6 +260,13 @@ This will otherwise be blocked by your privacy settings. This will allow the con
     <message name="IDS_IDLE_DETECTION_PERMISSION_CHIP" desc="Button text representing a request for using using idle detection from a website. When clicked, shows a permission prompt bubble with more information.">
       Know your device use?
     </message>
+
+    <message name="IDS_GEOLOCATION_PERMISSION_BLOCKED_CHIP" desc="Button text representing a blocked or expired request for the user's physical location from a website. When clicked, shows a permission prompt bubble with more information.">
+      Location blocked
+    </message>
+    <message name="IDS_NOTIFICATION_PERMISSIONS_BLOCKED_CHIP" desc="Button text representing a blocked or expired request for showing notifications from a website. When clicked, shows a permission prompt bubble with more information.">
+      Notifications blocked
+    </message>
   </if>
 
   <!-- Quota messages -->
diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp
index da587289e63e..7ae3b9d200f7 100644
--- a/components/policy_strings.grdp
+++ b/components/policy_strings.grdp
@@ -271,6 +271,8 @@ Additional details:
 Additional details:
 <ph name="DEBUG_INFO">$1<ex>ERROR: Field name 'SomeRandomField' is unknown. (at toplevel)</ex></ph>
     </message>
+  </if>
+  <if expr="chromeos or lacros">
     <message name="IDS_POLICY_SCOPE_ERROR" desc="Text displayed in the status column when a policy is set in an unsupported scope.">
       Policy scope is not supported.
     </message>
@@ -571,6 +573,9 @@ Additional details:
   <message name="IDS_POLICY_IGNORED_MANDATORY_REPORTING_POLICY" desc="Text explaining that the policy MetricsReportingEnabled can not be forced to enabled anymore">
     This policy cannot be set to "True" and be mandatory, therefore it was changed to recommended.
   </message>
+  <message name="IDS_POLICY_IGNORED_CHROME_PROFILE" desc="Text explaining that the policy cannot be set at the Brave profile level and is therefore ignored.">
+    This policy cannot be set at the Brave profile level and will be ignored.
+  </message>
   <if expr="not is_macosx">
     <message name="IDS_POLICY_SPELLCHECK_UNKNOWN_LANGUAGE" desc="Warning message in the policy summary page for the spellcheck policies when a language is unrecognized or unsupported.">
       List entry "<ph name="LANGUAGE_ID">$1<ex>xx-YY</ex></ph>": Unknown or unsupported language.
@@ -664,23 +669,53 @@ Additional details:
   <message name="IDS_POLICY_DLP_PRINTING_WARN_CANCEL_BUTTON" desc="Cancel dialog button label for warning before printing.">
     Cancel
   </message>
-  <message name="IDS_POLICY_DLP_SCREEN_CAPTURE_PAUSED_TITLE" desc="The title for notification informing the user that screen capture is paused.">
+  <message name="IDS_POLICY_DLP_SCREEN_SHARE_BLOCKED_TITLE" desc="The title for notification informing the user that screen share is blocked.">
+    Capture confidential content
+  </message>
+  <message name="IDS_POLICY_DLP_SCREEN_SHARE_BLOCKED_MESSAGE" desc="The message for notification informing the user that screen share is blocked.">
+    Administrator policy disables screen sharing with <ph name="APPLICATION_TITLE">$1<ex>example.com</ex></ph> when confidential content is visible
+  </message>
+  <message name="IDS_POLICY_DLP_SCREEN_SHARE_PAUSED_TITLE" desc="The title for notification informing the user that screen share is paused.">
     Screen capture paused
   </message>
-  <message name="IDS_POLICY_DLP_SCREEN_CAPTURE_PAUSED_MESSAGE" desc="The message for notification informing the user that screen capture is paused.">
+  <message name="IDS_POLICY_DLP_SCREEN_SHARE_PAUSED_MESSAGE" desc="The message for notification informing the user that screen share is paused.">
     Administrator policy disables screen sharing with <ph name="APPLICATION_TITLE">$1<ex>example.com</ex></ph> when confidential content is visible
   </message>
-  <message name="IDS_POLICY_DLP_SCREEN_CAPTURE_RESUMED_TITLE" desc="The title for notification informing the user that screen capture is resumed.">
+  <message name="IDS_POLICY_DLP_SCREEN_SHARE_RESUMED_TITLE" desc="The title for notification informing the user that screen share is resumed.">
     Screen capture resumed
   </message>
-  <message name="IDS_POLICY_DLP_SCREEN_CAPTURE_RESUMED_MESSAGE" desc="The message for notification informing the user that screen capture is resumed.">
+  <message name="IDS_POLICY_DLP_SCREEN_SHARE_RESUMED_MESSAGE" desc="The message for notification informing the user that screen share is resumed.">
     Screen sharing with <ph name="APPLICATION_TITLE">$1<ex>example.com</ex></ph> was resumed
   </message>
+  <message name="IDS_POLICY_DLP_SCREEN_CAPTURE_DISABLED_TITLE" desc="The title of the notification when capture mode is disabled because of confidential content.">
+    Can't capture confidential content
+  </message>
+  <message name="IDS_POLICY_DLP_SCREEN_CAPTURE_DISABLED_MESSAGE" desc="The text of the notification when capture mode is disabled because of confidential content.">
+    Administrator policy disables screen capture when confidential content is visible
+  </message>
+  <message name="IDS_POLICY_DLP_VIDEO_CAPTURE_STOPPED_TITLE" desc="The title of the notification when video capture is stopped because of confidential content.">
+    Can't record confidential content
+  </message>
+  <message name="IDS_POLICY_DLP_VIDEO_CAPTURE_STOPPED_MESSAGE" desc="The text of the notification when video capture is stopped because of confidential content.">
+    Administrator policy disables screen recording when confidential content is visible
+  </message>
+  <message name="IDS_POLICY_DLP_SCREEN_SHARE_WARN_TITLE" desc="The title for notification informing the user that screen sharing is not recommended.">
+    Capture confidential content
+  </message>
+  <message name="IDS_POLICY_DLP_SCREEN_SHARE_WARN_MESSAGE" desc="The message for notification informing the user that screen sharing is not recommended.">
+   Administrator policy doesn’t recommend sharing your screen with <ph name="APPLICATION_TITLE">$1<ex>example.com</ex></ph> when confidential content is visible:
+  </message>
+  <message name="IDS_POLICY_DLP_SCREEN_SHARE_WARN_CONTINUE_BUTTON" desc="Continue dialog button label for warning before screen sharing.">
+    Capture anyway
+  </message>
+  <message name="IDS_POLICY_DLP_SCREEN_SHARE_WARN_CANCEL_BUTTON" desc="Cancel dialog button label for warning before screen sharing.">
+    Cancel
+  </message>
   <message name="IDS_POLICY_DLP_SCREEN_CAPTURE_WARN_TITLE" desc="The title for notification informing the user that screen capture is not recommended.">
     Capture confidential content on your screen
   </message>
   <message name="IDS_POLICY_DLP_SCREEN_CAPTURE_WARN_MESSAGE" desc="The message for notification informing the user that screen capture is not recommended.">
-    Administrator doesn't recommend taking screenshots or recordings due to confidential content on screen.
+    Administrator doesn't recommend taking screenshots or recordings due to confidential content on screen:
   </message>
   <message name="IDS_POLICY_DLP_SCREEN_CAPTURE_WARN_CONTINUE_BUTTON" desc="Continue dialog button label for warning before screen capture.">
     Capture anyway
@@ -692,7 +727,7 @@ Additional details:
     Capture confidential content on your screen
   </message>
   <message name="IDS_POLICY_DLP_VIDEO_CAPTURE_WARN_MESSAGE" desc="The message for notification informing the user that there was confidential information revealed during screen recording.">
-    Administrator doesn't recommend taking screenshots or recordings due to confidential content captured.
+    Administrator doesn't recommend taking screenshots or recordings due to confidential content captured:
   </message>
   <message name="IDS_POLICY_DLP_VIDEO_CAPTURE_WARN_CONTINUE_BUTTON" desc="Continue dialog button label for warning before saving a screen recording.">
     Save anyway
@@ -700,5 +735,8 @@ Additional details:
   <message name="IDS_POLICY_DLP_VIDEO_CAPTURE_WARN_CANCEL_BUTTON" desc="Cancel dialog button label for warning before saving a screen recording.">
     Delete recording
   </message>
+  <message name="IDS_POLICY_DLP_CLIPBOARD_BUBBLE_MESSAGE" desc="Text for a bubble that informs the user that their copy and paste action has been blocked/warned with a link to a help center article about Data Leak Prevention.">
+    <ph name="BUBBLE_MESSAGE">$1<ex>Pasting from corp.google.com to this location is blocked by administrator policy</ex></ph>. <ph name="LEARN_MORE_TEXT">$2<ex>Learn more</ex></ph>
+  </message>
 
 </grit-part>
diff --git a/components/security_state_strings.grdp b/components/security_state_strings.grdp
deleted file mode 100644
index 0f470dbeb200..000000000000
--- a/components/security_state_strings.grdp
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--This file is created by l10nUtil.js. Do not edit manually.-->
-<grit-part>
-  <!-- Strings describing Brave security policy for DevTools security panel -->
-  <message name="IDS_ERROR_PAGE_SUMMARY" desc="Main summary for a non cert error page." translateable="false">
-    This is an error page.
-  </message>
-  <message name="IDS_NON_CRYPTO_SECURE_SUMMARY" desc="Main summary for where the site has a non-cryptographic secure origin." translateable="false">
-    This page has a non-HTTPS secure origin.
-  </message>
-  <message name="IDS_HTTP_NONSECURE_SUMMARY" desc="Main summary for where the site is non-secure HTTP." translateable="false">
-    This page is insecure (unencrypted HTTP).
-  </message>
-  <message name="IDS_SAFEBROWSING_WARNING" desc="Main summary for page when it has been deemed unsafe by the SafeBrowsing service." translateable="false">
-    This page is dangerous (flagged by Google Safe Browsing).
-  </message>
-  <message name="IDS_SAFEBROWSING_WARNING_SUMMARY" desc="Summary phrase for a security problem where the site is deemed unsafe by the SafeBrowsing service." translateable="false">
-    Flagged by Google Safe Browsing
-  </message>
-  <message name="IDS_SAFEBROWSING_WARNING_DESCRIPTION" desc="Description of a security problem where the site is deemed unsafe by the SafeBrowsing service." translateable="false">
-    To check this page's status, visit g.co/safebrowsingstatus.
-  </message>
-  <message name="IDS_SHA1" desc="Summary phrase for a security problem where the site's certificate chain contains a SHA1 signature." translateable="false">
-    insecure (SHA-1)
-  </message>
-  <message name="IDS_SHA1_DESCRIPTION" desc="Description of a security problem where the site's certificate chain contains a SHA1 signature." translateable="false">
-    The certificate chain for this site contains a certificate signed using SHA-1.
-  </message>
-  <message name="IDS_SUBJECT_ALT_NAME_MISSING" desc="Summary phrase for a security problem where the site's certificate is missing a subjectAltName extension." translateable="false">
-    Subject Alternative Name missing
-  </message>
-  <message name="IDS_SUBJECT_ALT_NAME_MISSING_DESCRIPTION" desc="Description of a security problem where the site's certificate is missing a subjectAltName extension." translateable="false">
-    The certificate for this site does not contain a Subject Alternative Name extension containing a domain name or IP address.
-  </message>
-  <message name="IDS_CERTIFICATE_TITLE" desc="Title for the certificate section." translateable="false">
-    Certificate
-  </message>
-
-  <message name="IDS_CERTIFICATE_CHAIN_ERROR" desc="Summary phrase for a security problem with the site's certificate." translateable="false">
-    missing
-  </message>
-  <message name="IDS_CERTIFICATE_CHAIN_ERROR_DESCRIPTION_FORMAT" desc="Description of a security problem with the site's certificate." translateable="false">
-    This site is missing a valid, trusted certificate (<ph name="CERT_ERROR_DESCRIPTION">$1<ex>net::ERR_CERT_AUTHORITY_INVALID</ex></ph>).
-  </message>
-  <message name="IDS_VALID_SERVER_CERTIFICATE" desc="Summary phrase for a site that has a valid server certificate." translateable="false">
-    valid and trusted
-  </message>
-  <message name="IDS_VALID_SERVER_CERTIFICATE_DESCRIPTION" desc="Description of a site that has a valid server certificate." translateable="false">
-    The connection to this site is using a valid, trusted server certificate issued by <ph name="ISSUER">$1<ex>Let's Encrypt Authority X3</ex></ph>.
-  </message>
-
-  <message name="IDS_CERTIFICATE_EXPIRING_SOON" desc="Summary phrase for a site with a certificate that is expiring soon." translateable="false">
-    Certificate expires soon
-  </message>
-  <message name="IDS_CERTIFICATE_EXPIRING_SOON_DESCRIPTION" desc="Description for a site with a certificate that is expiring soon." translateable="false">
-    The certificate for this site expires in less than 48 hours and needs to be renewed.
-  </message>
-
-  <message name="IDS_SSL_CONNECTION_TITLE" desc="Title for the SSL connection explanation." translateable="false">
-    Connection
-  </message>
-  <message name="IDS_SECURE_SSL_SUMMARY" desc="Summary phrase for a site that uses a modern, secure TLS protocol and cipher." translateable="false">
-    secure connection settings
-  </message>
-  <message name="IDS_PRIVATE_KEY_PINNING_BYPASSED" desc="Summary phrase for a security state where Private Key Pinning is ignored because the certificate chains to a locally-trusted root." translateable="false">
-    Public-Key-Pinning bypassed
-  </message>
-  <message name="IDS_PRIVATE_KEY_PINNING_BYPASSED_DESCRIPTION" desc="Description of a security state where Private Key Pinning is ignored because the certificate chains to a locally-trusted root." translateable="false">
-    Public-Key-Pinning was bypassed by a local root certificate.
-  </message>
-  <message name="IDS_SSL_DESCRIPTION" desc="Description of a site's TLS settings." translateable="false">
-    The connection to this site is encrypted and authenticated using <ph name="PROTOCOL_VERSION">$1<ex>TLS 1.2</ex></ph>, <ph name="KEY_EXCHANGE">$2<ex>ECDHE_RSA</ex></ph>, and <ph name="CIPHER_SUTE">$3<ex>AES_128_GCM</ex></ph>.
-  </message>
-  <message name="IDS_OBSOLETE_SSL_SUMMARY" desc="Summary phrase for a site that uses an outdated SSL settings (protocol, key exchange, or cipher)." translateable="false">
-    obsolete connection settings
-  </message>
-  <message name="IDS_CIPHER_WITH_MAC" desc="Description of an SSL cipher that contains a separate (bulk) cipher and MAC." translateable="false">
-    <ph name="CIPHER">$1<ex>AES_256_CBC</ex></ph> with <ph name="MAC">$2<ex>HMAC-SHA1</ex></ph>
-  </message>
-  <message name="IDS_SSL_KEY_EXCHANGE_WITH_GROUP" desc="A phrase to describe an SSL/TLS ECDHE-based key exchange with a group." translateable="false">
-    <ph name="A_KEY_EXCHANGE">$1<ex>ECDHE_RSA</ex></ph> with <ph name="A_GROUP">$2<ex>X25519</ex></ph>
-  </message>
-
-  <!-- Recommendations for sites using obsolete TLS settings. -->
-  <message name="IDS_SSL_RECOMMEND_PROTOCOL" desc="A recommendation to the site owner to use a modern TLS protocol" translateable="false">
-    <ph name="PROTOCOL">$1<ex>TLS 1.0</ex></ph> is obsolete. Enable TLS 1.2 or later.
-  </message>
-  <message name="IDS_SSL_RECOMMEND_KEY_EXCHANGE" desc="A recommendation to the site owner to use a modern TLS key exchange" translateable="false">
-    RSA key exchange is obsolete. Enable an ECDHE-based cipher suite.
-  </message>
-  <message name="IDS_SSL_RECOMMEND_CIPHER" desc="A recommendation to the site owner to use a modern TLS cipher" translateable="false">
-    <ph name="CIPHER">$1<ex>3DES_EDE_CBC</ex></ph> is obsolete. Enable an AES-GCM-based cipher suite.
-  </message>
-  <message name="IDS_SSL_RECOMMEND_SIGNATURE" desc="A recommendation to the site owner to use a modern TLS server signature" translateable="false">
-    The server signature uses SHA-1, which is obsolete. Enable a SHA-2 signature algorithm instead. (Note this is different from the signature in the certificate.)
-  </message>
-
-  <!-- Mixed Content -->
-  <message name="IDS_RESOURCE_SECURITY_TITLE" desc="Title for the resources security explanation" translateable="false">
-    Resources
-  </message>
-
-  <message name="IDS_SECURE_RESOURCES_SUMMARY" desc="" translateable="false">
-    all served securely
-  </message>
-  <message name="IDS_SECURE_RESOURCES_DESCRIPTION" desc="" translateable="false">
-    All resources on this page are served securely.
-  </message>
-  <message name="IDS_MIXED_PASSIVE_CONTENT_SUMMARY" desc="" translateable="false">
-    mixed content
-  </message>
-  <message name="IDS_MIXED_PASSIVE_CONTENT_DESCRIPTION" desc="" translateable="false">
-    This page includes HTTP resources.
-  </message>
-  <message name="IDS_MIXED_ACTIVE_CONTENT_SUMMARY" desc="" translateable="false">
-    active mixed content
-  </message>
-  <message name="IDS_MIXED_ACTIVE_CONTENT_DESCRIPTION" desc="" translateable="false">
-    You have recently allowed non-secure content (such as scripts or iframes) to run on this site.
-  </message>
-  <message name="IDS_CERT_ERROR_PASSIVE_CONTENT_SUMMARY" desc="" translateable="false">
-    content with certificate errors
-  </message>
-  <message name="IDS_CERT_ERROR_PASSIVE_CONTENT_DESCRIPTION" desc="" translateable="false">
-    This page includes resources that were loaded with certificate errors.
-  </message>
-  <message name="IDS_CERT_ERROR_ACTIVE_CONTENT_SUMMARY" desc="" translateable="false">
-    active content with certificate errors
-  </message>
-  <message name="IDS_CERT_ERROR_ACTIVE_CONTENT_DESCRIPTION" desc="" translateable="false">
-    You have recently allowed content loaded with certificate errors (such as scripts or iframes) to run on this site.
-  </message>
-  <message name="IDS_NON_SECURE_FORM_SUMMARY" desc="" translateable="false">
-    non-secure form
-  </message>
-  <message name="IDS_NON_SECURE_FORM_DESCRIPTION" desc="" translateable="false">
-    This page includes a form with a non-secure "action" attribute.
-  </message>
-
-  <!-- Safety tips -->
-  <message name="IDS_SECURITY_TAB_SAFETY_TIP_TITLE" desc="Title of the devtools security tab when the page you are on triggered a safety tip.">
-    This page is suspicious (flagged by Brave).
-  </message>
-  <message name="IDS_SECURITY_TAB_SAFETY_TIP_BAD_REPUTATION_SUMMARY" desc="Message to display in devtools security tab when the page you are on triggered a safety tip.">
-    This page is suspicious
-  </message>
-  <message name="IDS_SECURITY_TAB_SAFETY_TIP_BAD_REPUTATION_DESCRIPTION" desc="Body of     message to display in devtools security tab when you are viewing a page that     triggered a safety tip.">
-    Brave has determined that this site could be fake or fraudulent.
-
-    If you believe this is shown in error please visit https://bugs.chromium.org/p/chromium/issues/entry?template=Safety+Tips+Appeals.
-  </message>
-  <message name="IDS_SECURITY_TAB_SAFETY_TIP_LOOKALIKE_SUMMARY" desc="Summary of a warning when the user visits a page that triggered a Safety Tip because the domain looked like another domain.">
-    Possible spoofing URL
-  </message>
-  <message name="IDS_SECURITY_TAB_SAFETY_TIP_LOOKALIKE_DESCRIPTION" desc="Body of a warning when the user visits a page that triggered a Safety Tip because the domain looked like another domain.">
-    This site's hostname looks similar to <ph name="LOOKALIKE_DOMAIN">$1<ex>google.com</ex></ph>. Attackers sometimes mimic sites by making small, hard-to-see changes to the domain name.
-
-    If you believe this is shown in error please visit https://bugs.chromium.org/p/chromium/issues/entry?template=Safety+Tips+Appeals.
-  </message>
-</grit-part>
diff --git a/components/speedreader/speedreader_throttle.h b/components/speedreader/speedreader_throttle.h
index fe5d1c9c3bc5..25d5852b9e72 100644
--- a/components/speedreader/speedreader_throttle.h
+++ b/components/speedreader/speedreader_throttle.h
@@ -10,7 +10,7 @@
 
 #include "base/memory/scoped_refptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "brave/components/speedreader/speedreader_result_delegate.h"
 #include "services/network/public/mojom/url_response_head.mojom-forward.h"
 #include "third_party/blink/public/common/loader/url_loader_throttle.h"
diff --git a/components/sync/driver/brave_sync_auth_manager_unittest.cc b/components/sync/driver/brave_sync_auth_manager_unittest.cc
index df55ae734629..1fdf009f2258 100644
--- a/components/sync/driver/brave_sync_auth_manager_unittest.cc
+++ b/components/sync/driver/brave_sync_auth_manager_unittest.cc
@@ -105,7 +105,7 @@ TEST_F(BraveSyncAuthManagerTest, GetAccessToken) {
 
   ASSERT_EQ(auth_manager->GetCredentials().access_token,
             std::string(kAccessToken) + "\r\n" + kBraveServerKeyHeaderString);
-  EXPECT_TRUE(auth_manager->GetActiveAccountInfo().is_primary);
+  EXPECT_TRUE(auth_manager->GetActiveAccountInfo().is_sync_consented);
   EXPECT_EQ(auth_manager->GetActiveAccountInfo().account_info.account_id,
             CoreAccountId::FromString(kAccountId));
   EXPECT_EQ(auth_manager->GetActiveAccountInfo().account_info.email,
@@ -127,7 +127,7 @@ TEST_F(BraveSyncAuthManagerTest, Reset) {
 
   auth_manager->ResetKeys();
   EXPECT_TRUE(auth_manager->GetCredentials().access_token.empty());
-  EXPECT_FALSE(auth_manager->GetActiveAccountInfo().is_primary);
+  EXPECT_FALSE(auth_manager->GetActiveAccountInfo().is_sync_consented);
   EXPECT_TRUE(
       auth_manager->GetActiveAccountInfo().account_info.account_id.empty());
 }
diff --git a/components/sync/engine/brave_model_type_worker.cc b/components/sync/engine/brave_model_type_worker.cc
index f7138c620fa2..71563161ef7e 100644
--- a/components/sync/engine/brave_model_type_worker.cc
+++ b/components/sync/engine/brave_model_type_worker.cc
@@ -30,8 +30,7 @@ namespace {
 
 size_t kFailuresToResetMarker = 7;
 // Allow reset progress marker for type not often than once in 30 minutes
-base::TimeDelta kMinimalTimeBetweenResetMarker =
-    base::TimeDelta::FromMinutes(30);
+base::TimeDelta kMinimalTimeBetweenResetMarker = base::Minutes(30);
 }  // namespace
 
 BraveModelTypeWorker::BraveModelTypeWorker(
diff --git a/components/tor/brave_tor_client_updater.cc b/components/tor/brave_tor_client_updater.cc
index 9dad93875bb6..6150e41c2391 100644
--- a/components/tor/brave_tor_client_updater.cc
+++ b/components/tor/brave_tor_client_updater.cc
@@ -15,9 +15,9 @@
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/task/post_task.h"
+#include "base/task/task_runner.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner.h"
-#include "base/task_runner_util.h"
 #include "brave/components/tor/pref_names.h"
 #include "brave/components/tor/tor_switches.h"
 #include "components/prefs/pref_service.h"
diff --git a/components/tor/brave_tor_client_updater.h b/components/tor/brave_tor_client_updater.h
index b34039fc728f..c8c779bdf6b1 100644
--- a/components/tor/brave_tor_client_updater.h
+++ b/components/tor/brave_tor_client_updater.h
@@ -13,7 +13,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "base/sequenced_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
 #include "brave/components/brave_component_updater/browser/brave_component.h"
 
 class BraveTorClientUpdaterTest;
diff --git a/components/tor/service_sandbox_type.h b/components/tor/service_sandbox_type.h
index b82a4931f321..c9ced1775391 100644
--- a/components/tor/service_sandbox_type.h
+++ b/components/tor/service_sandbox_type.h
@@ -15,9 +15,9 @@ class TorLauncher;
 }  // namespace tor
 
 template <>
-inline sandbox::policy::SandboxType
+inline sandbox::mojom::Sandbox
 content::GetServiceSandboxType<tor::mojom::TorLauncher>() {
-  return sandbox::policy::SandboxType::kNoSandbox;
+  return sandbox::mojom::Sandbox::kNoSandbox;
 }
 
 #endif  // BRAVE_COMPONENTS_TOR_SERVICE_SANDBOX_TYPE_H_
diff --git a/components/tor/tor_control.cc b/components/tor/tor_control.cc
index c2b2207172f5..87985d6b313e 100644
--- a/components/tor/tor_control.cc
+++ b/components/tor/tor_control.cc
@@ -6,10 +6,10 @@
 #include "brave/components/tor/tor_control.h"
 
 #include "base/callback_helpers.h"
-#include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/task/task_traits.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "net/base/io_buffer.h"
diff --git a/components/tor/tor_file_watcher.cc b/components/tor/tor_file_watcher.cc
index e7b38a5f3543..5481f3422707 100644
--- a/components/tor/tor_file_watcher.cc
+++ b/components/tor/tor_file_watcher.cc
@@ -10,10 +10,10 @@
 
 #include "base/files/file.h"
 #include "base/logging.h"
-#include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
 #include "base/time/time.h"
 
diff --git a/components/tor/tor_launcher_factory.cc b/components/tor/tor_launcher_factory.cc
index 9e4eced92c38..d1ff074d5db3 100644
--- a/components/tor/tor_launcher_factory.cc
+++ b/components/tor/tor_launcher_factory.cc
@@ -8,8 +8,8 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/bind_post_task.h"
 #include "base/callback_helpers.h"
+#include "base/task/bind_post_task.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "brave/components/tor/service_sandbox_type.h"
 #include "brave/components/tor/tor_file_watcher.h"
@@ -320,7 +320,7 @@ void TorLauncherFactory::DelayedRelaunchTor() {
       FROM_HERE,
       base::BindOnce(&TorLauncherFactory::RelaunchTor,
                      weak_ptr_factory_.GetWeakPtr()),
-      base::TimeDelta::FromSeconds(1));
+      base::Seconds(1));
 }
 
 void TorLauncherFactory::OnTorEvent(
diff --git a/components/tor/tor_tab_helper.cc b/components/tor/tor_tab_helper.cc
index ffeb51f1b702..9f2747bd9964 100644
--- a/components/tor/tor_tab_helper.cc
+++ b/components/tor/tor_tab_helper.cc
@@ -34,7 +34,7 @@ void TorTabHelper::DidFinishNavigation(
       FROM_HERE,
       base::BindOnce(&TorTabHelper::ReloadTab, AsWeakPtr(),
                      navigation_handle->GetWebContents()),
-      base::TimeDelta::FromSeconds(1));
+      base::Seconds(1));
 }
 
 void TorTabHelper::ReloadTab(content::WebContents* web_contents) {
diff --git a/components/weekly_storage/daily_storage.cc b/components/weekly_storage/daily_storage.cc
index e28c1ad218e6..1067a8f10489 100644
--- a/components/weekly_storage/daily_storage.cc
+++ b/components/weekly_storage/daily_storage.cc
@@ -55,7 +55,7 @@ void DailyStorage::FilterToDay() {
     return;
   }
   // Remove all values that aren't within the last 24 hours
-  base::Time min = clock_->Now() - base::TimeDelta::FromDays(1);
+  base::Time min = clock_->Now() - base::Days(1);
   daily_values_.remove_if([min](DailyValue val) { return (val.time <= min); });
 }
 
@@ -65,7 +65,7 @@ void DailyStorage::Load() {
   if (!list) {
     return;
   }
-  base::Time min = clock_->Now() - base::TimeDelta::FromDays(1);
+  base::Time min = clock_->Now() - base::Days(1);
   for (const auto& it : list->GetList()) {
     const base::Value* day = it.FindKey("day");
     const base::Value* value = it.FindKey("value");
diff --git a/components/weekly_storage/daily_storage_unittest.cc b/components/weekly_storage/daily_storage_unittest.cc
index bc8b18f21d7c..8574bf9fa884 100644
--- a/components/weekly_storage/daily_storage_unittest.cc
+++ b/components/weekly_storage/daily_storage_unittest.cc
@@ -51,7 +51,7 @@ TEST_F(DailyStorageTest, ForgetsOldValues) {
   state_->RecordValueNow(value);
   EXPECT_EQ(state_->GetLast24HourSum(), value);
 
-  clock_->Advance(base::TimeDelta::FromHours(24));
+  clock_->Advance(base::Hours(24));
 
   // More values
   state_->RecordValueNow(value);
@@ -63,7 +63,7 @@ TEST_F(DailyStorageTest, ForgetsOldValues) {
 TEST_F(DailyStorageTest, RetrievesAllValues) {
   uint64_t value = 10000;
   for (int hour = 0; hour <= 24; hour++) {
-    clock_->Advance(base::TimeDelta::FromHours(1));
+    clock_->Advance(base::Hours(1));
     state_->RecordValueNow(value);
   }
   EXPECT_EQ(state_->GetLast24HourSum(), 24 * value);
@@ -72,7 +72,7 @@ TEST_F(DailyStorageTest, RetrievesAllValues) {
 TEST_F(DailyStorageTest, HandlesSkippedHour) {
   uint64_t value = 10000;
   for (int hour = 0; hour < 24; hour++) {
-    clock_->Advance(base::TimeDelta::FromHours(1));
+    clock_->Advance(base::Hours(1));
     if (hour == 3)
       continue;
     state_->RecordValueNow(value);
@@ -83,7 +83,7 @@ TEST_F(DailyStorageTest, HandlesSkippedHour) {
 TEST_F(DailyStorageTest, IntermittentUsage) {
   uint64_t value = 10000;
   for (int hour = 0; hour < 36; hour++) {
-    clock_->Advance(base::TimeDelta::FromHours(2));
+    clock_->Advance(base::Hours(2));
     state_->RecordValueNow(value);
   }
   EXPECT_EQ(state_->GetLast24HourSum(), 12 * value);
@@ -92,7 +92,7 @@ TEST_F(DailyStorageTest, IntermittentUsage) {
 TEST_F(DailyStorageTest, InfrequentUsage) {
   uint64_t value = 10000;
   state_->RecordValueNow(value);
-  clock_->Advance(base::TimeDelta::FromHours(23));
+  clock_->Advance(base::Hours(23));
   state_->RecordValueNow(value);
   EXPECT_EQ(state_->GetLast24HourSum(), 2 * value);
 }
diff --git a/components/weekly_storage/weekly_event_storage.cc b/components/weekly_storage/weekly_event_storage.cc
index 76857f86464a..e49ec0511f98 100644
--- a/components/weekly_storage/weekly_event_storage.cc
+++ b/components/weekly_storage/weekly_event_storage.cc
@@ -69,7 +69,7 @@ void WeeklyEventStorage::FilterToWeek() {
   }
 
   // Remove all events older than a week.
-  auto cutoff = clock_->Now() - base::TimeDelta::FromDays(kDaysInWeek);
+  auto cutoff = clock_->Now() - base::Days(kDaysInWeek);
   events_.remove_if([cutoff](Event event) { return event.day <= cutoff; });
 }
 
diff --git a/components/weekly_storage/weekly_event_storage_unittest.cc b/components/weekly_storage/weekly_event_storage_unittest.cc
index b787cd7d049e..63a964b3f399 100644
--- a/components/weekly_storage/weekly_event_storage_unittest.cc
+++ b/components/weekly_storage/weekly_event_storage_unittest.cc
@@ -67,7 +67,7 @@ TEST_F(WeeklyEventStorageTest, ForgetsOldEvents) {
   EXPECT_EQ(state_->GetLatest(), absl::optional<TestValues>(TestValues::kFoo));
 
   // Jump to the next week.
-  clock_->Advance(base::TimeDelta::FromDays(8));
+  clock_->Advance(base::Days(8));
   // Should have forgotten about older days.
   EXPECT_FALSE(state_->HasEvent());
 
@@ -80,7 +80,7 @@ TEST_F(WeeklyEventStorageTest, ForgetsOldEvents) {
 TEST_F(WeeklyEventStorageTest, IntermittentUsage) {
   auto value = TestValues::kFoo;
   for (int day = 0; day < 10; day++) {
-    clock_->Advance(base::TimeDelta::FromDays(day % 3));
+    clock_->Advance(base::Days(day % 3));
     state_->Add(value);
   }
   EXPECT_EQ(state_->GetLatest(), absl::optional<TestValues>(value));
@@ -88,10 +88,10 @@ TEST_F(WeeklyEventStorageTest, IntermittentUsage) {
 
 TEST_F(WeeklyEventStorageTest, InfrequentUsage) {
   state_->Add(TestValues::kFoo);
-  clock_->Advance(base::TimeDelta::FromDays(6));
+  clock_->Advance(base::Days(6));
   state_->Add(TestValues::kBar);
   EXPECT_EQ(state_->GetLatest(), absl::optional<TestValues>(TestValues::kBar));
-  clock_->Advance(base::TimeDelta::FromDays(10));
+  clock_->Advance(base::Days(10));
   EXPECT_EQ(state_->GetLatest(), absl::nullopt);
 }
 
@@ -101,10 +101,10 @@ TEST_F(WeeklyEventStorageTest, SerializationOrder) {
   // Add a series of events.
   state_->Add(TestValues::kFoo);
   state_->Add(TestValues::kBar);
-  clock_->Advance(base::TimeDelta::FromDays(1));
+  clock_->Advance(base::Days(1));
   state_->Add(TestValues::kFoo);
   state_->Add(TestValues::kBrave);
-  clock_->Advance(base::TimeDelta::FromDays(1));
+  clock_->Advance(base::Days(1));
   EXPECT_EQ(state_->GetLatest(),
             absl::optional<TestValues>(TestValues::kBrave));
 
diff --git a/components/weekly_storage/weekly_storage.cc b/components/weekly_storage/weekly_storage.cc
index 2bde5676763d..5df744acef3a 100644
--- a/components/weekly_storage/weekly_storage.cc
+++ b/components/weekly_storage/weekly_storage.cc
@@ -56,8 +56,7 @@ void WeeklyStorage::ReplaceTodaysValueIfGreater(uint64_t value) {
 
 uint64_t WeeklyStorage::GetWeeklySum() const {
   // We record only value for last N days.
-  const base::Time n_days_ago =
-      clock_->Now() - base::TimeDelta::FromDays(kDaysInWeek);
+  const base::Time n_days_ago = clock_->Now() - base::Days(kDaysInWeek);
   return std::accumulate(daily_values_.begin(), daily_values_.end(), 0ull,
                          [n_days_ago](const uint64_t acc, const auto& u2) {
                            uint64_t add = 0;
@@ -71,8 +70,7 @@ uint64_t WeeklyStorage::GetWeeklySum() const {
 
 uint64_t WeeklyStorage::GetHighestValueInWeek() const {
   // We record only value for last N days.
-  const base::Time n_days_ago =
-      clock_->Now() - base::TimeDelta::FromDays(kDaysInWeek);
+  const base::Time n_days_ago = clock_->Now() - base::Days(kDaysInWeek);
   std::list<DailyValue> last_weeks_daily_values(daily_values_.size());
   auto copied_it =
       std::copy_if(daily_values_.begin(), daily_values_.end(),
diff --git a/components/weekly_storage/weekly_storage_unittest.cc b/components/weekly_storage/weekly_storage_unittest.cc
index 897e3a365cad..08dd72569b2b 100644
--- a/components/weekly_storage/weekly_storage_unittest.cc
+++ b/components/weekly_storage/weekly_storage_unittest.cc
@@ -51,7 +51,7 @@ TEST_F(WeeklyStorageTest, ForgetsOldSavings) {
   state_->AddDelta(saving);
   EXPECT_EQ(state_->GetWeeklySum(), saving);
 
-  clock_->Advance(base::TimeDelta::FromDays(8));
+  clock_->Advance(base::Days(8));
 
   // More savings
   state_->AddDelta(saving);
@@ -63,7 +63,7 @@ TEST_F(WeeklyStorageTest, ForgetsOldSavings) {
 TEST_F(WeeklyStorageTest, RetrievesDailySavings) {
   uint64_t saving = 10000;
   for (int day = 0; day <= 7; day++) {
-    clock_->Advance(base::TimeDelta::FromDays(1));
+    clock_->Advance(base::Days(1));
     state_->AddDelta(saving);
   }
   EXPECT_EQ(state_->GetWeeklySum(), 7 * saving);
@@ -72,7 +72,7 @@ TEST_F(WeeklyStorageTest, RetrievesDailySavings) {
 TEST_F(WeeklyStorageTest, HandlesSkippedDay) {
   uint64_t saving = 10000;
   for (int day = 0; day < 7; day++) {
-    clock_->Advance(base::TimeDelta::FromDays(1));
+    clock_->Advance(base::Days(1));
     if (day == 3)
       continue;
     state_->AddDelta(saving);
@@ -83,7 +83,7 @@ TEST_F(WeeklyStorageTest, HandlesSkippedDay) {
 TEST_F(WeeklyStorageTest, IntermittentUsage) {
   uint64_t saving = 10000;
   for (int day = 0; day < 10; day++) {
-    clock_->Advance(base::TimeDelta::FromDays(2));
+    clock_->Advance(base::Days(2));
     state_->AddDelta(saving);
   }
   EXPECT_EQ(state_->GetWeeklySum(), 4 * saving);
@@ -92,7 +92,7 @@ TEST_F(WeeklyStorageTest, IntermittentUsage) {
 TEST_F(WeeklyStorageTest, InfrequentUsage) {
   uint64_t saving = 10000;
   state_->AddDelta(saving);
-  clock_->Advance(base::TimeDelta::FromDays(6));
+  clock_->Advance(base::Days(6));
   state_->AddDelta(saving);
   EXPECT_EQ(state_->GetWeeklySum(), 2 * saving);
 }
@@ -102,12 +102,12 @@ TEST_F(WeeklyStorageTest, GetHighestValueInWeek) {
   uint64_t low_value = 50;
   uint64_t high_value = 75;
   state_->AddDelta(low_value);
-  clock_->Advance(base::TimeDelta::FromDays(1));
+  clock_->Advance(base::Days(1));
   state_->AddDelta(high_value);
-  clock_->Advance(base::TimeDelta::FromDays(1));
+  clock_->Advance(base::Days(1));
   state_->AddDelta(lowest_value);
   EXPECT_EQ(state_->GetHighestValueInWeek(), high_value);
-  clock_->Advance(base::TimeDelta::FromDays(1));
+  clock_->Advance(base::Days(1));
   EXPECT_EQ(state_->GetHighestValueInWeek(), high_value);
 }
 
@@ -132,7 +132,7 @@ TEST_F(WeeklyStorageTest, GetsHighestValueInWeekFromReplacement) {
   uint64_t low_value = 50;
   uint64_t high_value = 75;
   state_->ReplaceTodaysValueIfGreater(high_value);
-  clock_->Advance(base::TimeDelta::FromDays(2));
+  clock_->Advance(base::Days(2));
   state_->ReplaceTodaysValueIfGreater(low_value);
   EXPECT_EQ(state_->GetHighestValueInWeek(), high_value);
   // Sanity check disparate days were not replaced
diff --git a/content/browser/webui/brave_shared_resources_data_source.h b/content/browser/webui/brave_shared_resources_data_source.h
index 76b70ca124ca..cdf21c1346a7 100644
--- a/content/browser/webui/brave_shared_resources_data_source.h
+++ b/content/browser/webui/brave_shared_resources_data_source.h
@@ -10,7 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "content/public/browser/url_data_source.h"
 
 namespace brave_content {
diff --git a/ios/browser/api/ads/brave_ads.mm b/ios/browser/api/ads/brave_ads.mm
index c4a484b06e85..492efd7b71d2 100644
--- a/ios/browser/api/ads/brave_ads.mm
+++ b/ios/browser/api/ads/brave_ads.mm
@@ -12,11 +12,11 @@
 #import "ads_client_ios.h"
 #include "base/base64.h"
 #include "base/logging.h"
-#include "base/sequenced_task_runner.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "bat/ads/ad_content_action_types.h"
 #include "bat/ads/ad_content_info.h"
 #include "bat/ads/ad_event_history.h"
diff --git a/ios/browser/api/bookmarks/brave_bookmarks_api.mm b/ios/browser/api/bookmarks/brave_bookmarks_api.mm
index 9c975bccd13f..ea5c478a8221 100644
--- a/ios/browser/api/bookmarks/brave_bookmarks_api.mm
+++ b/ios/browser/api/bookmarks/brave_bookmarks_api.mm
@@ -8,9 +8,9 @@
 #include "base/compiler_specific.h"
 #include "base/containers/adapters.h"
 #include "base/guid.h"
-#include "base/sequenced_task_runner.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
 #include "brave/ios/browser/api/bookmarks/bookmark_model_listener_ios.h"
 #include "components/bookmarks/browser/bookmark_model.h"
diff --git a/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm b/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm
index 56bcb0eaf2a8..9c58b3c373ff 100644
--- a/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm
+++ b/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm
@@ -17,9 +17,9 @@
 #include "base/guid.h"
 #include "base/mac/foundation_util.h"
 #include "base/path_service.h"
-#include "base/sequenced_task_runner.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
 #include "base/values.h"
 #include "brave/ios/browser/api/bookmarks/exporter/bookmark_html_writer.h"
diff --git a/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm b/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm
index 747c202363c7..a9854a82c47c 100644
--- a/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm
+++ b/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm
@@ -15,10 +15,10 @@
 #include "base/files/file_path.h"
 #include "base/mac/foundation_util.h"
 #include "base/path_service.h"
-#include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
 #include "brave/ios/browser/api/bookmarks/importer/bookmark_html_reader.h"
 #include "brave/ios/browser/api/bookmarks/importer/bookmarks_importer.h"
diff --git a/ios/browser/api/ledger/brave_ledger.mm b/ios/browser/api/ledger/brave_ledger.mm
index 66518b0696ed..5226b2c1c6be 100644
--- a/ios/browser/api/ledger/brave_ledger.mm
+++ b/ios/browser/api/ledger/brave_ledger.mm
@@ -10,11 +10,11 @@
 #include "base/containers/flat_map.h"
 #include "base/ios/ios_util.h"
 #include "base/logging.h"
-#include "base/sequenced_task_runner.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
+#include "base/task/task_runner_util.h"
 #include "base/task/thread_pool.h"
-#include "base/task_runner_util.h"
 #include "base/time/time.h"
 #include "brave/build/ios/mojom/cpp_transformations.h"
 #import "brave/ios/browser/api/common/common_operations.h"
@@ -33,6 +33,7 @@
 #include "components/os_crypt/os_crypt.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -783,7 +784,7 @@ - (void)fetchPublisherActivityFromURL:(NSURL*)URL
     return;
   }
 
-  auto origin = parsedUrl.GetOrigin();
+  url::Origin origin = url::Origin::Create(parsedUrl);
   std::string baseDomain = GetDomainAndRegistry(
       origin.host(),
       net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
@@ -795,7 +796,7 @@ - (void)fetchPublisherActivityFromURL:(NSURL*)URL
   ledger::type::VisitDataPtr visitData = ledger::type::VisitData::New();
   visitData->domain = visitData->name = baseDomain;
   visitData->path = parsedUrl.PathForRequest();
-  visitData->url = origin.spec();
+  visitData->url = origin.Serialize();
 
   if (faviconURL.absoluteString) {
     visitData->favicon_url = base::SysNSStringToUTF8(faviconURL.absoluteString);
@@ -1303,7 +1304,7 @@ - (void)reportLoadedPageWithURL:(NSURL*)url tabId:(UInt32)tabId {
   }
 
   GURL parsedUrl(base::SysNSStringToUTF8(url.absoluteString));
-  auto origin = parsedUrl.GetOrigin();
+  url::Origin origin = url::Origin::Create(parsedUrl);
   const std::string baseDomain = GetDomainAndRegistry(
       origin.host(),
       net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
diff --git a/ios/browser/brave_web_main_parts.mm b/ios/browser/brave_web_main_parts.mm
index baab1e7230f7..b20ff198c6fd 100644
--- a/ios/browser/brave_web_main_parts.mm
+++ b/ios/browser/brave_web_main_parts.mm
@@ -7,8 +7,8 @@
 
 #include "base/metrics/user_metrics.h"
 #include "base/path_service.h"
-#include "base/sequenced_task_runner.h"
 #include "base/task/post_task.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
 #include "brave/ios/browser/browser_state/brave_browser_state_keyed_service_factories.h"
 #include "components/flags_ui/pref_service_flags_storage.h"
@@ -101,7 +101,7 @@
   std::vector<std::string> variation_ids;
   RegisterAllFeatureVariationParameters(&flags_storage, feature_list.get());
 
-  application_context_->GetVariationsService()->SetupFieldTrials(
+  application_context_->GetVariationsService()->SetUpFieldTrials(
       variation_ids, std::vector<base::FeatureList::FeatureOverrideInfo>(),
       std::move(feature_list), &ios_field_trials_);
 }
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc
index e369d35b5ff6..e0abef0ea2cf 100644
--- a/net/dns/dns_transaction_unittest.cc
+++ b/net/dns/dns_transaction_unittest.cc
@@ -45,7 +45,6 @@
 #include "net/log/net_log.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/log/net_log_with_source.h"
-#include "net/log/test_net_log.h"
 #include "net/proxy_resolution/proxy_config_service_fixed.h"
 #include "net/socket/socket_test_util.h"
 #include "net/test/gtest_util.h"
@@ -65,7 +64,7 @@ namespace net {
 
 namespace {
 
-base::TimeDelta kFallbackPeriod = base::TimeDelta::FromSeconds(1);
+base::TimeDelta kFallbackPeriod = base::Seconds(1);
 
 const char kMockHostname[] = "mock.http";
 
@@ -314,8 +313,9 @@ class TransactionHelper {
                         ResolveContext* context) {
     std::unique_ptr<DnsTransaction> transaction = factory->CreateTransaction(
         hostname, qtype, CompletionCallback(),
-        NetLogWithSource::Make(&net_log_, net::NetLogSourceType::NONE), secure,
-        factory->GetSecureDnsModeForTest(), context, true /* fast_timeout */);
+        NetLogWithSource::Make(net::NetLog::Get(), net::NetLogSourceType::NONE),
+        secure, factory->GetSecureDnsModeForTest(), context,
+        true /* fast_timeout */);
     transaction->SetRequestPriority(DEFAULT_PRIORITY);
     EXPECT_EQ(qtype, transaction->GetType());
     StartTransaction(std::move(transaction));
@@ -377,7 +377,6 @@ class TransactionHelper {
 
   bool has_completed() const { return completed_; }
   const DnsResponse* response() const { return response_; }
-  NetLog* net_log() { return &net_log_; }
 
   // Runs until the completion callback is called. Transaction must have already
   // been started or this will never complete.
@@ -396,7 +395,6 @@ class TransactionHelper {
   bool cancel_in_callback_ = false;
   base::RunLoop transaction_complete_run_loop_;
   bool completed_ = false;
-  TestNetLog net_log_;
 };
 
 // Callback that allows a test to modify HttpResponseinfo
diff --git a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
index c64ae1c57912..6e081ef7adad 100644
--- a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
+++ b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/memory/ptr_util.h"
 #include "brave/net/proxy_resolution/proxy_config_service_tor.h"
 #include "net/base/test_completion_callback.h"
-#include "net/log/test_net_log.h"
+#include "net/log/net_log_with_source.h"
 #include "net/proxy_resolution/mock_proxy_resolver.h"
 #include "net/proxy_resolution/proxy_resolution_request.h"
 #include "net/test/gtest_util.h"
@@ -52,11 +52,11 @@ TEST_F(ConfiguredProxyResolutionServiceTest, TorProxy) {
 
   ProxyInfo info;
   TestCompletionCallback callback;
-  RecordingBoundTestNetLog log;
   std::unique_ptr<ProxyResolutionRequest> request;
   int rv =
       service->ResolveProxy(site_url, std::string(), NetworkIsolationKey(),
-                            &info, callback.callback(), &request, log.bound());
+                            &info, callback.callback(), &request,
+                            NetLogWithSource::Make(NetLogSourceType::NONE));
   EXPECT_THAT(rv, IsOk());
 
   ProxyServer server = info.proxy_server();
diff --git a/net/proxy_resolution/proxy_config_service_tor.cc b/net/proxy_resolution/proxy_config_service_tor.cc
index fa05456dae0a..9eaa89aba021 100644
--- a/net/proxy_resolution/proxy_config_service_tor.cc
+++ b/net/proxy_resolution/proxy_config_service_tor.cc
@@ -100,7 +100,7 @@ bool IsTorProxyConfig(const ProxyConfigWithAnnotation& config) {
 
 const int kTorPasswordLength = 16;
 // Default tor circuit life time is 10 minutes
-constexpr base::TimeDelta kTenMins = base::TimeDelta::FromMinutes(10);
+constexpr base::TimeDelta kTenMins = base::Minutes(10);
 
 ProxyConfigServiceTor::ProxyConfigServiceTor() {}
 
@@ -188,9 +188,9 @@ void ProxyConfigServiceTor::SetProxyAuthorization(
     if (host_port_pair.username() == username) {
       // password is a int64_t -> std::to_string in milliseconds
       int64_t time = strtoll(host_port_pair.password().c_str(), nullptr, 10);
-      map->MaybeExpire(host_port_pair.username(),
-          base::Time::FromDeltaSinceWindowsEpoch(
-              base::TimeDelta::FromMicroseconds(time)));
+      map->MaybeExpire(
+          host_port_pair.username(),
+          base::Time::FromDeltaSinceWindowsEpoch(base::Microseconds(time)));
     }
     host_port_pair.set_username(username);
     host_port_pair.set_password(map->Get(username));
diff --git a/package.json b/package.json
index 99c0537ad8d2..da040d45cf3f 100644
--- a/package.json
+++ b/package.json
@@ -256,7 +256,7 @@
     "projects": {
       "chrome": {
         "dir": "src",
-        "tag": "96.0.4664.93",
+        "tag": "97.0.4692.36",
         "repository": {
           "url": "https://github.com/chromium/chromium"
         }
diff --git a/patches/.vpython3.patch b/patches/.vpython3.patch
deleted file mode 100644
index 59faa3a90629..000000000000
--- a/patches/.vpython3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/.vpython3 b/.vpython3
-index 21e15085072f03737725b10588369eb4c2b620c6..2fc76f02b61fc8bc7f62df9e9fd3c62385b7cc8b 100644
---- a/.vpython3
-+++ b/.vpython3
-@@ -59,6 +59,17 @@ wheel: <
- wheel: <
-   name: "infra/python/wheels/numpy/${vpython_platform}"
-   version: "version:1.20.3"
-+  # A newer version of numpy is required on ARM64, but it breaks older OS versions.
-+  not_match_tag <
-+    platform: "macosx_11_0_arm64"
-+  >
-+>
-+wheel: <
-+  name: "infra/python/wheels/numpy/mac-arm64_cp38_cp38"
-+  version: "version:1.21.1"
-+  match_tag <
-+    platform: "macosx_11_0_arm64"
-+  >
- >
- wheel: <
-   name: "infra/python/wheels/psutil/${vpython_platform}"
diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch
index 569850a1f90b..e8e4e1466147 100644
--- a/patches/base-BUILD.gn.patch
+++ b/patches/base-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index afd0690c72de4785d85b9d5bd64cdf772251f2f7..f4f353a97bc2fc2d7bc0773d141c22bb92adca62 100644
+index 7c1c51e1a468ee87d82ac1575e6c2b51ba262b9f..1ccf9dda5bc5d91e7103051558656b38d40162e6 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -4043,6 +4043,7 @@ if (is_android) {
+@@ -4047,6 +4047,7 @@ if (is_android) {
        "android/java/src/org/chromium/base/task/TaskTraits.java",
        "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
      ]
diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch
index 72ef38c5248e..0cc258e6a0c7 100644
--- a/patches/base-threading-thread_restrictions.h.patch
+++ b/patches/base-threading-thread_restrictions.h.patch
@@ -1,8 +1,8 @@
 diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
-index 3a5005fa8b04f99d13d8c748e5f5129d909055ac..dd5a8e0352cde41f2df4d52d04624ccf190f157d 100644
+index 0b572372308a44409fc5e58d92644e644da8ce6f..f3c8a9ecdcd3c40e279a2ad7e45208c408e5d91d 100644
 --- a/base/threading/thread_restrictions.h
 +++ b/base/threading/thread_restrictions.h
-@@ -523,6 +523,7 @@ class BASE_EXPORT ScopedDisallowBaseSyncPrimitives {
+@@ -531,6 +531,7 @@ class BASE_EXPORT ScopedDisallowBaseSyncPrimitives {
  };
  
  class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
diff --git a/patches/build-android-gyp-dex.py.patch b/patches/build-android-gyp-dex.py.patch
index b8ba274c40c6..3a1479c625fd 100644
--- a/patches/build-android-gyp-dex.py.patch
+++ b/patches/build-android-gyp-dex.py.patch
@@ -1,12 +1,13 @@
 diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
-index f64ddceb359b32fee6cb553410e7091b1eb39699..be0f163c79532d98da4ef49a1376357c83330a04 100755
+index f64ddceb359b32fee6cb553410e7091b1eb39699..e36b06f760d262158c5957b64fb455d272b52ee6 100755
 --- a/build/android/gyp/dex.py
 +++ b/build/android/gyp/dex.py
-@@ -49,6 +49,7 @@ _IGNORE_WARNINGS = (
-     # Only relevant for R8 when optimizing an app that doesn't use proto.
-     r'Ignoring -shrinkunusedprotofields since the protobuf-lite runtime is',
+@@ -53,7 +53,7 @@ _IGNORE_WARNINGS = (
+ _SKIPPED_CLASS_FILE_NAMES = (
+     'module-info.class',  # Explicitly skipped by r8/utils/FileUtils#isClassFile
  )
+-
 +_IGNORE_WARNINGS += ( r'.Brave', )
  
- _SKIPPED_CLASS_FILE_NAMES = (
-     'module-info.class',  # Explicitly skipped by r8/utils/FileUtils#isClassFile
+ def _ParseArgs(args):
+   args = build_utils.ExpandFileArgs(args)
diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch
index 92d9787b88d1..66439ff3ec52 100644
--- a/patches/build-config-BUILDCONFIG.gn.patch
+++ b/patches/build-config-BUILDCONFIG.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index 62e7e4bcd3e6c1ef49e3c929af7ac4634a1e6e2b..7522c87aa5708b5d50937c694723d0849bbc9676 100644
+index 034999175e30316e488404aa5392f38792d8bdde..e10c8b859e46bc802e24ce83e830e86b0f35d2c2 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
-@@ -314,6 +314,7 @@ is_posix = !is_win && !is_fuchsia
+@@ -323,6 +323,7 @@ is_posix = !is_win && !is_fuchsia
  
  # Holds all configs used for running the compiler.
  default_compiler_configs = [
diff --git a/patches/build-config-android-BUILD.gn.patch b/patches/build-config-android-BUILD.gn.patch
index acf7580610ae..6e0306b8f84d 100644
--- a/patches/build-config-android-BUILD.gn.patch
+++ b/patches/build-config-android-BUILD.gn.patch
@@ -1,12 +1,12 @@
 diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
-index 3803fd4f18e616f2daf01f16ead09b5774d1ba0f..e06ee2ea069adc060e0892e17586d18fb4043d1c 100644
+index 4231cd1c29cc7a9728502378f868d74c59c3cc1a..1d1f7169451846921e75984dbcd76bc2105be318 100644
 --- a/build/config/android/BUILD.gn
 +++ b/build/config/android/BUILD.gn
-@@ -50,6 +50,7 @@ config("compiler") {
+@@ -46,6 +46,7 @@ config("compiler") {
      # http://crbug.com/448386
      "-Wl,--exclude-libs=libvpx_assembly_arm.a",
    ]
 +  ldflags += ["-Wl,--allow-multiple-definition"] # Resolve conflict between libgcc++ and rustup symbols (e.g. __divdi3)
  
-   # TODO(crbug.com/1184398): Move to compiler-rt when we are ready.
-   ldflags += [ "--rtlib=libgcc" ]
+   if (current_cpu == "arm64") {
+     # For outline atomics on AArch64 (can't pass this unconditionally
diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch
index eeb700dd7d4c..706db4559cd6 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 a3c5da17057a3cec031dc09b631fa9ae2a6b6ab1..d13a3d1498e00679b9f66301bce9816158387ac3 100644
+index ce95ba26ee0219de00ad07e8701ec6869c1d7deb..08e8a09f74a2fb54fe29a69781edf83fd86287d4 100644
 --- a/build/config/android/config.gni
 +++ b/build/config/android/config.gni
 @@ -3,6 +3,7 @@
diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch
index c3aefd94784a..6ca77a6a2015 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 52d6c5f2120d8a2797378ca78205e1b849e23ecf..76872b3ca28af7d978286b27f6905c228e42467e 100644
+index 1bc0713025c50c840e1e6e0e938726868caee103..482ab380130749dde2eb02be6e4f5fe4f1847e98 100644
 --- a/build/config/android/internal_rules.gni
 +++ b/build/config/android/internal_rules.gni
-@@ -3868,6 +3868,7 @@ if (enable_java_templates) {
+@@ -3912,6 +3912,7 @@ if (enable_java_templates) {
          }
          _analysis_public_deps += [ ":$_bytecode_checks_target" ]
        }
diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch
index 8d177820bffb..f491ba46c69f 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 02e814c9fb2531d2d1471055d3419b67bcf86c8e..7c3efc06d79973a8d4f2d7404a30a1dfe6eeacf1 100644
+index 48a377c58f775ca86f16d0ec7c07ab76243e71a1..6924208a44619c5a185d5c813f937c336f7d09af 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
 @@ -479,6 +479,7 @@ if (enable_java_templates) {
diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch
index 3e22c0c9fd9d..bb0f9fda99d9 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 f4421666b3d10882bcdcd0c679e7e1362416796f..cb87288db66f48817eeb4e2732f9df19427ce87a 100644
+index bd1fefeff6f604474cbe1bafb89513b12abf8dba..d67093b26f09ce2e12edb013d21189ec69ddcf92 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1638,6 +1638,7 @@ config("chromium_code") {
+@@ -1643,6 +1643,7 @@ config("chromium_code") {
        cflags += [ "-Wextra-semi" ]
      }
    }
diff --git a/patches/build-config-ios-BUILD.gn.patch b/patches/build-config-ios-BUILD.gn.patch
index d667ecd86c97..f35547c91565 100644
--- a/patches/build-config-ios-BUILD.gn.patch
+++ b/patches/build-config-ios-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/build/config/ios/BUILD.gn b/build/config/ios/BUILD.gn
-index 83fb0a535279981832b5dcae00b0e931d1df48ba..758e22f3b1a5ea465f784c9f34f2f9a798e7c8fb 100644
+index 1d8506af3f3ffa549ef349b9cdd99d36f7df4395..30404072a4204a057b44956d59d37952770b8e99 100644
 --- a/build/config/ios/BUILD.gn
 +++ b/build/config/ios/BUILD.gn
-@@ -128,7 +128,8 @@ config("runtime_library") {
+@@ -127,7 +127,8 @@ config("runtime_library") {
    # libclang_rt.iossim.a for arm64 simulator builds. This can be
    # removed when an arm64 slice is added to upstream Clang.
    if (target_environment == "simulator" && current_cpu == "arm64") {
diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch
index cbff31a98d3f..194a8ce8a082 100644
--- a/patches/chrome-BUILD.gn.patch
+++ b/patches/chrome-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 77bcd0dd7ddddfea030d71c31956f873d4ac778a..601a633d2bdb8413aecf2c98611ec6169413f977 100644
+index b137978b640cd18c6a8566b4c53991e9581ecece..2835115e1a4a02217a9cef65a986a6c1d17dfa3e 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -170,6 +170,7 @@ if (!is_android && !is_mac) {
@@ -10,7 +10,7 @@ index 77bcd0dd7ddddfea030d71c31956f873d4ac778a..601a633d2bdb8413aecf2c98611ec616
  
        deps += [
          ":chrome_dll",
-@@ -462,11 +463,12 @@ if (is_win) {
+@@ -467,11 +468,12 @@ if (is_win) {
        args += [ "--keystone=0" ]
      }
    }
@@ -24,7 +24,7 @@ index 77bcd0dd7ddddfea030d71c31956f873d4ac778a..601a633d2bdb8413aecf2c98611ec616
      extra_substitutions = [
        "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
        "CHROMIUM_SHORT_NAME=$chrome_product_short_name",
-@@ -484,6 +486,7 @@ if (is_win) {
+@@ -489,6 +491,7 @@ if (is_win) {
        "//chrome/common:buildflags",
        "//chrome/common:version_header",
      ]
@@ -32,7 +32,7 @@ index 77bcd0dd7ddddfea030d71c31956f873d4ac778a..601a633d2bdb8413aecf2c98611ec616
  
      if (enable_stripping) {
        # At link time, preserve the global symbols specified in the .exports
-@@ -556,7 +559,7 @@ if (is_win) {
+@@ -561,7 +564,7 @@ if (is_win) {
      args =
          [
            "-b",
@@ -41,7 +41,7 @@ index 77bcd0dd7ddddfea030d71c31956f873d4ac778a..601a633d2bdb8413aecf2c98611ec616
            "-v",
            chrome_version_full,
            "-g",
-@@ -630,6 +633,7 @@ if (is_win) {
+@@ -635,6 +638,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 77bcd0dd7ddddfea030d71c31956f873d4ac778a..601a633d2bdb8413aecf2c98611ec616
      }
    }
  
-@@ -662,9 +666,11 @@ if (is_win) {
+@@ -667,9 +671,11 @@ if (is_win) {
        "--scm=0",
      ]
    }
@@ -61,7 +61,7 @@ index 77bcd0dd7ddddfea030d71c31956f873d4ac778a..601a633d2bdb8413aecf2c98611ec616
      if (is_chrome_branded) {
        # These entitlements are bound to the official Google Chrome signing
        # certificate and will not necessarily work in any other build.
-@@ -689,6 +695,7 @@ if (is_win) {
+@@ -694,6 +700,7 @@ if (is_win) {
          info_plist_target = invoker.info_plist_target
        } else {
          info_plist_target = ":chrome_helper_plist"
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 129d654b68cd..11af49e48af4 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 79b751e02c1ede4700046d72adf2f46ab2feaab3..78eea3757e3c4ff41b86b413bf7dbba0defe202c 100644
+index 71f615d1e25f7b08f0367657c199f1320325f0e6..897088226a0ac2a6de5284f5d4c5622e61735010 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
- MAJOR=96
+ MAJOR=97
 -MINOR=0
--BUILD=4664
--PATCH=93
+-BUILD=4692
+-PATCH=36
 +MINOR=1
 +BUILD=35
 +PATCH=15
diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
index c5cab4fd447a..1e1849194fbe 100644
--- a/patches/chrome-android-BUILD.gn.patch
+++ b/patches/chrome-android-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 20e37bb1fb62897b399b94a51aec6bae75b3e307..9fbab001d27c434c6babb3f5bede94fe9951e218 100644
+index 1f2223b770bb2b8a09aaf7c783baa3b3ab7f97d5..ad3f609e106055ae15be323d6a975772260c309c 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -252,6 +252,7 @@ android_resources("chrome_app_java_resources") {
+@@ -253,6 +253,7 @@ android_resources("chrome_app_java_resources") {
      "//third_party/androidx:androidx_preference_preference_java",
      "//third_party/androidx:androidx_recyclerview_recyclerview_java",
    ]
@@ -10,7 +10,7 @@ index 20e37bb1fb62897b399b94a51aec6bae75b3e307..9fbab001d27c434c6babb3f5bede94fe
  }
  
  if (enable_vr) {
-@@ -614,6 +615,7 @@ android_library("chrome_java") {
+@@ -622,6 +623,7 @@ android_library("chrome_java") {
    ]
  
    deps += feed_deps
@@ -18,7 +18,7 @@ index 20e37bb1fb62897b399b94a51aec6bae75b3e307..9fbab001d27c434c6babb3f5bede94fe
  
    srcjar_deps = [
      ":autofill_verification_status_generated_enum",
-@@ -646,6 +648,7 @@ android_library("chrome_java") {
+@@ -654,6 +656,7 @@ android_library("chrome_java") {
      "//components/offline_pages/core:offline_page_model_enums_java",
      "//net:effective_connection_type_java",
    ]
@@ -26,7 +26,7 @@ index 20e37bb1fb62897b399b94a51aec6bae75b3e307..9fbab001d27c434c6babb3f5bede94fe
  
    # From java_sources.gni.
    sources = chrome_java_sources + [ app_hooks_impl ]
-@@ -764,6 +767,7 @@ java_group("chrome_all_java") {
+@@ -772,6 +775,7 @@ java_group("chrome_all_java") {
        "//chrome/android/features/tab_ui:module_desc_java",
      ]
    }
@@ -34,7 +34,7 @@ index 20e37bb1fb62897b399b94a51aec6bae75b3e307..9fbab001d27c434c6babb3f5bede94fe
  }
  
  # This is a list of all base module jni headers. New features should add their
-@@ -808,6 +812,7 @@ group("jni_headers") {
+@@ -817,6 +821,7 @@ group("jni_headers") {
      "//components/ukm/android:jni_headers",
      "//components/webauthn/android:jni_headers",
    ]
@@ -42,7 +42,7 @@ index 20e37bb1fb62897b399b94a51aec6bae75b3e307..9fbab001d27c434c6babb3f5bede94fe
  }
  
  action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
-@@ -2154,6 +2159,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2170,6 +2175,7 @@ if (current_toolchain == default_toolchain) {
          ":${_variant}_locale_pak_assets",
          ":${_variant}_paks",
        ]
@@ -50,7 +50,7 @@ index 20e37bb1fb62897b399b94a51aec6bae75b3e307..9fbab001d27c434c6babb3f5bede94fe
        if (_is_monochrome) {
          deps += [ "//android_webview:locale_pak_assets" ]
          if (webview_includes_weblayer && !_is_bundle_module) {
-@@ -2551,6 +2557,7 @@ android_library("base_module_java") {
+@@ -2569,6 +2575,7 @@ android_library("base_module_java") {
      "//components/payments/content/android:service_java",
      "//third_party/androidx:androidx_browser_browser_java",
    ]
diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch
index abf0d994b24f..f694e08c75fb 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 c784135d978bdf10eb0f2bf4bcca2bb079b49cee..adae237257f14bb8a3db28aeabec0d3f0b3eaecf 100644
+index a22e248a4d83bc889e3b0d995f5667f8305eafc5..9e61f802dfff10b364806b916dea1d8f4880ad7b 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1262,3 +1262,4 @@ chrome_java_sources = [
+@@ -1251,3 +1251,4 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.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 3440c4160fdf..838acd6f2447 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 2a53ce562ae76f29e8de49180a3b67e2dead9709..468e2d10cd94f2e3781b5f97379d83fd42e0bb59 100644
+index f25c7aa5dfd69d6b676bbc6582ccfd1382ff54d0..d3bfe99e65fcf5e542c5862b152cdfce5aad2cee 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
 @@ -150,6 +150,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch
index 5f3ee097ffc6..dd4cd11b82b9 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 260bb164af9e426c47ba49617e475a34e73e9078..df14fb923f451c681f02849e3d6d618d0fee2e2e 100644
+index 64bea5349783a7a0b13540bd40662b4575437ca3..9c88e501f0a1b953fce8183fa2b4ad3eb697738e 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -59,7 +59,9 @@ by a child template that "extends" this file.
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 e9d7e5395b21..16ad28c1428a 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 b50522a40419fb8f6ba40a2820ae5b21ba186387..ff9c53aa9069b4d64f72d284db2f6153b07d1ee4 100644
+index e27dda1c4c18d3032b90664c1990e81d4f539913..61389673f6bb4ac8e342cf9f34229b861c619c00 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
 @@ -74,7 +74,7 @@ public abstract class AppHooks {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
index f3aa308507ab..f5916edecd34 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-index f242814764c6aca8bd58904c31f0f43cedf8e4ac..330c0541950cb6a15820a555e9b4439e930f8bac 100644
+index 0765e92f348673be98255ef1e5a3513dca4feea9..812708aac1ca03f784aa8640bb040aa5565e6c9b 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -2382,6 +2382,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2372,6 +2372,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
      }
  
      private void hideOverview() {
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 7ac46e0526bf..0308d36c1717 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,8 +1,8 @@
 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 57af2567b9c2ba4e4bc2e0a8d2f35e544a213953..df4ea4208c13a5592a7ac97e04c886bee869c54c 100644
+index d0909b5ef03d03c15ec148bf34c6038837716d98..b8aaf9d57b330dabf9c727d3f57a04721c00d03e 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
-@@ -391,7 +391,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -392,7 +392,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      private boolean mLastPictureInPictureModeForTesting;
  
      protected ChromeActivity() {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch
index 1d9e1f8a7b1d..edfa5b9e0f50 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
-index 1eceff519bfa8e7bac64ea65fd58ce4b4db86191..b5256e7cefc87be964a65dd32802f24163f184c7 100644
+index 02ff6a9bf22c4a24214904ff161d0e2cf44dc42c..e67d7ec3f9db77527ee8127071dc8f41ed4cfd87 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
-@@ -256,6 +256,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -226,6 +226,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
                  /* observer = */ this, offlinePageBridge);
  
          int maxRows = 2;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch
index 70a99e76812e..e351d925540d 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-index 0fe4867b22dbbef6a5c0db718526ca918bc62503..4f4b8a5bef1e8bcfdd9453d042e907929c0ed43c 100644
+index 7d445841efdc9b091e30a50dcb783808fdfe2026..c298ac22533f4d3766c8856dffe2ecc36f0d5346 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -48,7 +48,7 @@ import org.chromium.ui.text.SpanApplier;
+@@ -47,7 +47,7 @@ import org.chromium.ui.text.SpanApplier;
   * Fragment to keep track of the all the privacy related preferences.
   */
  public class PrivacySettings
@@ -11,7 +11,7 @@ index 0fe4867b22dbbef6a5c0db718526ca918bc62503..4f4b8a5bef1e8bcfdd9453d042e90792
      private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
      private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
      private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
-@@ -292,6 +292,7 @@ public class PrivacySettings
+@@ -262,6 +262,7 @@ public class PrivacySettings
      @Override
      public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
          menu.clear();
@@ -19,7 +19,7 @@ index 0fe4867b22dbbef6a5c0db718526ca918bc62503..4f4b8a5bef1e8bcfdd9453d042e90792
          MenuItem help =
                  menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
          help.setIcon(VectorDrawableCompat.create(
-@@ -306,6 +307,6 @@ public class PrivacySettings
+@@ -276,6 +277,6 @@ public class PrivacySettings
                      null);
              return true;
          }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
index baf20af5ec8c..060a9484a798 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
-index aceb920b21367a090c2128b80bd4f935ce3b6226..84f057c881994fc691429726ac6a21f7660bd83d 100644
+index 78709cf41dd22659c34e1f1b93be0912aadd73dd..189a7071ad4902c1556a21042e46f7ae6474fecd 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
 @@ -25,7 +25,7 @@ import androidx.appcompat.app.AppCompatActivity;
diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch
index dc8931825071..220c6e326734 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 84b98d0874b7b6f71fcfe96dfcc65759b31b8cb9..cab53ee9f8d8327f09e67a88a76c16f5616a2bb8 100644
+index ff9b86f353b224ac333e3929a51e1fd58a05d1ee..aa788283aefceedb5cda0ebc33572f726c2599e4 100644
 --- a/chrome/app/BUILD.gn
 +++ b/chrome/app/BUILD.gn
-@@ -89,6 +89,8 @@ grit("generated_resources") {
+@@ -101,6 +101,8 @@ grit("generated_resources") {
    if (is_android) {
      outputs += android_generated_java_resources
    }
@@ -11,7 +11,7 @@ index 84b98d0874b7b6f71fcfe96dfcc65759b31b8cb9..cab53ee9f8d8327f09e67a88a76c16f5
  }
  
  if (is_android) {
-@@ -111,7 +113,7 @@ grit("google_chrome_strings") {
+@@ -136,7 +138,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 06e1b3a204bb..7f3124dccda3 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 9572c236c2db5c23d910354ed9b07cc8ea82cfb1..17e5e259df1bf3a2736c67b744e1687e0c21ae95 100644
+index d189c06a28cf69e7eba7d3b30bab13a4e670e421..fd0b4e66db350fe6c9d6cdc530717392aba88a17 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2535,6 +2535,7 @@ static_library("browser") {
+@@ -2548,6 +2548,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 438e5f5f8ae0..9be5d337729e 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 97f7f268553b9604dadf00fac219416917cf7412..13a88c788f1d336be6668e2a9674d5aa5f96a5c5 100644
+index bdc5d54f047f9f113453008b8c03e10b60f33479..b113ce3fc60e5b9fb73f49b62b7baae2b4a9c945 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7710,6 +7710,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7747,6 +7747,7 @@ const FeatureEntry kFeatureEntries[] = {
      // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
      // Histograms" in tools/metrics/histograms/README.md (run the
      // AboutFlagsHistogramTest unit test to verify this process).
diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch
index 91d71a0a809d..a8350395b35b 100644
--- a/patches/chrome-browser-chrome_content_browser_client.h.patch
+++ b/patches/chrome-browser-chrome_content_browser_client.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
-index 0c8939e57e8142a75976a45eb4eeaf7a98e4cf97..4df04473a5e01db92585a44e11f28030e8363be0 100644
+index 99ab233c779f360ca233277c663eeadbb8776968..4675663ac112cf853fafb11907266c70b80b9a0a 100644
 --- a/chrome/browser/chrome_content_browser_client.h
 +++ b/chrome/browser/chrome_content_browser_client.h
-@@ -770,6 +770,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -767,6 +767,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
    }
  
   private:
diff --git a/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch b/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch
index 124d49386e7a..f5b7ecb83708 100644
--- a/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch
+++ b/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc
-index 05dd1c1b9741ac1884feb4320247073cde7c9d82..5c93161c561d88867fd7cd379d17e6323d133630 100644
+index 22fdc95ba9c3f37052e253fd8d3a99f9428c357c..8cb9cd22c3a1eae2e5ae7b2fa4a48dd5564e8f0f 100644
 --- a/chrome/browser/content_settings/host_content_settings_map_factory.cc
 +++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc
-@@ -90,6 +90,7 @@ scoped_refptr<RefcountedKeyedService>
+@@ -98,6 +98,7 @@ scoped_refptr<RefcountedKeyedService>
  
    scoped_refptr<HostContentSettingsMap> settings_map(new HostContentSettingsMap(
        profile->GetPrefs(),
diff --git a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch
index 641bf3e037b8..2be44d8965af 100644
--- a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch
+++ b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h
-index 0af8add6be85176ba9e371ddf57fe98a8715bcdb..b6fd02eeb730a87579b057c4c4f3feb68cf843c8 100644
+index ca2eb87881a19cda4bb7bb09587e6e645f60c315..86caa971128d5fcb89464638d20b13335bd18803 100644
 --- a/chrome/browser/devtools/devtools_ui_bindings.h
 +++ b/chrome/browser/devtools/devtools_ui_bindings.h
-@@ -103,6 +103,8 @@ class DevToolsUIBindings : public DevToolsEmbedderMessageDispatcher::Delegate,
+@@ -105,6 +105,8 @@ class DevToolsUIBindings : public DevToolsEmbedderMessageDispatcher::Delegate,
  
   private:
    using DevToolsUIBindingsList = std::vector<DevToolsUIBindings*>;
diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch
index 0636204ec3b2..a0e9fb3150a2 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 0bff3d62207ba378889e82e3bd0d31112be554cd..e9121b9f26465136fa63ed2db35cc0c27675a82f 100644
+index e53cc16ec645a6664b377cdfb632f853df37cce7..3ea05cfee4cf037d01ab37317ba501fed86aafd3 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -1320,6 +1320,7 @@ static_library("extensions") {
+@@ -1340,6 +1340,7 @@ static_library("extensions") {
    } else {
      sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
    }
diff --git a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch
index 1e9ec7b9c838..1386aa631f6c 100644
--- a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch
+++ b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
-index 4d9b13d1cb1e89f8085ebe9402e5cafb8567c48f..9df1965e9794234d7352a282c945ee0f58bde1ee 100644
+index 0c0058a63a98634d80af45aee681950a36e7cfdb..686c9d48e414dd3655dc1f667ee9babc7fa8fd6d 100644
 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
 +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
 @@ -622,6 +622,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
diff --git a/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch b/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch
index 26e9b2094bd8..9124d60961f0 100644
--- a/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch
+++ b/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
-index 9fe68cb53642684a40833b1c20bff9010066f38b..305329c30ff819a62642acd5b6bf058306937165 100644
+index ecdec535375fdb3dccd75002fd3068bc4ad3a441..ce466fdfee3b975a720b1fe388449f87fccf7691 100644
 --- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
 +++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
 @@ -90,6 +90,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest(
diff --git a/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch b/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch
index a298e3a2988f..e71c63a2b820 100644
--- a/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch
+++ b/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
-index 3d017d7c0f86e3a538e855f23344c256103ebfa8..03249bccb2271aeaed8c05e5c4c54abb7e051340 100644
+index 4eb2520ecb23801e8b501e8a90f3a337605b786e..4ce1800901cec57e83fc464ec337b8a2f879c013 100644
 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
 +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
-@@ -144,6 +144,7 @@ ChromeComponentExtensionResourceManager::Data::Data() {
+@@ -158,6 +158,7 @@ ChromeComponentExtensionResourceManager::Data::Data() {
          std::move(pdf_viewer_replacements);
    }
  #endif
diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch
index bf741f94cfef..733e52e3a899 100644
--- a/patches/chrome-browser-extensions-extension_management.cc.patch
+++ b/patches/chrome-browser-extensions-extension_management.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
-index 0ffb566b904e3140f5339d2f6f2b92c0b4609000..75d8b48449770e7a1dd3d823bbb1e230211eccd1 100644
+index a9b3713a72aec9c2bbc33a59311d65dd841e2896..d595a7a0deb8d449c67feb41696a1748770b8d1a 100644
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
-@@ -839,6 +839,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor(
+@@ -837,6 +837,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor(
      content::BrowserContext* context) const {
    TRACE_EVENT0("browser,startup",
                 "ExtensionManagementFactory::BuildServiceInstanceFor");
diff --git a/patches/chrome-browser-extensions-extension_service.h.patch b/patches/chrome-browser-extensions-extension_service.h.patch
index ba5fed71e6cd..1de897cc3bb8 100644
--- a/patches/chrome-browser-extensions-extension_service.h.patch
+++ b/patches/chrome-browser-extensions-extension_service.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
-index e9f1a9e98b520c1a0c70b23f35557c91f0adef68..bf5a87b264f16086b93a10fae2b7009558915191 100644
+index 9445c3f07f6a70b7d77606cf1f1181ba38b5e4ec..9a36a16375c42f7fede3501456433ebadc16a423 100644
 --- a/chrome/browser/extensions/extension_service.h
 +++ b/chrome/browser/extensions/extension_service.h
-@@ -468,6 +468,7 @@ class ExtensionService : public ExtensionServiceInterface,
+@@ -478,6 +478,7 @@ class ExtensionService : public ExtensionServiceInterface,
    static base::AutoReset<bool> DisableExternalUpdatesForTesting();
  
   private:
diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch
index 297f03480299..cc7f61b7368f 100644
--- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch
+++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
-index bd054c81acf8483ceb921ad4d3c9891a90e64832..bfeb1682c4561671b088f3b2e50f0f8cb9f70294 100644
+index 3d85575efd091029b2eddc0e47e7b27ccc7e2e14..53e20051ae23ce7a2cbdbb89f0f236a08147f383 100644
 --- a/chrome/browser/extensions/extension_tab_util.cc
 +++ b/chrome/browser/extensions/extension_tab_util.cc
 @@ -795,6 +795,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
index 9726450fcfd1..d6042ebc51f1 100644
--- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
+++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
-index 998eec4fbbb41292a3c7defc98e47bb53456a7e7..9995102d4a17e493dce7b1948ad3ad55c601dd75 100644
+index fb35e6bfe2da69f6162163e7a018ab8ccf8f00f0..cd2d211ec13405ef868fc610094869bdf6393c8b 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -363,6 +363,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -367,6 +367,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
  };
  
  const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
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 19b279aed82d..8ce619fb17ae 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 c944e7a5c506cb9ad4a0a72fc4fe675c104bbd19..a864b7c660dad90e39a1b7b2da39b16dfe4616f4 100644
+index 4bc6120960143d5b16713c5695339111f57dbaba..d6f1d6ecb5491af454577b458f7e39c670061a0e 100644
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -240,7 +240,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
+@@ -227,7 +227,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
      if (!manager_)
        return;
      manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch
index 328ae5ab6567..07ac6d31b78d 100644
--- a/patches/chrome-browser-prefs-browser_prefs.cc.patch
+++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch
@@ -1,17 +1,17 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 77e924414c4436adcd208901348f5ddc6eebe479..3dfbaf2181af3c49d9ec0fbb193c7acd2a0889f2 100644
+index a55c24300b40b8d2a63f479617c3a441695365a5..9801453fc022b9f527b8419273e09f1b6a65841d 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1103,6 +1103,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
- #if defined(TOOLKIT_VIEWS)
-   RegisterBrowserViewLocalPrefs(registry);
+@@ -1121,6 +1121,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+   downgrade::RegisterPrefs(registry);
+   DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
  #endif
 +  brave::RegisterLocalStatePrefs(registry);
  
    // This is intentionally last.
    RegisterLocalStatePrefsForMigration(registry);
-@@ -1414,6 +1415,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
- #endif
+@@ -1435,6 +1436,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+   registry->RegisterBooleanPref(prefs::kPrivacyReviewShowWelcomeCard, true);
  
    RegisterProfilePrefsForMigration(registry);
 +  brave::RegisterProfilePrefs(registry);
diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch
index 1bf14231f8ae..10a0189b9444 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 d8df8be6d9d5413ff1792d21ba50423711d0a01f..c51736554377385204f6aebe5c875e8e5abc89ef 100644
+index 9d99f3fd9a703ee7d9071de8b793fc5fd4f19e26..e0f5b1a03f7b20c4504553b126dee3f38f334b93 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
 @@ -362,7 +362,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
diff --git a/patches/chrome-browser-profiles-profile_impl.h.patch b/patches/chrome-browser-profiles-profile_impl.h.patch
index d2aeac20fd8f..9ff00d486e21 100644
--- a/patches/chrome-browser-profiles-profile_impl.h.patch
+++ b/patches/chrome-browser-profiles-profile_impl.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
-index 1a387d29c9f08a2fe6cb3639b590b848de1728a0..bbaa5fb21486683f66666da24330ceb6fd05fe48 100644
+index a310e6c2c99727edf56fc81ffec20873d567e670..3f352db82d36ed78bb6a4314bdd18e7d6f6f9ab2 100644
 --- a/chrome/browser/profiles/profile_impl.h
 +++ b/chrome/browser/profiles/profile_impl.h
-@@ -159,6 +159,7 @@ class ProfileImpl : public Profile {
+@@ -158,6 +158,7 @@ class ProfileImpl : public Profile {
    void OnLogin() override;
    void InitChromeOSPreferences() override;
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch
index 2a25c1a6d143..fec969b05725 100644
--- a/patches/chrome-browser-profiles-profile_manager.h.patch
+++ b/patches/chrome-browser-profiles-profile_manager.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
-index d6120ff3abd2e780aaf416d7a27fa11fc2585d9f..880b6c42d09e09905d7a211b2a886db0d67f27be 100644
+index fca117d60623efcbea6b8fd1b0af0fd7f72a097d..57d40b6909f5c6eeaad50de30c0c8e5f5ac4212c 100644
 --- a/chrome/browser/profiles/profile_manager.h
 +++ b/chrome/browser/profiles/profile_manager.h
 @@ -297,6 +297,7 @@ class ProfileManager : public Profile::Delegate {
diff --git a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch
index cfe88e9ae0bc..9205df2de59f 100644
--- a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch
+++ b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
-index 41ca67fa032e7c877487ad3bcb132465a15e3c4b..c2796f2bb547dcb05fc80e637432692f9ba16a51 100644
+index 524b3d7610ede2baa9dd7e876769bc64dfebd87f..790d6e6009fa45aef3822a0e6b56f679100b703d 100644
 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
 +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
 @@ -764,7 +764,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() {
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 5b1b3b1d2e45..c33b55469d69 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 901a0baaca6cf6234df50826ed5f11ba9df917d9..471042375c64ccc2975dc1c97f65b3a0161a1082 100644
+index 3bc9431ff5069957fb1c51e5c4dedfb20d7b5a4b..87cbf975928725a240963cf15f5091d3c0195d9e 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1854,6 +1854,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
+@@ -1870,6 +1870,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 437ab9b9646d..d777802f90a3 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 17efc6e786bfbe5a93a2559610f9f836096f0acf..3efd4f3c664ef1e14066f748baf43f53f90604f8 100644
+index 1e776354a073d535e0bd340823bfc98e4319bc95..46850b3653642210502c34476b87d335bbdd887e 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
-@@ -138,6 +138,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase,
+@@ -149,6 +149,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase,
    // 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-api_listener.ts.patch b/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch
index bc79b335ac2b..7a9b6e1244b7 100644
--- a/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch
+++ b/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/bookmarks/api_listener.ts b/chrome/browser/resources/bookmarks/api_listener.ts
-index 67b7187e0c7d98a102797c6cd07df427f9f43a9a..52eec387e2d3d699444719e1fab529ef01204e83 100644
+index 4e9ee19d39377ee7c7f2453bc3f289a7b57035bb..20084fb27e9e7faddc89495ab19d0586d94c2718 100644
 --- a/chrome/browser/resources/bookmarks/api_listener.ts
 +++ b/chrome/browser/resources/bookmarks/api_listener.ts
 @@ -118,6 +118,7 @@ function onChildrenReordered(
diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch
index 11ae3da86613..eb166f0e7468 100644
--- a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch
+++ b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts
-index f31b09b3cffe7dc52ce8e15793b0532af7ee96ae..daa36d60a53354859149d51976dc4549f8f71bcd 100644
+index 092a3a2ebcf502b7d39037d20dfb138c8d2c6d8c..1beb2971406d8214cb1bbc8331abb0c88983d4bf 100644
 --- a/chrome/browser/resources/bookmarks/command_manager.ts
 +++ b/chrome/browser/resources/bookmarks/command_manager.ts
-@@ -437,7 +437,7 @@ export class BookmarksCommandManagerElement extends
+@@ -429,7 +429,7 @@ export class BookmarksCommandManagerElement extends
          chrome.bookmarks.export();
          break;
        case Command.HELP_CENTER:
diff --git a/patches/chrome-browser-resources-bookmarks-reducers.ts.patch b/patches/chrome-browser-resources-bookmarks-reducers.ts.patch
index 6af461136087..cec2e5eba453 100644
--- a/patches/chrome-browser-resources-bookmarks-reducers.ts.patch
+++ b/patches/chrome-browser-resources-bookmarks-reducers.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/bookmarks/reducers.ts b/chrome/browser/resources/bookmarks/reducers.ts
-index 5e224479b3af8ca0039e429a438632f5e1fb4289..7fbaa741dc1310436b7638bf690f0ca64f5e518c 100644
+index fff0c9eb0396fdbf2747a360cad3d3e1286facaa..ed43c6bf5d3f0a9b3d88c855b402f6d6b6c4963b 100644
 --- a/chrome/browser/resources/bookmarks/reducers.ts
 +++ b/chrome/browser/resources/bookmarks/reducers.ts
 @@ -193,6 +193,9 @@ function editBookmark(nodes: NodeMap, action: EditBookmarkAction): NodeMap {
diff --git a/patches/chrome-browser-resources-downloads-downloads.ts.patch b/patches/chrome-browser-resources-downloads-downloads.ts.patch
index 217d9f98a24d..59be3c508231 100644
--- a/patches/chrome-browser-resources-downloads-downloads.ts.patch
+++ b/patches/chrome-browser-resources-downloads-downloads.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/downloads/downloads.ts b/chrome/browser/resources/downloads/downloads.ts
-index 9f65f8a15761c67888eba6c64a9677b12470de6c..ff6d557774dcefc7a3a5914f900448f5788becd6 100644
+index 5eb97207ad0a632d34a960f064c2a55be267baeb..a80a5062d53eea16434b65f5ecea8a69b8e96768 100644
 --- a/chrome/browser/resources/downloads/downloads.ts
 +++ b/chrome/browser/resources/downloads/downloads.ts
 @@ -2,6 +2,7 @@
@@ -9,4 +9,4 @@ index 9f65f8a15761c67888eba6c64a9677b12470de6c..ff6d557774dcefc7a3a5914f900448f5
 +import 'chrome://brave-resources/polymer_overriding.js'
  import './manager.js';
  
- export {BrowserProxy} from './browser_proxy.js';
+ export {CrToastManagerElement} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.js';
diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch
index 485070db3fbd..0f5985525dd7 100644
--- a/patches/chrome-browser-resources-extensions-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-extensions-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn
-index 81705a7264ac77e78cb1f34b06c98d40aa276e78..5b6f85320d4d1cb27ff25842de276341da392753 100644
+index 7762738fa08988378712b3e8debd4d9bc7b61638..afea520cb9009367c20bddccb944576313ed25ed 100644
 --- a/chrome/browser/resources/extensions/BUILD.gn
 +++ b/chrome/browser/resources/extensions/BUILD.gn
 @@ -31,6 +31,7 @@ if (optimize_webui) {
diff --git a/patches/chrome-browser-resources-extensions-item_list.ts.patch b/patches/chrome-browser-resources-extensions-item_list.ts.patch
index 918dbe8b9f64..5e7c81b74d8e 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 3edc703fb857afec7fc146645e87453566217bb5..5e4ba81d5e5b86ca4facaa370bdb902b62a7e489 100644
+index b6ccfd5fd0b98aa4f6d30bc21c25726ca2140385..b63b15f2c12c66902e61a09f544a7773f579547e 100644
 --- a/chrome/browser/resources/extensions/item_list.ts
 +++ b/chrome/browser/resources/extensions/item_list.ts
 @@ -12,6 +12,7 @@ import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-annou
diff --git a/patches/chrome-browser-resources-history-history_item.html.patch b/patches/chrome-browser-resources-history-history_item.html.patch
index 7f6f9eb6799a..56feccf06498 100644
--- a/patches/chrome-browser-resources-history-history_item.html.patch
+++ b/patches/chrome-browser-resources-history-history_item.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/history/history_item.html b/chrome/browser/resources/history/history_item.html
-index 2aadeb66294248baaf707868c0fb4d73d68fee9f..c48ff0b835b4d772618b9525f64572b4d3048c79 100644
+index e362cbc275aeb0f586773e34cb3a1a67bc8b859b..db1c277511c0e342600fca95e9d17637f0c5bf66 100644
 --- a/chrome/browser/resources/history/history_item.html
 +++ b/chrome/browser/resources/history/history_item.html
 @@ -1,4 +1,4 @@
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 2b37e6e8b643..73983dbf0098 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 d03a367a7cb1ea6ccad6478a2300606b4c20829a..bfa8a2debda7e0c35b217cea85df668232c5507b 100644
+index 8658151958b1dedb65fe4e641ac8adca4a942be2..cd24e674ce5d111fbc02fbbb11025adcc4d91c0b 100644
 --- a/chrome/browser/resources/history/synced_device_manager.html
 +++ b/chrome/browser/resources/history/synced_device_manager.html
 @@ -73,6 +73,7 @@
@@ -8,9 +8,9 @@ index d03a367a7cb1ea6ccad6478a2300606b4c20829a..bfa8a2debda7e0c35b217cea85df6682
      </div>
 +<!--
      <div id="sign-in-guide"
-         hidden="[[!showSignInGuide(signInState, guestSession_)]]">
-       <div id="illustration"></div>
-@@ -83,6 +84,7 @@
+         hidden="[[!showSignInGuide(signInState, guestSession_,
+                                    signInAllowed_)]]">
+@@ -84,6 +85,7 @@
          $i18n{signInButton}
        </cr-button>
      </div>
diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch
index f16263418f62..19ad89229a3c 100644
--- a/patches/chrome-browser-resources-settings-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
-index 374ba71ddf91ba549ecfceea700d51183546bbf9..5e6ce0d1bee09b7d12b167046b11bc5e8495b401 100644
+index fb5ef473d4ee1b947cf35ed9aab4e149d016adc3..25e8cc654397049626f0fc56ef7c59ddac3311db 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
-@@ -98,6 +98,7 @@ generate_grd("build_grd") {
+@@ -99,6 +99,7 @@ generate_grd("build_grd") {
      deps = [ ":build_ts" ]
      manifest_files = [ "$target_gen_dir/tsconfig.manifest" ]
    }
@@ -10,7 +10,7 @@ index 374ba71ddf91ba549ecfceea700d51183546bbf9..5e6ce0d1bee09b7d12b167046b11bc5e
  }
  
  preprocess_if_expr("preprocess") {
-@@ -786,4 +787,6 @@ ts_library("build_ts") {
+@@ -807,4 +808,6 @@ ts_library("build_ts") {
      ":preprocess",
      ":preprocess_generated",
    ]
diff --git a/patches/chrome-browser-resources-settings-about_page-about_page.ts.patch b/patches/chrome-browser-resources-settings-about_page-about_page.ts.patch
deleted file mode 100644
index 9571db11b5d9..000000000000
--- a/patches/chrome-browser-resources-settings-about_page-about_page.ts.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/chrome/browser/resources/settings/about_page/about_page.ts b/chrome/browser/resources/settings/about_page/about_page.ts
-index ea048e137e803eb08bd8c495956569df061ee2e6..422d4061bf772f5f9110180892991cb50131647f 100644
---- a/chrome/browser/resources/settings/about_page/about_page.ts
-+++ b/chrome/browser/resources/settings/about_page/about_page.ts
-@@ -204,7 +204,14 @@ export class SettingsAboutPageElement extends SettingsAboutPageElementBase {
-   }
- 
-   private onRelaunchTap_() {
-+    // <if expr="is_macosx">
-+    // Sparkle framework's relaunch api is used.
-+    LifetimeBrowserProxyImpl.getInstance().relaunchOnMac();
-+    // </if>
-+
-+    // <if expr="not is_macosx">
-     LifetimeBrowserProxyImpl.getInstance().relaunch();
-+    // </if>
-   }
- 
-   // <if expr="not chromeos">
diff --git a/patches/chrome-browser-resources-settings-lifetime_browser_proxy.ts.patch b/patches/chrome-browser-resources-settings-lifetime_browser_proxy.ts.patch
deleted file mode 100644
index 623087be098b..000000000000
--- a/patches/chrome-browser-resources-settings-lifetime_browser_proxy.ts.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/chrome/browser/resources/settings/lifetime_browser_proxy.ts b/chrome/browser/resources/settings/lifetime_browser_proxy.ts
-index 88d9caa34016bcf9d87a908303e77bb89df48b81..a2827a32a3885c05da3722ce99328e1033fe9461 100644
---- a/chrome/browser/resources/settings/lifetime_browser_proxy.ts
-+++ b/chrome/browser/resources/settings/lifetime_browser_proxy.ts
-@@ -9,6 +9,13 @@ export interface LifetimeBrowserProxy {
-   // Triggers a browser relaunch.
-   relaunch(): void;
- 
-+  // <if expr="is_macosx">
-+  // Use separate api for relaunch after update on Mac.
-+  // Chromium's relaunch api isn't compatible with sparkle framework.
-+  // So, sparkle framework's relaunch api is used on Mac.
-+  relaunchOnMac(): void;
-+  // </if>
-+
-   // <if expr="chromeos">
-   // First signs out current user and then performs a restart.
-   signOutAndRestart(): void;
-@@ -30,6 +37,13 @@ export class LifetimeBrowserProxyImpl implements LifetimeBrowserProxy {
-     chrome.send('relaunch');
-   }
- 
-+  // <if expr="is_macosx">
-+  /** @override */
-+  relaunchOnMac() {
-+    chrome.send('relaunchOnMac');
-+  }
-+  // </if>
-+
-   // <if expr="chromeos">
-   signOutAndRestart() {
-     chrome.send('signOutAndRestart');
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 8e5fb675bfd2..f6a738f8fcd7 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,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/people_page/sync_controls.ts b/chrome/browser/resources/settings/people_page/sync_controls.ts
-index fd0a4a70851297d75026ed16c731873930a34009..ef4ad0a4dc2ed037d402843a88ddde42a9ef16bd 100644
+index 4414a9af35feb396b3ff68f8829a06c939252b0e..f6e45154f5305e50c242a66909f5531ca506fecf 100644
 --- a/chrome/browser/resources/settings/people_page/sync_controls.ts
 +++ b/chrome/browser/resources/settings/people_page/sync_controls.ts
-@@ -113,7 +113,7 @@ class SettingsSyncControlsElement extends SettingsSyncControlsElementBase {
+@@ -94,7 +94,7 @@ class SettingsSyncControlsElement extends SettingsSyncControlsElementBase {
  
      const router = Router.getInstance();
      if (router.getCurrentRoute() ===
diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch
index 0fca71128a73..f78f5da2a6ad 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.html b/chrome/browser/resources/settings/privacy_page/personalization_options.html
-index 70eeec029bfbf19f8419aa5176acfc7dd8f13732..1be168dddf273d27d28935d2d4d2e64a57796779 100644
+index f69e4c52ca5a661bb2dc7061caf687fa5fd60c0b..3c8bbb09da391917332afe7a92c042441ef63948 100644
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
 @@ -8,6 +8,7 @@
@@ -7,18 +7,18 @@ index 70eeec029bfbf19f8419aa5176acfc7dd8f13732..1be168dddf273d27d28935d2d4d2e64a
        }
      </style>
 +<if expr="_google_chrome">
- <if expr="not chromeos">
+ <if expr="not chromeos and not lacros">
+     <!-- Signout is not supported yet on lacros, https://crbug.com/1217645 -->
      <settings-toggle-button id="signinAllowedToggle"
-         class="hr"
-@@ -20,6 +21,7 @@
+@@ -21,6 +22,7 @@
          no-set-pref>
      </settings-toggle-button>
- </if><!-- not chromeos -->
+ </if><!-- not chromeos and not lacros -->
 +</if>
      <settings-toggle-button id="searchSuggestToggle"
          class="hr"
          hidden="[[!pageVisibility.searchPrediction]]"
-@@ -35,6 +37,8 @@
+@@ -36,6 +38,8 @@
          sub-label="$i18n{enablePersonalizationLoggingDesc}">
      </settings-toggle-button>
  </if><!-- chromeos -->
@@ -27,7 +27,7 @@ index 70eeec029bfbf19f8419aa5176acfc7dd8f13732..1be168dddf273d27d28935d2d4d2e64a
  <if expr="not chromeos">
      <settings-toggle-button id="metricsReportingControl"
          class="hr"
-@@ -50,13 +54,15 @@
+@@ -51,13 +55,15 @@
        </template>
      </settings-toggle-button>
  </if><!-- not chromeos -->
@@ -44,7 +44,7 @@ index 70eeec029bfbf19f8419aa5176acfc7dd8f13732..1be168dddf273d27d28935d2d4d2e64a
  <if expr="_google_chrome">
      <settings-toggle-button id="spellCheckControl"
          class="hr"
-@@ -76,6 +82,7 @@
+@@ -77,6 +83,7 @@
        </settings-toggle-button>
      </template>
  
@@ -52,7 +52,7 @@ index 70eeec029bfbf19f8419aa5176acfc7dd8f13732..1be168dddf273d27d28935d2d4d2e64a
      <template is="dom-if" if="[[showSignoutDialog_]]" restamp>
        <settings-signout-dialog sync-status="[[syncStatus]]"
            on-close="onSignoutDialogClosed_">
-@@ -88,3 +95,4 @@
+@@ -89,3 +96,4 @@
        <cr-button on-click="onRestartTap_">$i18n{restart}</cr-button>
      </cr-toast>
  </if>
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 e2dadc9f8b0e..c9589d5e46db 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,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
-index 1969bc52b15eaba9ea5570003dd344e55c221a42..640acbe4d1d674ac2f57683f069dea531871a91f 100644
+index 172c29b9032fcf2f60aea7d001df42b1e0c27860..763292d736126c0c656c4510e5bbd7ead0264c80 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
+@@ -69,7 +69,7 @@ export class SettingsPersonalizationOptionsElement extends
  
        syncStatus: Object,
  
@@ -11,7 +11,7 @@ index 1969bc52b15eaba9ea5570003dd344e55c221a42..640acbe4d1d674ac2f57683f069dea53
        // TODO(dbeam): make a virtual.* pref namespace and set/get this normally
        // (but handled differently in C++).
        metricsReportingPref_: {
-@@ -109,7 +109,7 @@ export class SettingsPersonalizationOptionsElement extends
+@@ -104,7 +104,7 @@ export class SettingsPersonalizationOptionsElement extends
  
    syncStatus: SyncStatus;
  
@@ -20,7 +20,7 @@ index 1969bc52b15eaba9ea5570003dd344e55c221a42..640acbe4d1d674ac2f57683f069dea53
    private metricsReportingPref_: chrome.settingsPrivate.PrefObject;
    private showRestart_: boolean;
    // </if>
-@@ -131,7 +131,7 @@ export class SettingsPersonalizationOptionsElement extends
+@@ -126,7 +126,7 @@ export class SettingsPersonalizationOptionsElement extends
    ready() {
      super.ready();
  
@@ -29,7 +29,7 @@ index 1969bc52b15eaba9ea5570003dd344e55c221a42..640acbe4d1d674ac2f57683f069dea53
      const setMetricsReportingPref = (metricsReporting: MetricsReporting) =>
          this.setMetricsReportingPref_(metricsReporting);
      this.addWebUIListener('metrics-reporting-change', setMetricsReportingPref);
-@@ -163,7 +163,7 @@ export class SettingsPersonalizationOptionsElement extends
+@@ -158,7 +158,7 @@ export class SettingsPersonalizationOptionsElement extends
          '#driveSuggestControl');
    }
  
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 e8059c604def..cff46111273a 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,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-index b7a6f38dae504975d974db8bb9f16493eef01c94..f3b4ca6f715003358a4c0af03023e292277423a6 100644
+index c509a5e2e884b52779a4cd48742dcb91fc2cf156..28031445d80db6bb96f43697381377901ca9068c 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-@@ -18,6 +18,7 @@ import '../site_settings/settings_category_default_radio_group.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';
diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch
index b0b4be0a12c2..59298bc03840 100644
--- a/patches/chrome-browser-resources-settings-route.ts.patch
+++ b/patches/chrome-browser-resources-settings-route.ts.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
-index 8a4316281623af03ed6043a361b9d0dab6157fc1..7b44265b8c7a9f616bd0ef3584b2eba3ebaef33f 100644
+index 1c4c5252e82a9d9b595cbfd5423dc1ba1e9235e4..be762f8941d9e29b213cb382fbe76b4ae3fbfef3 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';
@@ -10,7 +10,7 @@ index 8a4316281623af03ed6043a361b9d0dab6157fc1..7b44265b8c7a9f616bd0ef3584b2eba3
  /**
   * Add all of the child routes that originate from the privacy route,
   * regardless of whether the privacy section under basic or advanced.
-@@ -214,6 +215,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
+@@ -212,6 +213,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
        // </if>
      }
    }
diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch
index 252357ad8f45..8c9710951e08 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 43dc33ae5e7cdcb526c1f57a8ea208a95ee02e54..53aba6228950932840cee7043347373b3b129834 100644
+index 52a7cea8cf87e226857ae6c0afa85179952a4a11..6d6f735d6acab0161e0abef77f77846c523887f7 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-tools-optimize_webui.py.patch b/patches/chrome-browser-resources-tools-optimize_webui.py.patch
index 8fd10d184028..302a1f2cd32f 100644
--- a/patches/chrome-browser-resources-tools-optimize_webui.py.patch
+++ b/patches/chrome-browser-resources-tools-optimize_webui.py.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/tools/optimize_webui.py b/chrome/browser/resources/tools/optimize_webui.py
-index fed846255df646626dfc26d079488a9592efcba8..faa107481502bc36db6a7852c3ce92cbc7d5a825 100755
+index 35fa2bb6f6ef15715fbdb5d16769f6e0bb4f91d7..c75f34cecb1008102693933ea18f04010f6cbc0d 100755
 --- a/chrome/browser/resources/tools/optimize_webui.py
 +++ b/chrome/browser/resources/tools/optimize_webui.py
 @@ -26,6 +26,7 @@ import node_modules
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 a3e20ad03ba5..928bf619aaa8 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 fd92ce2cb5c68f9ecea2091950f0626625f56369..66602ba467db75e370a81c8610f804c1b927bd98 100644
+index 2424a3a1332dd3f1e1673609d114cdc2c67bc673..ef0dff855dadddd159617a145f17a58cf8735035 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
-@@ -319,6 +319,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt(
+@@ -258,6 +258,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt(
      std::unique_ptr<ClientDownloadRequest> request) {
    client_download_request_ = std::move(request);
    SanitizeRequest();
diff --git a/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch b/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch
index ccc2f438a7cb..c1761ce58c11 100644
--- a/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch
+++ b/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-index 182721f9238683321ef5645d5506d2e88816f45f..f5b6cb3dcd2a1ecd6b6e4efb79914940a0fb337b 100644
+index 51c061d3bd117c926b74a10deab37d3a694e808b..1ba88c9ae7b4b027b9d63277b2685b1d2c242736 100644
 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 @@ -279,7 +279,7 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch
index 59a94d1cdee0..d38b766fdf85 100644
--- a/patches/chrome-browser-ui-BUILD.gn.patch
+++ b/patches/chrome-browser-ui-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index 7a4cce3c457b49843befd722ee0ff207377827b4..80f6a57e00a2891ab0b8cc2f9024c4b9b30a9975 100644
+index 711454d21314862cf7be2d43790089e4d5f9a592..e650ab736b962116a63c1d76a19b95cdc94a8371 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
 @@ -644,6 +644,7 @@ static_library("ui") {
@@ -10,7 +10,7 @@ index 7a4cce3c457b49843befd722ee0ff207377827b4..80f6a57e00a2891ab0b8cc2f9024c4b9
  
    # TODO(crbug/925153): Remove this circular dependency.
    allow_circular_includes_from = [
-@@ -3587,10 +3588,13 @@ static_library("ui") {
+@@ -3598,10 +3599,13 @@ static_library("ui") {
        ]
        deps += [ "//google_update" ]
      } else {
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 19c45e3fb273..d2f1c41e9184 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,5 +1,5 @@
 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 870b3189bde4e8fde2a3bb4a311d1003c2dc3f4e..20f7de1abe14cf4fee72a3becf234ac9539de6ee 100644
+index f20471c5984c66c32331c15032c8e892624f2968..6cd87a9e922f37133434a6e65eebac343e869bcf 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
 @@ -328,10 +328,12 @@ public class ToolbarTablet extends ToolbarLayout
diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch
index 8c431034822e..6b1e3111d119 100644
--- a/patches/chrome-browser-ui-browser.cc.patch
+++ b/patches/chrome-browser-ui-browser.cc.patch
@@ -1,10 +1,10 @@
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index c764e3607d274b9ec3f645c2b5fc9c8c1e98ad47..b5ce87d4bb91147dcc63e72b0658ab1d66c2ed98 100644
+index 030680ad086128d02d7a1c8adc21b9b1611786c6..748a2f3a204ead17bb29b2c479897e940d23173f 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -446,6 +446,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) {
- // static
- Browser* Browser::Create(const CreateParams& params) {
+@@ -446,6 +446,7 @@ Browser* Browser::Create(const CreateParams& params) {
+   // not possible, e.g. using the wrong profile or during shutdown. The caller
+   // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628.
    CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile));
 +  BRAVE_BROWSER_CREATE
    return new Browser(params);
diff --git a/patches/chrome-browser-ui-browser.h.patch b/patches/chrome-browser-ui-browser.h.patch
index 2f6e7e4f6124..b614c5dcb7f7 100644
--- a/patches/chrome-browser-ui-browser.h.patch
+++ b/patches/chrome-browser-ui-browser.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 69911da4fe7b9894f718fac8d59af1dcc9d18593..39e4b5fc64172da2e044ed5a03f2aed7ac2ae4b9 100644
+index 0c31ee896f98e84d40448f612c82f6306e7e3a21..e931506dceffc50e3dae462c4332f73219104171 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -723,6 +723,7 @@ class Browser : public TabStripModelObserver,
+@@ -722,6 +722,7 @@ class Browser : public TabStripModelObserver,
  
    StatusBubble* GetStatusBubbleForTesting();
  
diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch
index 8b0214b95bb5..6088d836e8f6 100644
--- a/patches/chrome-browser-ui-browser_navigator.cc.patch
+++ b/patches/chrome-browser-ui-browser_navigator.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
-index ca5ad72b0707ea77d762e2a2179717fec1cdb883..558e5e41c40f1f020be0a01b7afa4fd9c6601a85 100644
+index fe7825b8253d3e06e11c353218e73ed9d9d52df6..fba620aa56667bd7576b6013755ec666b6009739 100644
 --- a/chrome/browser/ui/browser_navigator.cc
 +++ b/chrome/browser/ui/browser_navigator.cc
 @@ -485,6 +485,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
@@ -15,6 +15,6 @@ index ca5ad72b0707ea77d762e2a2179717fec1cdb883..558e5e41c40f1f020be0a01b7afa4fd9
    std::string scheme = url.scheme();
    base::StringPiece host = url.host_piece();
 +  if (!IsHostAllowedInIncognitoBraveImpl(host)) return false;
-   if (scheme == chrome::kChromeSearchScheme) {
-     return host != chrome::kChromeUIThumbnailHost &&
-            host != chrome::kChromeUIThumbnailHost2;
+   if (scheme != content::kChromeUIScheme)
+     return true;
+ 
diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch
index 6b1296f824e0..29d74beca04d 100644
--- a/patches/chrome-browser-ui-chrome_pages.cc.patch
+++ b/patches/chrome-browser-ui-chrome_pages.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
-index c6e71c5e8ec5f64cf655b96e0c3dcf13746d6215..045583ff966a93505720109e8adc1715c32d48ba 100644
+index 57f5b56223003be5567b22048b68c780d302ce0d..0c497bfe6687416d4c74ba7a8f347135b0bc5fdc 100644
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
 @@ -305,7 +305,7 @@ void ShowSlow(Browser* browser) {
diff --git a/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch b/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch
index cbe9e9048157..ad4a2b4fdafa 100644
--- a/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch
+++ b/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm
-index 2bcdaecf985d76640ed4e996c7f0f08ff01fdd69..d349f07db552f342dc922a930289af4f6e29d675 100644
+index d53a40c4b7a3ca487e9c40122abfbc58d554e3e2..293a241c703f60d7bec5bb520b44475c0c93a52c 100644
 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm
 +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm
 @@ -41,6 +41,8 @@ const struct AcceleratorMapping {
diff --git a/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch b/patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch
similarity index 50%
rename from patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch
rename to patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch
index 447e8f26124f..915eb909ac93 100644
--- a/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
-index 3dc38bb91c65a077b19c42c4a3acb8d7c616e939..53e0c25ce7fd96580c2b0eaf63949613a6f8cebc 100644
---- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
-+++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
-@@ -47,6 +47,8 @@ constexpr int kNumIgnoredBuckets = 5;
+diff --git a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
+index 36fbd92197bb7419a654689258e431eccb0a2bb4..fd46898c10728156ac8e157c44ed025488d47343 100644
+--- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
++++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
+@@ -42,6 +42,8 @@ constexpr int kNumIgnoredBuckets = 5;
  // we redirect to the safetyCheck page that interacts with these. On other
  // platforms it may be possible to download an updated browser via a site.
  const char* kUpdateBrowserRedirectUrl =
@@ -11,7 +11,7 @@ index 3dc38bb91c65a077b19c42c4a3acb8d7c616e939..53e0c25ce7fd96580c2b0eaf63949613
  #if BUILDFLAG(IS_CHROMEOS_LACROS)
      // The URL to be used to update Lacros-Chrome when auto-update failed
      // for too long.
-@@ -56,6 +58,7 @@ const char* kUpdateBrowserRedirectUrl =
+@@ -51,6 +53,7 @@ const char* kUpdateBrowserRedirectUrl =
      // too long.
      "https://www.google.com/chrome";
  #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 79efbf5c371d..3f270f7a9d78 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 f15dba73a0b60eb75e4cbd70097ec8ec46993c00..40e6e93687a4caf93afc525f97f7b5b527c002d9 100644
+index 8e063b88ae980ccba37604f11d1c7762c1afe66d..e7df2fae3e61ade245bc0c7070fbe9482fb570b2 100644
 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc
 +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc
 @@ -50,7 +50,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 11e10f222729..77c47bb7eb4e 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 53a5f7b7d9295f0f5eadd5e8f736fa9bfc3ce9f8..9ae81d1a7c4fd1e5ba02d497fdf366395f028c9f 100644
+index b7e62ff328c7f7817853464f1606e4c89568ecba..23c6c83db7be375b3c53e3b75168d3d467427f84 100644
 --- a/chrome/browser/ui/extensions/extension_action_view_controller.h
 +++ b/chrome/browser/ui/extensions/extension_action_view_controller.h
 @@ -17,6 +17,7 @@
@@ -18,7 +18,7 @@ index 53a5f7b7d9295f0f5eadd5e8f736fa9bfc3ce9f8..9ae81d1a7c4fd1e5ba02d497fdf36639
    // The different options for showing a popup.
    enum PopupShowAction { SHOW_POPUP, SHOW_POPUP_AND_INSPECT };
  
-@@ -130,6 +132,7 @@ class ExtensionActionViewController
+@@ -135,6 +137,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 53a5f7b7d9295f0f5eadd5e8f736fa9bfc3ce9f8..9ae81d1a7c4fd1e5ba02d497fdf36639
    ExtensionActionViewController* GetPreferredPopupViewController();
  
    // Executes the extension action with |show_action|. If
-@@ -145,6 +148,7 @@ class ExtensionActionViewController
+@@ -150,6 +153,7 @@ class ExtensionActionViewController
    // The popup may not be shown synchronously if the extension is hidden and
    // first needs to slide itself out.
    // Returns true if a popup will be shown.
@@ -34,7 +34,7 @@ index 53a5f7b7d9295f0f5eadd5e8f736fa9bfc3ce9f8..9ae81d1a7c4fd1e5ba02d497fdf36639
    bool TriggerPopupWithUrl(PopupShowAction show_action,
                             const GURL& popup_url,
                             bool grant_tab_permissions);
-@@ -155,6 +159,7 @@ class ExtensionActionViewController
+@@ -160,6 +164,7 @@ class ExtensionActionViewController
                   PopupShowAction show_action);
  
    // 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 4456c7a4cfb0..e14c6a94ba68 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 cb0280678c32365e2c40acd22785cf2846ce2fc8..d1328661f61b703c9c49b7b3238a7ba33d00ffe2 100644
+index cf738ba296933dce1cb6ad5e4eb33f521830663a..d21ac4c891781f663cd05b04f62f6d2da11b0afb 100644
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -372,6 +372,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(bool process_startup) {
+@@ -367,6 +367,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(bool process_startup) {
  #if !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 9484b77c66aa..6f629a1b9c6d 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 3c1e41d70f26eca69563d97ef9b6a58942287a12..abc981beea101560f5c3d75d645ad868592277bd 100644
+index ea5239bedb694a00c3df8ef7bf56dcce8c209588..d3edffd5037e434877d4584a543d58909df98503 100644
 --- a/chrome/browser/ui/startup/startup_tab_provider.cc
 +++ b/chrome/browser/ui/startup/startup_tab_provider.cc
 @@ -269,6 +269,7 @@ StartupTabs StartupTabProviderImpl::GetNewFeaturesTabs(
diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch
index 80972842cf95..17449842ef0a 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 bf6bee037a5c506516f64057c182481509814728..6a69dc633a9cfda5de54ccad0fcbd837e5b4f793 100644
+index eeec62c457c5c90d09b6f25938f52c9856a395f7..6372ad0ef046ae15b71d053e72ed8fb3c7a08e6b 100644
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -531,4 +531,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -551,4 +551,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-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch
index e50e4c4cc74f..690b9f2a2ed0 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,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-index 820135d5bb9090e20c227c3fa54eec982ba3c4a2..01f3f68afbeda3ca35ee2f2a29443b20e45d4a8f 100644
+index e81d40e6883ca0b4d68a8388a1de244a231f4618..e13dc0c9e8b64d48223d4f404e398d28995c9bf1 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 @@ -978,6 +978,7 @@ void BookmarkBarView::Layout() {
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 0fea5f7cc1c3..98eb4c0a0b3f 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,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
-index 2731df13bb49c55e27e4f1e0fa29a50e136742ed..7389dad7ddbc08b36d3ee5aebdc4ef2bb900ad66 100644
+index e003075c2feee3f59e6b5d90692ccb182d60f3f9..7a974baacd3f11af3d9026de25949e569dabd2d1 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
 @@ -227,6 +227,7 @@ void BookmarkBubbleView::ShowBubble(
diff --git a/patches/chrome-browser-ui-views-frame-browser_view.h.patch b/patches/chrome-browser-ui-views-frame-browser_view.h.patch
index 0d3350cbcd57..f9f845006ca4 100644
--- a/patches/chrome-browser-ui-views-frame-browser_view.h.patch
+++ b/patches/chrome-browser-ui-views-frame-browser_view.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
-index 05dd759a2cf5b3f8c81274289b0179b3e4f9580b..21e2adf5e6dd548f9818766d0733d698d2e640ae 100644
+index 9c99d9de95f54ba303e5346028701a06c9988ecf..67c13fa0c67e4dd1b4a21ae485f45583e8f86cd4 100644
 --- a/chrome/browser/ui/views/frame/browser_view.h
 +++ b/chrome/browser/ui/views/frame/browser_view.h
-@@ -695,6 +695,7 @@ class BrowserView : public BrowserWindow,
+@@ -698,6 +698,7 @@ class BrowserView : public BrowserWindow,
      return accessibility_focus_highlight_.get();
    }
  
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 02dd466f2031..2b1866a4d5f7 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 bd32df221bf3fc461df0a1a7fb410bbdc2e3f4d2..8b63aa2b13ecf5e71db62ff995d39af4e9a036a5 100644
+index 23d5b39adba1bfe660ef2f63a60d284f73f88b0d..9ae7d099df7fa4392450ce76e793d4e29b7f1301 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() {
+@@ -661,6 +661,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 3dfcb0544ba2..cee7d8e13de6 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 26cbce1542b4818bf5084c037d4de98240c05166..311163b3378d4105317d69fc346ecf4a46033364 100644
+index 9d5cbe44b34c954e24de1bf26ca95e5b65ff78d9..1d6f39d07eecbb9d67b5db139981936fc02b16c5 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,
@@ -18,7 +18,7 @@ index 26cbce1542b4818bf5084c037d4de98240c05166..311163b3378d4105317d69fc346ecf4a
    void Update(content::WebContents* contents);
  
    // Clears the location bar's state for |contents|.
-@@ -260,6 +262,7 @@ class LocationBarView : public LocationBar,
+@@ -265,6 +267,7 @@ class LocationBarView : public LocationBar,
    std::vector<ContentSettingImageView*>& GetContentSettingViewsForTest() {
      return content_setting_views_;
    }
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
new file mode 100644
index 000000000000..0d4d9759e90a
--- /dev/null
+++ b/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch
@@ -0,0 +1,12 @@
+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 1f2dcf103cc2919a35ed3b97ba0a8353c17c8b1d..dccb11e3252edf80c7dee6240ea9327ea6d64bf6 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
+@@ -464,6 +464,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());
++    BRAVE_PAGE_INFO_MAIN_VIEW_CALCULATE_PREFERRED_SIZE
+   }
+   return gfx::Size(width, views::View::GetHeightForWidth(width));
+ }
diff --git a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch
index cd2c78842a0f..458143e76bec 100644
--- a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch
+++ b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
-index 1884b6ed4ae7fa1a8d4b1390da531a123f989355..399ea74fa2f1992a705420e4e3db76a919d1673a 100644
+index 9e8ff61361b8dc7c53b7a3ad08664cb04c8def7f..e34eaa0acf483027b64b82552cc5900666eadee5 100644
 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc
 +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
-@@ -196,6 +196,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
+@@ -209,6 +209,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
      const PageInfo::PermissionInfo& info) {
    const gfx::VectorIcon* icon = &gfx::kNoneIcon;
    switch (info.type) {
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
index f1bb1ce8c6ad..4826a4106f97 100644
--- 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
@@ -1,8 +1,8 @@
 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 c7aeb84058c5441b7cac58dd54ac1faebe0f2ef3..6a37c2e31357e5e915ed70b64ad2a475da6b722d 100644
+index a36c8c594bc6553a200f589ac13a389b374d0b63..0e0841fe9befc760ecf096fe8bcfbd5223953669 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
-@@ -136,6 +136,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
+@@ -140,6 +140,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
  
    for (permissions::PermissionRequest* request : GetVisibleRequests())
      AddRequestLine(request);
diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch
index 837deb4e7818..f000c3324bff 100644
--- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch
+++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h
-index 00c3df0c614714076cc2cf788729e45a02a1e9c6..45fcf2405505265e0913a89bab46bc6fbbd00577 100644
+index 4118ac3c8217bc8e1b5b3285520bf6da429de6e8..02733535179ffe1ed86a529d546cd7dd39659b44 100644
 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h
 +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h
 @@ -168,6 +168,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate,
diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch
index d72e5ea625a6..fb79430d3c0d 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 6a03c51ed0259c074add49c53cdd1bab7fceec92..83481324ebdc620cf6d45211bd98905044114831 100644
+index 66247122c1e1b1cc9802912b34c2064863e296e4..4b154bc71749820e586a753105ecf96677ca77ef 100644
 --- a/chrome/browser/ui/views/tabs/tab.cc
 +++ b/chrome/browser/ui/views/tabs/tab.cc
 @@ -384,6 +384,7 @@ void Tab::Layout() {
@@ -10,3 +10,11 @@ index 6a03c51ed0259c074add49c53cdd1bab7fceec92..83481324ebdc620cf6d45211bd989050
      } else if (showing_close_button_) {
        // Allow the title to overlay the close button's empty border padding.
        title_right = close_x - after_title_padding;
+@@ -990,6 +991,7 @@ void Tab::UpdateIconVisibility() {
+       available_width -= favicon_width;
+ 
+     showing_close_button_ = large_enough_for_close_button;
++    BRAVE_UI_VIEWS_TABS_TAB_UPDATE_ICON_VISIBILITY
+     if (showing_close_button_)
+       available_width -= close_button_width;
+ 
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 cc25dc8cdde9..73d695bd8b26 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 f887f0fd2db37af243f25c23a8d6bf8e8faf8f7e..1a735e155034bc4b9609cf69ae3d33115dd02ffe 100644
+index f9688138a7e871857ce71793e09a562fae582b6f..b0777d504e6677b86184f49b5c8332de34e0026e 100644
 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -359,6 +359,7 @@ void ToolbarView::Init() {
+@@ -361,6 +361,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_view.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
index 23f98abd61e0..e024480f7c6a 100644
--- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
-index bce2d3d3aa573a245abeaf89817a80a6382d9801..3e75d96891da7e568bb79c3412ebe1ec64244938 100644
+index 28e65134994f60e5ccfa8e714676995ef41ee048..74afc55a2f4d6513fa1d7c230be67026d4e45886 100644
 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
 +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
 @@ -204,7 +204,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
diff --git a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch
index 60710828c1ab..f774f360cc3b 100644
--- a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch
+++ b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
-index 54fe2e48cde408898820773ba74e4c9185de98c8..847c0d2874271bd852589e0a0fe38a9be4d19729 100644
+index d187871aba41d857f8661a6bd568b22fb0fdc0f3..b43959d66d9ea2c190b106359e88191c6b1a7a6f 100644
 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
 +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
-@@ -135,6 +135,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) {
+@@ -133,6 +133,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) {
                          ? "enable-branding-update"
                          : "");
  
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 51e9cd6b8782..91c78b1c52c2 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 7951094ef4061c6f3007345b5577dddec715b892..3f7b8b3e88cb627b7bd8b7578a5d5446e0d7561c 100644
+index f86a9fc0935e136d99423672abe26327ba813946..3b7e02abc4a0252a2dac1bfa893dd44bcee0eafd 100644
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -1238,6 +1238,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
+@@ -1241,6 +1241,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
  
  // static
  ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch
index a858480524cb..348c8d32c7bc 100644
--- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch
+++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch
@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-index c2d1b9fe9bcd002f636abd30238399a5d37f3445..1ac0e7723f28110954d5dd3943659ddd41bf8520 100644
+index a4cd3e850b1561464bfded941c65aa07fa199a75..92dc69194c54d7459675df29da6fb8e3d06ad74e 100644
 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
 +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-@@ -334,6 +334,8 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile,
-       kExtensionsMenuAccessControlEnabled,
+@@ -335,6 +335,8 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile,
+       kUseNewSiteAccessPage,
        base::FeatureList::IsEnabled(features::kExtensionsMenuAccessControl));
  
 +  BraveAddExtensionsResources(source);
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 df3c7c3e4282..ffc9081bf919 100644
--- a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch
+++ b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc
-index 6d7011abcab2444f470943ce0d71ed5f3df89916..3d3b2aa9e33421e262703556f83dad253cac5005 100644
+index d80848702985b2416c4cd5326c809fd8c44caaea..a1a94009218f8c4bf80ce963bcbf476f5970d6ca 100644
 --- a/chrome/browser/ui/webui/history/history_ui.cc
 +++ b/chrome/browser/ui/webui/history/history_ui.cc
-@@ -63,6 +63,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) {
+@@ -66,6 +66,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) {
    content::WebUIDataSource* source =
        content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost);
  
diff --git a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch
index 406bd2a36de8..a6a5edf1a4ec 100644
--- a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch
+++ b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc
-index 09f8524b9635eceaf579b7bc99657a4e5255eba9..6e84d8fb21d0048cf2587a58d0e528373be7846c 100644
+index 21d8f980f4ff164d0e8428792dba7a71271a71c0..d2ca76e9898f32e337b8718586abab32f51e957c 100644
 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc
 +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc
 @@ -131,6 +131,7 @@ void ImportDataHandler::HandleImportData(const base::ListValue* args) {
@@ -10,7 +10,7 @@ index 09f8524b9635eceaf579b7bc99657a4e5255eba9..6e84d8fb21d0048cf2587a58d0e52837
  
    const importer::SourceProfile& source_profile =
        importer_list_->GetSourceProfileAt(browser_index);
-@@ -212,6 +213,7 @@ void ImportDataHandler::SendBrowserProfileData(const std::string& callback_id) {
+@@ -211,6 +212,7 @@ void ImportDataHandler::SendBrowserProfileData(const std::string& callback_id) {
      browser_profile->SetBoolean(
          "autofillFormData",
          (browser_services & importer::AUTOFILL_FORM_DATA) != 0);
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 3c8e30597593..9b744099e6da 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 5cc85acbe911f0219b307d492a6e52f20c196b51..54bb582f75286b11adc372b59f3c5dfed5a1a211 100644
+index f92240357c9e04d559eb2c8d52b2c9f678a63d47..1117825b5f31a548711aec266344833b08a81cd4 100644
 --- a/chrome/browser/ui/webui/settings/people_handler.cc
 +++ b/chrome/browser/ui/webui/settings/people_handler.cc
-@@ -820,6 +820,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
+@@ -817,6 +817,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 5cc85acbe911f0219b307d492a6e52f20c196b51..54bb582f75286b11adc372b59f3c5dfe
    DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount(
        signin::ConsentLevel::kSync));
    syncer::SyncService* service = GetSyncService();
-@@ -870,6 +871,7 @@ std::unique_ptr<base::DictionaryValue> PeopleHandler::GetSyncStatusDictionary()
+@@ -867,6 +868,7 @@ std::unique_ptr<base::DictionaryValue> PeopleHandler::GetSyncStatusDictionary()
        service && !disallowed_by_policy && service->IsSetupInProgress() &&
            !service->GetUserSettings()->IsFirstSetupComplete() &&
            identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync));
@@ -18,7 +18,7 @@ index 5cc85acbe911f0219b307d492a6e52f20c196b51..54bb582f75286b11adc372b59f3c5dfe
  
    const SyncStatusLabels status_labels = GetSyncStatusLabels(profile_);
    // TODO(crbug.com/1027467): Consider unifying some of the fields below to
-@@ -1022,6 +1024,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() {
+@@ -1019,6 +1021,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 e9a252b14356..500472bb7879 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 d61b3f37a31d0c67db35f8770d4c51af62af3221..085113f041c7716365b3ccef39a7695463172630 100644
+index 14b31a7edace8316966b37fa9f1583a5d5d76861..297b1d911173cc5668ec2493095fa40b7c2424f9 100644
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -2859,6 +2859,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -2903,6 +2903,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
    policy_indicator::AddLocalizedStrings(html_source);
    AddSecurityKeysStrings(html_source);
  
diff --git a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
index cfbfc57d1883..92a294a77ae2 100644
--- a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
+++ b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
-index ee0bee4e7ea5f290da4c3b36aed07a3c9fbd584a..67f0067cfb16cb5856546a137ae97750f3cda336 100644
+index 204ff494f4f6592d927282dcbb1ab49b2ee9abbf..808cdd47c77cad0d9dab83c329928100064870b3 100644
 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
 +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
 @@ -480,7 +480,7 @@ void UpgradeDetectorImpl::Init() {
diff --git a/patches/chrome-browser-web_applications-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-web_app_shortcut_mac.mm.patch
index 476d4f4b0cd7..91d050fe1a4c 100644
--- a/patches/chrome-browser-web_applications-web_app_shortcut_mac.mm.patch
+++ b/patches/chrome-browser-web_applications-web_app_shortcut_mac.mm.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/web_applications/web_app_shortcut_mac.mm b/chrome/browser/web_applications/web_app_shortcut_mac.mm
-index 98ae50a08e99a3a4c013065a94b09d4b22e8e863..ff385b34a227b3457f485cfb0b111f9a02d9a2d8 100644
+index eb23fced2d42ad2fcd4492525db64fd6e661367b..37d5552e5ce59ab252b5e3536b98255c6cb2cac7 100644
 --- a/chrome/browser/web_applications/web_app_shortcut_mac.mm
 +++ b/chrome/browser/web_applications/web_app_shortcut_mac.mm
 @@ -765,6 +765,7 @@ base::FilePath GetChromeAppsFolder() {
diff --git a/patches/chrome-chrome_repack_locales.gni.patch b/patches/chrome-chrome_repack_locales.gni.patch
index fa22462131b5..ee35067de4cc 100644
--- a/patches/chrome-chrome_repack_locales.gni.patch
+++ b/patches/chrome-chrome_repack_locales.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
-index e9dfe6bb49914fcfa7202cfba9d2408e686ba7f1..b9ae4b54e462f83185c26e8cf0d92e20395d7e16 100644
+index 3425f1fef4917167a5e22fff18b53bf0b22f7cfb..d228913dec72480894fd506a39184a8fc8914de9 100644
 --- a/chrome/chrome_repack_locales.gni
 +++ b/chrome/chrome_repack_locales.gni
 @@ -37,6 +37,7 @@ template("chrome_repack_locales") {
diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch
index 52f30663209e..404ac20a7e4c 100644
--- a/patches/chrome-common-BUILD.gn.patch
+++ b/patches/chrome-common-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
-index 40888f0caf2dedbd1e592d080dbb8e56e4a13814..3d8ea5dcc9f49ccd4fff8e726ebde85495b1da33 100644
+index 8b3cfdd7a95ccc77c6acb0baa959b851183a7f49..812d909b0827a318df5174aa2e3e023429b36e9c 100644
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
 @@ -86,6 +86,7 @@ source_set("channel_info") {
@@ -10,7 +10,7 @@ index 40888f0caf2dedbd1e592d080dbb8e56e4a13814..3d8ea5dcc9f49ccd4fff8e726ebde854
  }
  
  source_set("ini_parser") {
-@@ -552,6 +553,7 @@ static_library("non_code_constants") {
+@@ -551,6 +552,7 @@ static_library("non_code_constants") {
      "//printing/buildflags",
      "//ui/base:buildflags",
    ]
diff --git a/patches/chrome-common-extensions-chrome_extensions_client.cc.patch b/patches/chrome-common-extensions-chrome_extensions_client.cc.patch
index 248bedf95af9..33c094b7d010 100644
--- a/patches/chrome-common-extensions-chrome_extensions_client.cc.patch
+++ b/patches/chrome-common-extensions-chrome_extensions_client.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
-index a15c7c43bfa09265ef1bf723be0a63ea8195bd39..07a4df3f63be14c3afcc3bda34a4c1212ebf10f5 100644
+index 258ce86282eb035fcf58015f82ce325f5fd6b154..5eab5dce31961cead7560741300cfbcf5b134233 100644
 --- a/chrome/common/extensions/chrome_extensions_client.cc
 +++ b/chrome/common/extensions/chrome_extensions_client.cc
 @@ -13,6 +13,7 @@
@@ -10,7 +10,7 @@ index a15c7c43bfa09265ef1bf723be0a63ea8195bd39..07a4df3f63be14c3afcc3bda34a4c121
  #include "chrome/common/chrome_resource_request_blocked_reason.h"
  #include "chrome/common/chrome_switches.h"
  #include "chrome/common/extensions/chrome_extensions_api_provider.h"
-@@ -56,6 +57,7 @@ const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh";
+@@ -54,6 +55,7 @@ const char kExtensionBlocklistHttpsUrlPrefix[] =
  ChromeExtensionsClient::ChromeExtensionsClient() {
    AddAPIProvider(std::make_unique<ChromeExtensionsAPIProvider>());
    AddAPIProvider(std::make_unique<CoreExtensionsAPIProvider>());
diff --git a/patches/chrome-installer-setup-BUILD.gn.patch b/patches/chrome-installer-setup-BUILD.gn.patch
index f11eddf97c49..95785ace2d35 100644
--- a/patches/chrome-installer-setup-BUILD.gn.patch
+++ b/patches/chrome-installer-setup-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn
-index 737e063aa9d4ad3e1cdf2bcf4a9b4b27336191b9..b793639f7a6d6d30a86969d59547350505454263 100644
+index f3964983b8a917184453fffcb5a8537f29f11eea..d939db0d317d22266cc3016c1572247e973afb00 100644
 --- a/chrome/installer/setup/BUILD.gn
 +++ b/chrome/installer/setup/BUILD.gn
-@@ -49,6 +49,7 @@ if (is_win) {
+@@ -51,6 +51,7 @@ if (is_win) {
      ]
  
      libs = [ "netapi32.lib" ]
diff --git a/patches/chrome-installer-util-shell_util.cc.patch b/patches/chrome-installer-util-shell_util.cc.patch
index f82eb9f94e90..0871441a45a4 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 f07d400fc58a920556defbf7591f5973ba547ffd..f2443b67e4cbd588b72b417d55bc986d927ffcd1 100644
+index 2a6c3a877a3ed15aafa76debdd2d20a280d12bda..b8f9ccd9aa74983292c531ca05af97b02d8f39bb 100644
 --- a/chrome/installer/util/shell_util.cc
 +++ b/chrome/installer/util/shell_util.cc
-@@ -357,6 +357,7 @@ void GetChromeProgIdEntries(
+@@ -361,6 +361,7 @@ void GetChromeProgIdEntries(
    app_info.delegate_clsid = install_static::GetLegacyCommandExecuteImplClsid();
  
    GetProgIdEntries(app_info, entries);
@@ -10,7 +10,7 @@ index f07d400fc58a920556defbf7591f5973ba547ffd..f2443b67e4cbd588b72b417d55bc986d
  
    if (!app_info.delegate_clsid.empty()) {
      auto delegate_execute_entries =
-@@ -453,6 +454,7 @@ void GetShellIntegrationEntries(
+@@ -457,6 +458,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 f07d400fc58a920556defbf7591f5973ba547ffd..f2443b67e4cbd588b72b417d55bc986d
      entries->push_back(std::make_unique<RegistryEntry>(
          capabilities + L"\\FileAssociations",
          ShellUtil::kPotentialFileAssociations[i], html_prog_id));
-@@ -477,6 +479,7 @@ void GetAppExtRegistrationEntries(
+@@ -481,6 +483,7 @@ void GetAppExtRegistrationEntries(
    std::wstring key_name =
        base::StrCat({ShellUtil::kRegClasses, kFilePathSeparator, ext,
                      kFilePathSeparator, ShellUtil::kRegOpenWithProgids});
@@ -26,7 +26,7 @@ index f07d400fc58a920556defbf7591f5973ba547ffd..f2443b67e4cbd588b72b417d55bc986d
    entries->push_back(
        std::make_unique<RegistryEntry>(key_name, prog_id, std::wstring()));
  }
-@@ -716,6 +719,7 @@ std::wstring GetTargetForDefaultAppsSettings(const wchar_t* protocol) {
+@@ -720,6 +723,7 @@ std::wstring GetTargetForDefaultAppsSettings(const wchar_t* protocol) {
      return base::StringPrintf(kSystemSettingsDefaultAppsFormat, L"Browser");
    if (base::EqualsCaseInsensitiveASCII(protocol, L"mailto"))
      return base::StringPrintf(kSystemSettingsDefaultAppsFormat, L"Email");
@@ -34,7 +34,7 @@ index f07d400fc58a920556defbf7591f5973ba547ffd..f2443b67e4cbd588b72b417d55bc986d
    return L"SettingsPageAppsDefaultsProtocolView";
  }
  
-@@ -1678,8 +1682,10 @@ const wchar_t* ShellUtil::kPotentialFileAssociations[] = {
+@@ -1721,8 +1725,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 12fe22d5415f..9d89275fdd7e 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 7886a0d86b24308090e995893e14cb95cdd70c6a..5915da2050ecb08c544a2c2a25053dd57ed9cfcd 100644
+index 84b3ee712d563aa6d75a5c5472f4b4bfbc7d6ff3..a134f34e839217735a403649b8df5e79030212fc 100644
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -237,6 +237,7 @@ static_library("renderer") {
+@@ -238,6 +238,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 6977956dd83c..be6be68197e6 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 b1753145c4c82e5d15b0d658967d0affc34792a0..63ee129f335c6c290a1363cf1a3a0dd1df6f4464 100644
+index 14c199c88ba6ae7726b50eea243266846d1a2357..2dc0f4d5738e146b65175527cbbc84e6e84bf3da 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -534,7 +534,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -540,7 +540,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
        ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher());
  #endif
    content_settings::ContentSettingsAgentImpl* content_settings =
diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch
index 8a8f9fa63ede..a731bf9c1f41 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 9038c4ed2f0260ed5f016303d550b3241e5bdf41..916d873414d7167ffabf0784e314e67e497d4403 100644
+index 8204d4d8753b334b8437cacfe0528d8496cd05d0..b17d0416a45d0868da36ec75b3157096d2749a17 100644
 --- a/chrome/renderer/chrome_content_renderer_client.h
 +++ b/chrome/renderer/chrome_content_renderer_client.h
-@@ -229,6 +229,7 @@ class ChromeContentRendererClient
+@@ -227,6 +227,7 @@ class ChromeContentRendererClient
  #endif
  
   private:
diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
index c18d835d06eb..21984560b1a3 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 3eb5f8189665090c95ba3f7c08c34b23062c7bf0..96e019775e4345ffd2b64abe71e1de4b935da624 100644
+index 34879952fe93edb2e4adfbf008eca87464055cd0..1f47ad8b3a584793b15bf547cc7e13baabe436ad 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -337,6 +337,7 @@ static_library("test_support") {
+@@ -308,6 +308,7 @@ static_library("test_support") {
      "//ui/gl",
    ]
  
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 b2f98ebb5173..107e5db22867 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 2f289db26c670791bee5a54424fc848cfae1a493..ba98c39dc5d083ded5e81677ca71c1870e47974b 100644
+index 6aecfcf25142f3ebeb8c2d6027ef12c9925f97ef..ba0cfbbe03e8f3c3263280e11c56a06fb5775df6 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
-@@ -432,7 +432,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -446,7 +446,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              if (queryHasChanged) getInfoForOrigins();
              return true;
          }
diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch
index f9118986ea02..b47039fe7ba7 100644
--- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch
+++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml
-index ef12efea9398c51c3397a51cfd7d6c661d7778da..e6c70274561d08f86553c25f0a4925eb45f76c25 100644
+index edb5ee3ce1b7d063df962597edb19d184c7de3aa..b3ee2c34ec0469a219d17fceb277976cb88c9459 100644
 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml
 +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml
 @@ -70,7 +70,7 @@
diff --git a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch
index 1297d5ebfedb..d0035bcac7b3 100644
--- a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch
+++ b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc
-index 3900d2f43608d7914b294c2a0bcbf0f2de87e4cf..641a6a0e33506c8c6b94d9104e68730773f25622 100644
+index e2b7798e87cad7dcb4429f730b201376f9781812..2d3c8072451323f5ba6ff928e2fdcefc0f6e0212 100644
 --- a/components/content_settings/browser/page_specific_content_settings.cc
 +++ b/components/content_settings/browser/page_specific_content_settings.cc
-@@ -455,6 +455,7 @@ bool PageSpecificContentSettings::IsContentBlocked(
+@@ -446,6 +446,7 @@ bool PageSpecificContentSettings::IsContentBlocked(
        content_type == ContentSettingsType::ADS ||
        content_type == ContentSettingsType::SOUND ||
        content_type == ContentSettingsType::CLIPBOARD_READ_WRITE ||
@@ -10,7 +10,7 @@ index 3900d2f43608d7914b294c2a0bcbf0f2de87e4cf..641a6a0e33506c8c6b94d9104e687307
        content_type == ContentSettingsType::SENSORS ||
        content_type == ContentSettingsType::GEOLOCATION) {
      const auto& it = content_settings_status_.find(content_type);
-@@ -478,6 +479,7 @@ bool PageSpecificContentSettings::IsContentAllowed(
+@@ -469,6 +470,7 @@ bool PageSpecificContentSettings::IsContentAllowed(
        content_type != ContentSettingsType::PPAPI_BROKER &&
        content_type != ContentSettingsType::MIDI_SYSEX &&
        content_type != ContentSettingsType::CLIPBOARD_READ_WRITE &&
diff --git a/patches/components-content_settings-core-browser-BUILD.gn.patch b/patches/components-content_settings-core-browser-BUILD.gn.patch
index 56f71b1f74a5..a8e1c118adc9 100644
--- a/patches/components-content_settings-core-browser-BUILD.gn.patch
+++ b/patches/components-content_settings-core-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
-index 03c34b6a13383d1882cddc34bd4b72e17f6cfc8d..e60f178e6d649af6df51d8350441403329b463c3 100644
+index dbb8fbafd1e301f898b5edb79036004765f2e2f7..430d01f881dd6da848c272cdb921e6666cd617d8 100644
 --- a/components/content_settings/core/browser/BUILD.gn
 +++ b/components/content_settings/core/browser/BUILD.gn
-@@ -61,6 +61,7 @@ static_library("browser") {
+@@ -62,6 +62,7 @@ static_library("browser") {
      "//services/tracing/public/cpp",
      "//url",
    ]
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 5cb2e5b3bfb5..9bfaf8b594c4 100644
--- a/patches/components-content_settings-core-browser-cookie_settings.cc.patch
+++ b/patches/components-content_settings-core-browser-cookie_settings.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
-index 3d766d54fc75afb027dd48a02bfe3f1cf4b08655..b3205408e2e715a32cafd9753731791de7cd089a 100644
+index 0a6874399822ae154a207fc71f079e32874677c9..29c07fe6d40066f885d7fbf6d64dd386a3e4108d 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(
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 5791ca6af9ad..6ebd8fcf8f64 100644
--- a/patches/components-download-internal-common-download_item_impl.cc.patch
+++ b/patches/components-download-internal-common-download_item_impl.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc
-index c6d66c5b008f0846a57e6038bdbd02452070eb45..4c0f0f389f946ab30e9db6b88ee002aa143b345f 100644
+index 35afa0b40cce4f3b5f0a351778d0f880cc181833..4c4619a85af8146f1bdec925e4e764937451ec1c 100644
 --- a/components/download/internal/common/download_item_impl.cc
 +++ b/components/download/internal/common/download_item_impl.cc
 @@ -2041,8 +2041,8 @@ void DownloadItemImpl::OnDownloadCompleting() {
diff --git a/patches/components-infobars-core-infobar_delegate.h.patch b/patches/components-infobars-core-infobar_delegate.h.patch
index 819d4cd74af8..806292f792bd 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 f2112e5970f55e50a55f8f7647d0a284e0787eff..bc79520c918ed6851dca56d2b65ff216c36bb73d 100644
+index b883b4732486b223465ad8258d4eb816f70f20cc..fce108403a6547d07ef1103932d209d9caac1f20 100644
 --- a/components/infobars/core/infobar_delegate.h
 +++ b/components/infobars/core/infobar_delegate.h
 @@ -176,6 +176,7 @@ class InfoBarDelegate {
diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch
index e0309c7b887c..aae76effeeab 100644
--- a/patches/components-omnibox-browser-BUILD.gn.patch
+++ b/patches/components-omnibox-browser-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
-index 4fee3b9499793858ad8c0992503f7389377b6ca4..319eb0288275ad176ac925dface34b09a66a4605 100644
+index 855dda369906aafa826dc193e48d482da155cca4..d335b09f392548e0ee04c21b35786b1e2be4a313 100644
 --- a/components/omnibox/browser/BUILD.gn
 +++ b/components/omnibox/browser/BUILD.gn
 @@ -284,6 +284,7 @@ static_library("browser") {
diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch
index add8be31cf78..ffc6b369332c 100644
--- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch
+++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
-index 4dac8aa8486a347b4ccef59ccb0eeacab0e9661f..15fc6861dbc16d092beb63b68d1854bc4137d996 100644
+index 41f1743b6719eafd3d34ce35a97af470314e6d16..4054b89e9647e24c3a3b8f699f9adb4c0fd98d4e 100644
 --- a/components/omnibox/browser/autocomplete_controller.cc
 +++ b/components/omnibox/browser/autocomplete_controller.cc
 @@ -289,6 +289,7 @@ AutocompleteController::AutocompleteController(
diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
index d0043e8dca4b..44b524424dcb 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 b715124d548873d6564fe316fbdb3fe39fddd7e9..0daf721c2ee289d72f14e8c9e8610f945ed13b55 100644
+index b90a764946968dd54a059525d939789ac57c2cc8..d543ee66ff698aa60c5f8e73e055a9b6ed86d108 100644
 --- a/components/omnibox/browser/omnibox_edit_model.cc
 +++ b/components/omnibox/browser/omnibox_edit_model.cc
-@@ -395,6 +395,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
+@@ -399,6 +399,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-key_storage_keyring.cc.patch b/patches/components-os_crypt-key_storage_keyring.cc.patch
index 02079031252d..97da905c2988 100644
--- a/patches/components-os_crypt-key_storage_keyring.cc.patch
+++ b/patches/components-os_crypt-key_storage_keyring.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/os_crypt/key_storage_keyring.cc b/components/os_crypt/key_storage_keyring.cc
-index 3ad654cf4a893f497ac4567aea77f8d1f2e1525f..45b0c54dc83df1b37587dd60416c64ff4d355087 100644
+index 1b14e4c0ee3b5510ca6c4b968fe53c66622203d4..675fa638ee9a417aafb4bbd29785276093003f27 100644
 --- a/components/os_crypt/key_storage_keyring.cc
 +++ b/components/os_crypt/key_storage_keyring.cc
 @@ -45,6 +45,7 @@ absl::optional<std::string> KeyStorageKeyring::GetKeyImpl() {
diff --git a/patches/components-os_crypt-key_storage_linux.cc.patch b/patches/components-os_crypt-key_storage_linux.cc.patch
index 20820316d8c6..c6eef1907a9c 100644
--- a/patches/components-os_crypt-key_storage_linux.cc.patch
+++ b/patches/components-os_crypt-key_storage_linux.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/os_crypt/key_storage_linux.cc b/components/os_crypt/key_storage_linux.cc
-index 7faca2d58fa595905056e1ffd32a5686003532db..ea0fd265f432a586f4b5172b135df17b1490bc97 100644
+index b42b31b0948e4e29e6159985bf1b3bc0251e731f..83c6d5b09a6c97824778e37e151bf2e2a5a2d5cc 100644
 --- a/components/os_crypt/key_storage_linux.cc
 +++ b/components/os_crypt/key_storage_linux.cc
 @@ -33,8 +33,7 @@
diff --git a/patches/components-page_info-BUILD.gn.patch b/patches/components-page_info-BUILD.gn.patch
index 4d50ff769e83..06ea251b290c 100644
--- a/patches/components-page_info-BUILD.gn.patch
+++ b/patches/components-page_info-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/components/page_info/BUILD.gn b/components/page_info/BUILD.gn
-index d933a85f7844bb746483478f0247d6a8f1c62e8e..f7298343596de09136dd36abe08de204f1d5e1fe 100644
+index 5d69b2e6cbac8b2fd7aca9314bb72fd4dec42074..0bdc230bed47fd9e1d05f043bf85f8a202b4507f 100644
 --- a/components/page_info/BUILD.gn
 +++ b/components/page_info/BUILD.gn
-@@ -47,6 +47,7 @@ static_library("page_info") {
+@@ -70,6 +70,7 @@ static_library("page_info") {
      "//services/device/public/cpp:device_features",
      "//services/metrics/public/cpp:ukm_builders",
    ]
diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch
index 46e045846dd3..581b2c12e00d 100644
--- a/patches/components-page_info-page_info.cc.patch
+++ b/patches/components-page_info-page_info.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
-index e0a09a3fa24b119f57221a92f43caf9ecde3f815..f8ffc12b500a55e70984708e49ed3e04f6e1a83e 100644
+index 0798bf1f073c5853d26463e828147832e9b6a76c..1a7736d494586df67c0dcf1072a9f9e382b81fde 100644
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -963,6 +963,7 @@ void PageInfo::PresentSitePermissions() {
+@@ -970,6 +970,7 @@ void PageInfo::PresentSitePermissions() {
        }
      }
  
diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch
index 0ddfdfe39826..be88f9a6efdc 100644
--- a/patches/components-password_manager-core-browser-login_database.cc.patch
+++ b/patches/components-password_manager-core-browser-login_database.cc.patch
@@ -1,12 +1,12 @@
 diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc
-index 430eb2caceef14621accd81785eaeee41c37998b..ac45baff0164f4e5a510bb332776a8775ae57f2a 100644
+index aed160f1d2681eec64f5f5cb96413e11beb1ae8f..7c0d98707c22914f3abf42eccc47f1f4de7c5a53 100644
 --- a/components/password_manager/core/browser/login_database.cc
 +++ b/components/password_manager/core/browser/login_database.cc
-@@ -1771,6 +1771,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
+@@ -1766,6 +1766,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
      EncryptionResult result = InitPasswordFormFromStatement(
          *statement, /*decrypt_and_fill_password_value=*/true, &primary_key,
          new_form.get());
 +    BRAVE_STATEMENT_TO_FORMS
-     if (result == ENCRYPTION_RESULT_SERVICE_FAILURE)
+     if (result == ENCRYPTION_RESULT_SERVICE_FAILURE) {
        return FormRetrievalResult::kEncrytionServiceFailure;
-     if (result == ENCRYPTION_RESULT_ITEM_FAILURE) {
+     }
diff --git a/patches/components-permissions-permission_context_base.h.patch b/patches/components-permissions-permission_context_base.h.patch
index 33f65233c03a..0b47eb379ad5 100644
--- a/patches/components-permissions-permission_context_base.h.patch
+++ b/patches/components-permissions-permission_context_base.h.patch
@@ -1,5 +1,5 @@
 diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h
-index 37f849f67c519e59fdc6747fe8262cda3de74723..d24fddd17707109b2e1cc593b2529dfa7958a5d6 100644
+index a16166f7701a9f9fa6cf2db997689a8d79caa899..6509964da9ad64619733fe330a1701efdbf39450 100644
 --- a/components/permissions/permission_context_base.h
 +++ b/components/permissions/permission_context_base.h
 @@ -125,6 +125,7 @@ class PermissionContextBase : public KeyedService,
diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch
index 14ee3849da77..1c4d3781ff65 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 afa60922b31d68e5013e06c5e0807852edabced5..e2d8b60aed4a89b9c31c7e759b0c9b8d2158e19a 100644
+index 32c67dcbcc4fdf39d1318f98b5fa67fd0e064f95..e5ad8fc951904847cd6dfb0082a6a020daea7b6a 100644
 --- a/components/permissions/permission_uma_util.cc
 +++ b/components/permissions/permission_uma_util.cc
 @@ -112,6 +112,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) {
diff --git a/patches/components-permissions-request_type.cc.patch b/patches/components-permissions-request_type.cc.patch
index f5c4bac65c47..6578377e72fb 100644
--- a/patches/components-permissions-request_type.cc.patch
+++ b/patches/components-permissions-request_type.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/permissions/request_type.cc b/components/permissions/request_type.cc
-index 8ce64fc326b41595397c4c911f44e36bdffdecf6..051ec90815a559db72c77c38af62b365e84e4dfb 100644
+index 488d261ff643032548f7401ae5871cb2a506b204..1962f8dadf764d1ef0fe946c83fe492015d41c3e 100644
 --- a/components/permissions/request_type.cc
 +++ b/components/permissions/request_type.cc
-@@ -303,6 +303,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) {
+@@ -335,6 +335,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) {
      case permissions::RequestType::kWindowPlacement:
        return "window_placement";
  #endif
diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch
index b117b8b53c39..73067efae9d2 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 4d4017c072b84ba2f697b82e5204521ebba02e6f..f1d22dc8351bed47c75f1ca7ed93844bfa9af069 100755
+index 337be0f39f1bb4ff1d375b19cce94dde51bb687d..8920bee3abf38299f8668fef9aa4b60844f6915c 100755
 --- a/components/policy/tools/generate_policy_source.py
 +++ b/components/policy/tools/generate_policy_source.py
 @@ -52,6 +52,7 @@ PLATFORM_STRINGS = {
@@ -10,7 +10,7 @@ index 4d4017c072b84ba2f697b82e5204521ebba02e6f..f1d22dc8351bed47c75f1ca7ed93844b
  
  class PolicyDetails:
    """Parses a policy template and caches all its details."""
-@@ -362,6 +363,7 @@ def main():
+@@ -363,6 +364,7 @@ def main():
      chrome_major_version = ParseVersionFile(version_path)
  
    template_file_contents = _LoadJSONFile(template_file_name)
diff --git a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch
index 921b19f53c6e..464774cfda4a 100644
--- a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch
+++ b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
-index 3db4c28fc01e50bbf2e9f009385d0dd52d772bb5..f832837c5f1f705462479f9c03556c1063dab7bf 100644
+index 2a5312568d0e29f6533a88720220bc159442e312..38a1d84af0b2907f8a240256fd42eaaf76b91197 100644
 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
-@@ -137,6 +137,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) {
+@@ -140,6 +140,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) {
  }
  
  bool IsEnhancedProtectionEnabled(const PrefService& prefs) {
diff --git a/patches/components-sync-driver-sync_service_impl.h.patch b/patches/components-sync-driver-sync_service_impl.h.patch
index 854ac1e74037..302ce152e21a 100644
--- a/patches/components-sync-driver-sync_service_impl.h.patch
+++ b/patches/components-sync-driver-sync_service_impl.h.patch
@@ -1,8 +1,8 @@
 diff --git a/components/sync/driver/sync_service_impl.h b/components/sync/driver/sync_service_impl.h
-index 13dcd5bd0e7d671910cccda8455352ef522ef012..f8c9052f65c10aff26cd61ba8bc47ba86988e75f 100644
+index 098655d28d6d6775e5dd748f148d30c456e1041b..04b3f7a5675fcb55f59d2428819f500b862eb0d8 100644
 --- a/components/sync/driver/sync_service_impl.h
 +++ b/components/sync/driver/sync_service_impl.h
-@@ -256,6 +256,7 @@ class SyncServiceImpl : public SyncService,
+@@ -259,6 +259,7 @@ class SyncServiceImpl : public SyncService,
  
    SyncClient* GetSyncClientForTest();
  
diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch
index 9acb2d8fa64a..22c12e61e0f0 100644
--- a/patches/components-sync-protocol-proto_visitors.h.patch
+++ b/patches/components-sync-protocol-proto_visitors.h.patch
@@ -1,5 +1,5 @@
 diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h
-index ec79eb3113bfc847f667055150766ff4eeb1015e..3a49364741851b4cba01160d38be0a4ec8582aba 100644
+index c129c1e8d9bbbcdbd3b26b57eabfab848f8ff1b6..f8a29e947f211eaf7dc06f8f8a61ed0fceaacf7e 100644
 --- a/components/sync/protocol/proto_visitors.h
 +++ b/components/sync/protocol/proto_visitors.h
 @@ -392,6 +392,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) {
diff --git a/patches/components-variations-variations_seed_store.cc.patch b/patches/components-variations-variations_seed_store.cc.patch
index 28861a033c1a..85344c1bceac 100644
--- a/patches/components-variations-variations_seed_store.cc.patch
+++ b/patches/components-variations-variations_seed_store.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/variations/variations_seed_store.cc b/components/variations/variations_seed_store.cc
-index cd43ff314d9af078eda23263057c3589057767e5..28d4f9625aecbed065c2fd9384b59e16bab0b5ef 100644
+index be96a5a2ac3ffe8a968927ebb566d45646434571..d1ab36cda36461d472ebc6090d49226dc7d0397a 100644
 --- a/components/variations/variations_seed_store.cc
 +++ b/components/variations/variations_seed_store.cc
-@@ -35,6 +35,7 @@ namespace {
+@@ -36,6 +36,7 @@ namespace {
  // The ECDSA public key of the variations server for verifying variations seed
  // signatures.
  const uint8_t kPublicKey[] = {
diff --git a/patches/content-browser-browser_main_loop.h.patch b/patches/content-browser-browser_main_loop.h.patch
index 7ef2f818cdd4..2230fe95878b 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 2c13914c1fbf8b81b6b0dc5d059d48525ac9f059..d892797328b582649dc9595afb947f1eb97696d1 100644
+index b80577fe2ac2e9aac657dea9f8d2916d96c411b5..39390167ab4e168a904e35e0640526ffd861ad68 100644
 --- a/content/browser/browser_main_loop.h
 +++ b/content/browser/browser_main_loop.h
 @@ -157,6 +157,7 @@ class CONTENT_EXPORT BrowserMainLoop {
diff --git a/patches/content-browser-dom_storage-dom_storage_context_wrapper.cc.patch b/patches/content-browser-dom_storage-dom_storage_context_wrapper.cc.patch
index e13f2a389b8c..ce34113cd816 100644
--- a/patches/content-browser-dom_storage-dom_storage_context_wrapper.cc.patch
+++ b/patches/content-browser-dom_storage-dom_storage_context_wrapper.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/content/browser/dom_storage/dom_storage_context_wrapper.cc b/content/browser/dom_storage/dom_storage_context_wrapper.cc
-index d0426d5fafd18548651f6dada1135e65f3d32cbd..f094d9deff3e7216c345d4fce763de721dfac56b 100644
+index 698e0dabd6b211dbfe5e98f1527633c97ae83a74..964c62c0c9ca57131b0be46f5da463e12593479d 100644
 --- a/content/browser/dom_storage/dom_storage_context_wrapper.cc
 +++ b/content/browser/dom_storage/dom_storage_context_wrapper.cc
 @@ -300,6 +300,7 @@ bool DOMStorageContextWrapper::IsRequestValid(
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 2a90356699ca..20be4c9c290c 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 0c9182d9d52f905239c3c151ee014aca163a3d84..b816d5e775e2055e6c229a0a56b00f4aca76a3f5 100644
+index 2eff3e1a11c702abdeec788bf2b5c8b6f29ac29e..afb9aee352a2a598f4763ff96a4353f65a2ec6dc 100644
 --- a/content/browser/renderer_host/navigation_controller_impl.cc
 +++ b/content/browser/renderer_host/navigation_controller_impl.cc
-@@ -3188,16 +3188,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
+@@ -3189,16 +3189,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 abbd8bee3ba8..680a2fd461d4 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 73aff501bf40127bbb041d50f99303166b289b94..59259dee197f58c2a4f83f2d5c5de26cc0489458 100644
+index 3a5aa8aa5f82aea0bb23cf8dc7e71446437b727b..363283b5ee0f6b9164a823e648613bad06b28ef5 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -2449,6 +2449,7 @@ void NavigationRequest::OnRequestRedirected(
+@@ -2506,6 +2506,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 73aff501bf40127bbb041d50f99303166b289b94..59259dee197f58c2a4f83f2d5c5de26c
    common_params_->referrer = Referrer::SanitizeForRequest(
        common_params_->url, *common_params_->referrer);
  
-@@ -3679,6 +3680,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -3734,6 +3735,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 b9fa25c6fb2f..bc9db7a397ae 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 94e9d0ffb1b8382c590ea4e4ebdb7bee794e97f7..2ed08a3538ccdf67bc5a4fd2061ebd7ccd711d16 100644
+index c8c389b8fa8d81a7ce8677b9e4e6445c73d22980..da877109bd1ee599c2c54b19de2352200bf8e755 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 a495a88d9198..b29e75dc9744 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 f9e1b4c6eef18ab6a0ab03755eaae4cb2f9e8804..f95087dc23e6abda096685297ca2a844a0e5aadd 100644
+index eef430c4fa607520afa40b5ad610b6feb1707244..d1612e9241a23370c380a5575ee53b1711a9168f 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 07a155af0021..cd0e6d062224 100644
--- a/patches/content-common-user_agent.cc.patch
+++ b/patches/content-common-user_agent.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
-index 25facd610551cefa60a445152e72a9d519f007ca..59fd65496f3a88e3891eaecc9f4d077dc2e29112 100644
+index 1fd514d6d731591389129caf787794cf1bd33783..5c9a53aa9f4460119ba7137cd466379f21b60c79 100644
 --- a/content/common/user_agent.cc
 +++ b/content/common/user_agent.cc
 @@ -311,6 +311,7 @@ std::string GetAndroidOSInfo(
diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch
index 847c0b8498a0..2f1ec430b7c7 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 7dfc30f346a9420be631c466ffa2d8b8adabf556..68aea47e27b7622b19be228ce0ccad67816b5f6d 100644
+index ec5a3515a248f4b3bd5b58002ec7f4ae77d65778..5a7d46273f54684712e0cf247ac359b0cfb89aa0 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -1908,6 +1908,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1909,6 +1909,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 87a86d22c9a8..71352db537db 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 78ec20c40e5dbf7f706b57d9b810b4149510defc..04951f13c3eb37d9b2d3bd688c5cf3479d802f6e 100644
+index 05df797d07a16a64182bf74c0dbabc13cd489586..c741f405f7b452c2b7c83db6344928e2d2e49476 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4503,6 +4503,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
+@@ -4549,6 +4549,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 dd1ba3075d2f..9dd5ca2b6e76 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 1546f52724fc7fb3688766c0f5e2622d4eb45b6f..52286510105557acb2a0ba7f82b3485925cac494 100644
+index 08ea5ace12e7d4f0b2e1fb5f6ae8768222c9689a..9365c3d2c0214be91e4d8e3e6c2a24258a2a8a09 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -954,6 +954,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) {
+@@ -973,6 +973,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) {
  }
  
  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 86f95e6b17c0..e7052847e456 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,8 +1,8 @@
 diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
-index fcaed5e3314aded56a4dd800bfa91aff356bd1b4..38aed49478d0b774dd5951629ea96c49327b15af 100644
+index 55166a73f3bcae3c5dc1926f8c4e7bf14d9e3fc2..023dd3345dd78ee2b00a7ee07d3745522c86cf17 100644
 --- a/extensions/browser/api/web_request/web_request_api.cc
 +++ b/extensions/browser/api/web_request/web_request_api.cc
-@@ -1324,6 +1324,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
+@@ -1329,6 +1329,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
      const net::AuthChallengeInfo& auth_info,
      AuthCallback callback,
      net::AuthCredentials* credentials) {
diff --git a/patches/extensions-browser-extension_event_histogram_value.h.patch b/patches/extensions-browser-extension_event_histogram_value.h.patch
index 231e1b6cbe27..0f2d8c34d42c 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 8e46633de297f5c77b7c118fc0588106420bcbb8..8e1352233f21946cc5b358c55764d597e4b587c5 100644
+index 0fa26b95494dab169d5d2fcdcb0f89b89283a6a3..bbeda0cee067e3adaead0211fa9a683d09ccc091 100644
 --- a/extensions/browser/extension_event_histogram_value.h
 +++ b/extensions/browser/extension_event_histogram_value.h
-@@ -503,6 +503,20 @@ enum HistogramValue {
-   SPEECH_RECOGNITION_PRIVATE_ON_STOP = 481,
+@@ -504,6 +504,20 @@ enum HistogramValue {
    SPEECH_RECOGNITION_PRIVATE_ON_RESULT = 482,
    SPEECH_RECOGNITION_PRIVATE_ON_ERROR = 483,
+   FILE_MANAGER_PRIVATE_ON_IO_TASK_PROGRESS_STATUS = 484,
 +
 +  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 ede76af6daa0..3d3e8bac8d0c 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 0a8a78967f3c3cc7855fea76f1e60439290920e6..ce9ae45e5a4669fcb063e2ffefab7c45aa7ff2e1 100644
+index e80c62c78abfa520d8af0ebed0fad2fc956a5aba..daea2a7d26438eb93f1339ddae335181945b519b 100644
 --- a/extensions/browser/sandboxed_unpacker.cc
 +++ b/extensions/browser/sandboxed_unpacker.cc
-@@ -1006,6 +1006,7 @@ absl::optional<base::Value> SandboxedUnpacker::RewriteManifestFile(
+@@ -1001,6 +1001,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-_permission_features.json.patch b/patches/extensions-common-api-_permission_features.json.patch
index 05537db94a8f..a5d4aa2bc27d 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 57df80f5475b69bd5c15c1c27135a826525c7c66..3d6522d479d2488e7eaf7edddd376605101420ff 100644
+index 2c87bd9e3743b91e02e4adfa380fd2f65ab9b57a..29490292ade4249b2ccd856e6407f7267ba72300 100644
 --- a/extensions/common/api/_permission_features.json
 +++ b/extensions/common/api/_permission_features.json
-@@ -321,6 +321,7 @@
+@@ -322,6 +322,7 @@
        "channel": "stable",
        "extension_types": ["extension"],
        "allowlist": [
@@ -10,7 +10,7 @@ index 57df80f5475b69bd5c15c1c27135a826525c7c66..3d6522d479d2488e7eaf7edddd376605
          "496B6890097EB6E19809ADEADD095A8721FBB2E0",  // FIDO U2F APIs
          "AD8ED80B705E1818AAD4684F9FF62B43D6D79620",  // FIDO U2F APIs (dev)
          "E24F1786D842E91E74C27929B0B3715A4689A473",  // CryptoToken
-@@ -658,6 +659,7 @@
+@@ -660,6 +661,7 @@
        "channel": "stable",
        "extension_types": ["extension"],
        "allowlist": [
@@ -18,7 +18,7 @@ index 57df80f5475b69bd5c15c1c27135a826525c7c66..3d6522d479d2488e7eaf7edddd376605
          "496B6890097EB6E19809ADEADD095A8721FBB2E0",  // FIDO U2F APIs
          "AD8ED80B705E1818AAD4684F9FF62B43D6D79620",  // FIDO U2F APIs (dev)
          "E24F1786D842E91E74C27929B0B3715A4689A473",  // CryptoToken
-@@ -674,6 +676,7 @@
+@@ -676,6 +678,7 @@
        "channel": "stable",
        "extension_types": ["extension"],
        "allowlist": [
diff --git a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch
index 83d75fdb3cbb..c4afb5557656 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 4b5492ce9aa08955dc3295b3171436c19db64caf..ee0f480d237ad772ac7e36b282c0443728791bad 100644
+index 9e642a1c2b24c2fcb4a2152fbb4fb1d94a3de8b6..2322055621294728a9e0b7642af80fc766ee6ccb 100644
 --- a/ios/chrome/browser/prefs/browser_prefs.mm
 +++ b/ios/chrome/browser/prefs/browser_prefs.mm
-@@ -295,6 +295,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -299,6 +299,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
  
    // Preference related to the browser sign-in policy that is being deprecated.
    registry->RegisterBooleanPref(kSigninAllowedByPolicy, true);
diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch
index 1fdc2f908c29..24b33dbe249c 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 bb9749702edc199d9a850c0c71bd9e1f287c9323..a5d8290e77600cc102001190e767ac6217cee781 100644
+index 1d738b603b6d29e8b3ee6164a40e23caef0f7777..5af106bb1ddd9e70b3ea9de0ac491fab36b71ce3 100644
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1137,6 +1137,7 @@ component("net") {
+@@ -1139,6 +1139,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 19c77fe166b1..fc9469abb4e3 100644
--- a/patches/net-cookies-canonical_cookie.cc.patch
+++ b/patches/net-cookies-canonical_cookie.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
-index e3720d750ae60a4e9df8f0571e13e4e5671d0798..91b0209fc4f9a6e0dde83a9e0a8cf8fe3c9d4eb1 100644
+index e7705687b1cedea07f9604dbd8b1ac91719d8009..bc26cea3a7cdf641f8e7e14b0eb0b8debbf5b0ce 100644
 --- a/net/cookies/canonical_cookie.cc
 +++ b/net/cookies/canonical_cookie.cc
 @@ -543,6 +543,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
diff --git a/patches/net-dns-dns_transaction.cc.patch b/patches/net-dns-dns_transaction.cc.patch
index fea053975a33..ae7c3ae2095e 100644
--- a/patches/net-dns-dns_transaction.cc.patch
+++ b/patches/net-dns-dns_transaction.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
-index feaa6bef907c37d2c8569c5170f3311eb1eccecb..b6476db372dcf738d34100474e4b7f81217c5ba8 100644
+index eaab394ab0c84fd6aaf406eca230680f84f9db0a..7d9d170edc658234bb01f2a1551323e9d599cfa8 100644
 --- a/net/dns/dns_transaction.cc
 +++ b/net/dns/dns_transaction.cc
 @@ -1345,6 +1345,7 @@ class DnsTransactionImpl : public DnsTransaction,
diff --git a/patches/net-dns-host_cache.cc.patch b/patches/net-dns-host_cache.cc.patch
index b6d2ec8dc50e..fb659c8c002c 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 f9ea4fa082b3b03b888be09d12045a463966f3fc..b70aebac7f78ac92c62edfbe073439d2bce3edf8 100644
+index 6a66063175431249387bc7b41fc6b266c0de722d..926302b1011b80d09bde3e33b59ca30c9171153c 100644
 --- a/net/dns/host_cache.cc
 +++ b/net/dns/host_cache.cc
 @@ -259,6 +259,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const {
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 45015a2323af..45296c061bff 100644
--- a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
+++ b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc
-index b4c4c7309738ef8c8d5bb9e3feaa79863b336885..df12c9b2247772ad61c13cef69f8eff095e9c600 100644
+index 42826c7e162fcf5169dba897af07005a91887586..f9038b0a1e45fb7742da7ef7375774669eb6e447 100644
 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc
 +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
 @@ -1032,6 +1032,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously(
diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch
index 1adda79755cd..848114ede0d7 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 f4f23deab53f04075b2519e932eaedcb8d1215a4..70a6ba1fb6838251725247658ff20f0af416c518 100644
+index a58d8aedf735f32a3ff29e7cefbcf00618ca237e..5c890736d01fdedf2c8d0ee6ccd4ff386ccf75da 100644
 --- a/sandbox/policy/win/sandbox_win.cc
 +++ b/sandbox/policy/win/sandbox_win.cc
-@@ -773,6 +773,7 @@ ResultCode LaunchWithoutSandbox(
+@@ -801,6 +801,7 @@ ResultCode LaunchWithoutSandbox(
      base::Process* process) {
    base::LaunchOptions options;
    options.handles_to_inherit = handles_to_inherit;
diff --git a/patches/services-network-cors-cors_url_loader.cc.patch b/patches/services-network-cors-cors_url_loader.cc.patch
index fe13af7e6bc3..81cfa1ee7abc 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 b1043dfa8ddb55e2ffee12fe880665dfa095f81c..f8797952483b5a1bce60051903b75c4634737ddd 100644
+index 030588691a87df7b1603177c3ef36374d7288192..c7d4dc721fc809b5ee64ad7ae9a23e658fc2f0a8 100644
 --- a/services/network/cors/cors_url_loader.cc
 +++ b/services/network/cors/cors_url_loader.cc
-@@ -630,6 +630,7 @@ void CorsURLLoader::StartRequest() {
+@@ -638,6 +638,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 88739a7c046c..6849a3cffb72 100644
--- a/patches/services-network-public-cpp-BUILD.gn.patch
+++ b/patches/services-network-public-cpp-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn
-index ff1427034dd21682f9ebd0a6507c7bebd8092cea..c277a5f291175c9ece156465c8f68b2d45c21ac8 100644
+index 33c082b1df74b8faed6e6c319802b9d6e4cd0c43..04b4c03e70f2b83c44f8ca16d431468ffadcd705 100644
 --- a/services/network/public/cpp/BUILD.gn
 +++ b/services/network/public/cpp/BUILD.gn
-@@ -168,6 +168,7 @@ component("cpp") {
+@@ -171,6 +171,7 @@ component("cpp") {
      "//services/proxy_resolver/public/mojom",
    ]
  
diff --git a/patches/services-network-public-cpp-cors-cors.cc.patch b/patches/services-network-public-cpp-cors-cors.cc.patch
index ca74733cc2c6..0982d62a50ae 100644
--- a/patches/services-network-public-cpp-cors-cors.cc.patch
+++ b/patches/services-network-public-cpp-cors-cors.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/services/network/public/cpp/cors/cors.cc b/services/network/public/cpp/cors/cors.cc
-index f8075a8a20e8325ac4a0f0d11b9e24dc7572bb1d..accc3e7061d2de6c7e912ab41dfb8271b9b176f4 100644
+index 324f4d669efed74d9f7345ff422a56a1b15c85df..05eb2fd0990b254d7d16f810c11f0f0ac59ecaef 100644
 --- a/services/network/public/cpp/cors/cors.cc
 +++ b/services/network/public/cpp/cors/cors.cc
-@@ -344,6 +344,7 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) {
+@@ -345,6 +345,7 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) {
        // was introduced to enable safely experimenting with sending a reduced
        // user agent string in the `User-Agent` header.
        "sec-ch-ua-reduced",
diff --git a/patches/third_party-blink-renderer-BUILD.gn.patch b/patches/third_party-blink-renderer-BUILD.gn.patch
index e05aa1dcc042..ef265be7dd4f 100644
--- a/patches/third_party-blink-renderer-BUILD.gn.patch
+++ b/patches/third_party-blink-renderer-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/BUILD.gn b/third_party/blink/renderer/BUILD.gn
-index 6a7a81d47913a2009494081cc7d36bf7af43f8c3..2711c1f75c94862ba6be9525ed3f9363cc8d9ce6 100644
+index 893b88f49dda9da7373beae7e97c548a5fec339f..e667ea64689a398766d5d691a5504ff627e56b52 100644
 --- a/third_party/blink/renderer/BUILD.gn
 +++ b/third_party/blink/renderer/BUILD.gn
 @@ -9,6 +9,7 @@ if (is_clang) {
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 306225e944e0..c0366c61c176 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 7d783e30f566f2303dfaa045116088b280db9596..1fc457bb357adeb02a14c1eb3fd6b6aa8b46e35a 100644
+index 5752c7d91b775ab0cd98551be190bd1d365d7784..2cc7e4763cd20b86ba0b03caa624e21573c86853 100644
 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni
 +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
-@@ -2488,6 +2488,7 @@ generated_interface_sources_in_modules = [
+@@ -2490,6 +2490,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 971f21201af4..69c8d12740e7 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 2737f423d8586b4b789eb681ebef278af5b1aa35..815dddcaf3e34b0deb58bef0cf4f647470167d20 100644
+index e6030e96e247863e17f0ea12ee1f7b0905546c70..cfbf7d187ce422381c82dba6718a960ca778bd8e 100644
 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni
 +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
-@@ -1142,6 +1142,7 @@ static_idl_files_in_modules = get_path_info(
+@@ -1143,6 +1143,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 c4ea24bc6266..fb0e96b9c329 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 d43345d2718255b5590aa734b1adde4a86db9b9a..d6470d96291ef017c705481c41ca5e3cb900741c 100644
+index 4089d015480fea0755af2ebad29faf372ea3ddef..95e3d592263f3882562b5d66788a3a2cd95cad7c 100644
 --- a/third_party/blink/renderer/core/BUILD.gn
 +++ b/third_party/blink/renderer/core/BUILD.gn
-@@ -168,6 +168,7 @@ component("core") {
+@@ -188,6 +188,7 @@ component("core") {
  
    visibility = []  # Allow re-assignment of list.
    visibility = [ "//third_party/blink/*" ]
@@ -10,7 +10,7 @@ index d43345d2718255b5590aa734b1adde4a86db9b9a..d6470d96291ef017c705481c41ca5e3c
  
    sources = [
      "core_initializer.cc",
-@@ -275,6 +276,7 @@ component("core") {
+@@ -300,6 +301,7 @@ component("core") {
      "//v8",
    ]
  
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 4cfa00ce07d6..ae2a2b88d722 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 9a7fab8fac86de3b562a35d6057585ffac3ae75c..9ea4cbf460786e8aa7992875194c4b79fda33b6e 100644
+index 22f885a6835b3a3fa38dbd05353ec92cf1ecd76a..f08196260eff49e63dc2803c16c6aaf7bb209d90 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
-@@ -951,6 +951,7 @@ String HTMLCanvasElement::ToDataURLInternal(
+@@ -1002,6 +1002,7 @@ String HTMLCanvasElement::ToDataURLInternal(
      if (!data_buffer)
        return String("data:,");
  
diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch
index 12be149e653f..587e3ee2cbef 100644
--- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch
+++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
-index c8a10e2cb35bdc08909b7cb6becaa2c5ca6360cf..89927f84f5d9bb53d61d6bf36b4bc5af03824078 100644
+index b67cb3aa58ec41462c5c7f39e0f758738df32e94..285af4a813e2e0709e8400d750b53e313ce01789 100644
 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
 +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
-@@ -319,6 +319,7 @@ class CORE_EXPORT HTMLCanvasElement final
+@@ -320,6 +320,7 @@ class CORE_EXPORT HTMLCanvasElement final
  
    bool IsPlaceholder() const override { return IsOffscreenCanvasRegistered(); }
  
diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
index 11c757a7fb05..dcf42fee687a 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 8c52e525fad84b1d416d0334b66f24432cfd66f7..c36ecdb5695f964708da58f15add6d3f7321ff20 100644
+index 4abde0551c57b324be5de1ee4575fc5e88115a03..944001c15145b09703ffb47e91cb332d39673dc9 100644
 --- a/third_party/blink/renderer/modules/BUILD.gn
 +++ b/third_party/blink/renderer/modules/BUILD.gn
 @@ -15,6 +15,7 @@ if (is_android) {
@@ -10,7 +10,7 @@ index 8c52e525fad84b1d416d0334b66f24432cfd66f7..c36ecdb5695f964708da58f15add6d3f
  
  config("modules_implementation") {
    defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ]
-@@ -166,6 +167,7 @@ component("modules") {
+@@ -167,6 +168,7 @@ component("modules") {
    # generating the snapshot for android, blink is compiled with
    # current_os="linux" and target_os="android". Using target_os is necessary as
    # we need to compile in the same way as would happen when current_os="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 8ac2c52731ca..070f9cd86d14 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 f0ef240006d80e7dcdf8cd31399bbca2e3d9afa7..5124ad1ff31f5b78e2b6b93507da43368c4785c7 100644
+index 4fedfa01924edea32bc53e936a433b1a44fb2b50..a1bfb1c10d324cec634c13c77a1b882495e2dacc 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
-@@ -2195,6 +2195,7 @@ ImageData* BaseRenderingContext2D::getImageData(
+@@ -2216,6 +2216,7 @@ ImageData* BaseRenderingContext2D::getImageData(
  }
  
  ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -10,7 +10,7 @@ index f0ef240006d80e7dcdf8cd31399bbca2e3d9afa7..5124ad1ff31f5b78e2b6b93507da4336
      int sx,
      int sy,
      int sw,
-@@ -2312,6 +2313,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
+@@ -2333,6 +2334,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 87f014b13368..79cda98cdf4f 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 392423f82d7b02a88d7db3c200a5d340b1c7470d..c682ebf1c51b4b3c56e73c394253396d41a2008b 100644
+index 80c57bc0593e3aed984c90afa534a4ae10208e2e..3afb77331f53fd4f1ec12f5249632f8e6bebd0f4 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
 @@ -905,6 +905,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
diff --git a/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch
index d829439c2eec..f3829295a3c9 100644
--- a/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch
+++ b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
-index d1e0c243ae7ee04cb07adae7d2a977164cf0404a..849f184b9f4dcee506fd719a9510f7802bc17500 100644
+index 44add89ee84888896a7645cdf67e4af21708d596..9fe6e92c2d166a9534e76e590ca0ed4f6f8f7e68 100644
 --- a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
 +++ b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
 @@ -83,6 +83,7 @@ std::unique_ptr<net::CanonicalCookie> ToCanonicalCookie(
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 2686b63bcaa8..6ea42e075677 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 532005696db25402114cea5c3d5b361b57889309..2527a468a1bdc068fe1b9feb6e6cdc1cc9adbe2c 100644
+index 7c95810e68066d520c0c0996b3e5b70c581306bc..9d663e2210645a719636e5adaad341cc545c6b18 100644
 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
 +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
-@@ -558,6 +558,8 @@ void MediaDevices::DevicesEnumerated(
+@@ -578,6 +578,8 @@ void MediaDevices::DevicesEnumerated(
      }
    }
  
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 ff9af34c06ae..1d62a5279504 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,5 +1,5 @@
 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 fad756bbbfba6c1d688094429ea64632a9b7f4d7..fa4daaceeebe03ff036a04f871c1769ac0c11472 100644
+index 74a2bb9c81e6ffaa668dc8a91de9d4df084828fa..598e15207d5574bde7ba3f66dd003e6c8cb5650c 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
 @@ -5251,6 +5251,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
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 19e63cfae0cf..03dc6e8b28aa 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 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc2490d95c 100644
+index 7f91a28ff8402bce3808cb1b17c63120008ef9e2..606f9c3da32f4143e73aa421d91e3449aa1f6994 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
-@@ -2934,6 +2934,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
+@@ -2956,6 +2956,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
      GLuint index) {
    if (!ValidateWebGLProgramOrShader("getActiveAttrib", program))
      return nullptr;
@@ -10,7 +10,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    GLuint program_id = ObjectNonZero(program);
    GLint max_name_length = -1;
    ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH,
-@@ -2965,6 +2966,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform(
+@@ -2987,6 +2988,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform(
      GLuint index) {
    if (!ValidateWebGLProgramOrShader("getActiveUniform", program))
      return nullptr;
@@ -18,7 +18,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    GLuint program_id = ObjectNonZero(program);
    GLint max_name_length = -1;
    ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH,
-@@ -2995,6 +2997,7 @@ absl::optional<HeapVector<Member<WebGLShader>>>
+@@ -3017,6 +3019,7 @@ absl::optional<HeapVector<Member<WebGLShader>>>
  WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) {
    if (!ValidateWebGLProgramOrShader("getAttachedShaders", program))
      return absl::nullopt;
@@ -26,7 +26,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
  
    HeapVector<Member<WebGLShader>> shader_objects;
    for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) {
-@@ -3009,6 +3012,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program,
+@@ -3031,6 +3034,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program,
                                                     const String& name) {
    if (!ValidateWebGLProgramOrShader("getAttribLocation", program))
      return -1;
@@ -34,7 +34,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    if (!ValidateLocationLength("getAttribLocation", name))
      return -1;
    if (!ValidateString("getAttribLocation", name))
-@@ -3042,6 +3046,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter(
+@@ -3064,6 +3068,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter(
      GLenum pname) {
    if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target))
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -42,7 +42,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
  
    switch (pname) {
      case GL_BUFFER_USAGE: {
-@@ -3188,6 +3193,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter(
+@@ -3210,6 +3215,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter(
                                           target, attachment))
      return ScriptValue::CreateNull(script_state->GetIsolate());
  
@@ -50,7 +50,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    if (!framebuffer_binding_ || !framebuffer_binding_->Object()) {
      SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter",
                        "no framebuffer bound");
-@@ -3588,6 +3594,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
+@@ -3610,6 +3616,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 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
        if (ExtensionEnabled(kWebGLDebugRendererInfoName)) {
          if (IdentifiabilityStudySettings::Get()->ShouldSample(
                  blink::IdentifiableSurface::Type::kWebGLParameter)) {
-@@ -3603,6 +3610,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
+@@ -3625,6 +3632,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 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
        if (ExtensionEnabled(kWebGLDebugRendererInfoName)) {
          if (IdentifiabilityStudySettings::Get()->ShouldSample(
                  blink::IdentifiableSurface::Type::kWebGLParameter)) {
-@@ -3695,6 +3703,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
+@@ -3717,6 +3725,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 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) {
      return ScriptValue::CreateNull(script_state->GetIsolate());
    }
-@@ -3750,6 +3759,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
+@@ -3772,6 +3781,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
  String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) {
    if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program))
      return String();
@@ -82,7 +82,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    GLStringQuery query(ContextGL());
    return query.Run<GLStringQuery::ProgramInfoLog>(ObjectNonZero(program));
  }
-@@ -3760,6 +3770,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter(
+@@ -3782,6 +3792,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter(
      GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -90,7 +90,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    if (target != GL_RENDERBUFFER) {
      SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter",
                        "invalid target");
-@@ -3811,6 +3822,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
+@@ -3833,6 +3844,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 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) {
      return ScriptValue::CreateNull(script_state->GetIsolate());
    }
-@@ -3842,6 +3854,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
+@@ -3864,6 +3876,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
  String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) {
    if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader))
      return String();
@@ -106,7 +106,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    GLStringQuery query(ContextGL());
    return query.Run<GLStringQuery::ShaderInfoLog>(ObjectNonZero(shader));
  }
-@@ -3872,6 +3885,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
+@@ -3894,6 +3907,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
    GLint precision = 0;
    ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range,
                                          &precision);
@@ -114,7 +114,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    auto* result = MakeGarbageCollected<WebGLShaderPrecisionFormat>(
        range[0], range[1], precision);
    if (IdentifiabilityStudySettings::Get()->ShouldSample(
-@@ -3884,6 +3898,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
+@@ -3906,6 +3920,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
  String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) {
    if (!ValidateWebGLProgramOrShader("getShaderSource", shader))
      return String();
@@ -122,7 +122,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    return EnsureNotNull(shader->Source());
  }
  
-@@ -3913,6 +3928,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter(
+@@ -3935,6 +3950,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter(
      GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -130,7 +130,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    if (!ValidateTextureBinding("getTexParameter", target))
      return ScriptValue::CreateNull(script_state->GetIsolate());
    switch (pname) {
-@@ -3947,6 +3963,7 @@ ScriptValue WebGLRenderingContextBase::getUniform(
+@@ -3969,6 +3985,7 @@ ScriptValue WebGLRenderingContextBase::getUniform(
      const WebGLUniformLocation* uniform_location) {
    if (!ValidateWebGLProgramOrShader("getUniform", program))
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -138,7 +138,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    DCHECK(uniform_location);
    if (uniform_location->Program() != program) {
      SynthesizeGLError(GL_INVALID_OPERATION, "getUniform",
-@@ -4206,6 +4223,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation(
+@@ -4228,6 +4245,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation(
      const String& name) {
    if (!ValidateWebGLProgramOrShader("getUniformLocation", program))
      return nullptr;
@@ -146,7 +146,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    if (!ValidateLocationLength("getUniformLocation", name))
      return nullptr;
    if (!ValidateString("getUniformLocation", name))
-@@ -4230,6 +4248,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib(
+@@ -4252,6 +4270,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib(
      GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -154,7 +154,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    if (index >= max_vertex_attribs_) {
      SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib",
                        "index out of range");
-@@ -4307,6 +4326,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index,
+@@ -4329,6 +4348,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index,
                                                           GLenum pname) {
    if (isContextLost())
      return 0;
@@ -162,7 +162,7 @@ index 92860df202d4e896b68ff0d4c55a6678c1e60ef8..7d2fb72d6f377fa244700cbf47e7a6fc
    GLvoid* result = nullptr;
    // NOTE: If pname is ever a value that returns more than 1 element
    // this will corrupt memory.
-@@ -4654,6 +4674,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x,
+@@ -4676,6 +4696,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x,
                                                   int64_t offset) {
    if (isContextLost())
      return;
diff --git a/patches/tools-clang-pylib-clang-compile_db.py.patch b/patches/tools-clang-pylib-clang-compile_db.py.patch
index 9282f898a522..8e8cda0df72c 100644
--- a/patches/tools-clang-pylib-clang-compile_db.py.patch
+++ b/patches/tools-clang-pylib-clang-compile_db.py.patch
@@ -1,11 +1,11 @@
 diff --git a/tools/clang/pylib/clang/compile_db.py b/tools/clang/pylib/clang/compile_db.py
-index 8b019f70d8baff26e5aecc108443dfe9a13474e0..134cde87cb45c7de6df79fb6ca4ba8ec5dcbafe4 100755
+index 9cea148ee9a06df045f2237bf5745032d00d2ab2..56b96e3de27289b15de38c430ab9ce64b5a84d12 100755
 --- a/tools/clang/pylib/clang/compile_db.py
 +++ b/tools/clang/pylib/clang/compile_db.py
-@@ -14,7 +14,7 @@ import shutil
+@@ -12,7 +12,7 @@ import sys
  
  _RSP_RE = re.compile(r' (@(.+?\.rsp)) ')
- _CMD_LINE_RE = re.compile(
+ _GOMA_CMD_LINE_RE = re.compile(
 -    r'^(?P<gomacc>.*gomacc(\.exe)?"?\s+)?(?P<clang>\S*clang\S*)\s+(?P<args>.*)$'
 +    r'^(?P<gomacc>.*(gomacc|redirect-cc)(\.exe|\.py)?"?\s+)?(?P<clang>\S*clang\S*)\s+(?P<args>.*)$'
  )
diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch
index 577dd92474f4..e9dcf14edc1c 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 4e80d8de308271bdad6b3315c5c01e5abf94624c..ef3eb63097ed5e2bf408c6f5ba744dba0bfc1cd2 100644
+index dda65e37e4db1b9a8dead9e651795d318e9a18e3..943455d1aa29976332eb1252219941d46766a9d3 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
 @@ -51,6 +51,9 @@
@@ -12,7 +12,7 @@ index 4e80d8de308271bdad6b3315c5c01e5abf94624c..ef3eb63097ed5e2bf408c6f5ba744dba
    "chrome/app/google_chrome_strings.grd": {
      "messages": [400],
    },
-@@ -553,6 +556,9 @@
+@@ -557,6 +560,9 @@
    "components/components_chromium_strings.grd": {
      "messages": [3520],
    },
diff --git a/patches/tools-licenses.py.patch b/patches/tools-licenses.py.patch
index 1e09420828b2..bb6fe44c38b0 100644
--- a/patches/tools-licenses.py.patch
+++ b/patches/tools-licenses.py.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/licenses.py b/tools/licenses.py
-index f251273b8958f46ee94f3e04b6e1a3c32b8f1f73..2eaba7e9bbedbe54dd1fc2e35f3f08b2b333451e 100755
+index beac8b9ef1ef44e3308376f0f80ea7b6cb2e0b9e..a69dab99bece48fd5726b251c7e87203439d11db 100755
 --- a/tools/licenses.py
 +++ b/tools/licenses.py
 @@ -35,6 +35,7 @@ else:
@@ -28,7 +28,7 @@ index f251273b8958f46ee94f3e04b6e1a3c32b8f1f73..2eaba7e9bbedbe54dd1fc2e35f3f08b2
        # Add all subdirectories that are not marked for skipping.
        for dir in dirs:
          dirpath = os.path.join(path, dir)
-@@ -717,7 +720,8 @@ def GenerateCredits(file_template_file,
+@@ -719,7 +722,8 @@ def GenerateCredits(file_template_file,
    for path in third_party_dirs:
      try:
        metadata = ParseDir(path, _REPOSITORY_ROOT)
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 ec22476f822c..3b0cf0fa5a3f 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 57dbdd6aa80e7adff0a2c899e044a7d9a7fc2aa1..62a493a729f343abf952a0f0d7005803a7a78475 100644
+index 7824fe0f504ed62065d982cb82f096b1fe7562e6..53e70ebc7d1b465749ca3c891971fc6d8f772153 100644
 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
 +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
-@@ -12613,6 +12613,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
+@@ -12528,6 +12528,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 22d8bbf3be8e..3e5083898fb6 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 7515600494ec73c5f2629ea8634a0b9b39841764..5ac9b060792f1c797ae83bd1386aa6ad5042fa8d 100644
+index ed1479657e090afd515e46bdb92503fd334a21aa..521a4f21a2a6a1336cdcb81391fb12cec44d0705 100644
 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm
 +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm
-@@ -1180,6 +1180,7 @@ bool IsAXSetter(SEL selector) {
+@@ -1425,6 +1425,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 f9d7170de1cc..144af632c1f0 100644
--- a/patches/ui-base-BUILD.gn.patch
+++ b/patches/ui-base-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 9cce2f63140db5370ef9400dd83cc3d8fe0e9323..e25f947259a10cecd5d400707cb25fba1d8e7f67 100644
+index 502d4e77f1df4d0f7fa2b4f3024e862a76f69f55..7b67c4ab21084fd217648431552c36841f664cc4 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
-@@ -468,6 +468,7 @@ component("base") {
+@@ -469,6 +469,7 @@ component("base") {
      "//ui/strings",
      "//url",
    ]
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 a040844e6427..f15d00143e28 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 ef51a0e902c123773041eee1083a98c6fe607950..b65af7800cf96e20a992327fe311e7717823f350 100644
+index 9ef7af687dc476e54e553cb975cae51c1a5cb38c..92db9759fc9470ef0ee6f372ac659163049f92f6 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/BUILD.gn b/renderer/test/BUILD.gn
index adcb40c3c9d8..0e8e12a723fe 100644
--- a/renderer/test/BUILD.gn
+++ b/renderer/test/BUILD.gn
@@ -23,7 +23,7 @@ source_set("browser_tests") {
     "//chrome/browser/ui",
     "//chrome/test:test_support_ui",
     "//components/embedder_support",
-    "//components/web_package:test_support",
+    "//components/web_package",
     "//content/test:test_support",
     "//net:test_support",
   ]
diff --git a/renderer/test/subresource_web_bundles_browsertest.cc b/renderer/test/subresource_web_bundles_browsertest.cc
index 07ee3f30163b..e4683b3825c0 100644
--- a/renderer/test/subresource_web_bundles_browsertest.cc
+++ b/renderer/test/subresource_web_bundles_browsertest.cc
@@ -13,7 +13,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/embedder_support/switches.h"
-#include "components/web_package/test_support/web_bundle_builder.h"
+#include "components/web_package/web_bundle_builder.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
@@ -89,7 +89,7 @@ std::string CreateWebBundle() {
   std::string flbk_js_url_str =
       GURL(base::JoinString({kOriginTrialTestHostname, "fallback.js"}, "/"))
           .spec();
-  web_package::test::WebBundleBuilder builder(flbk_js_url_str, "");
+  web_package::WebBundleBuilder builder(flbk_js_url_str, "");
   auto pass_js_location = builder.AddResponse(
       {{":status", "200"}, {"content-type", "application/javascript"}},
       "document.title = 'script loaded';");
diff --git a/script/check_chromium_src.py b/script/check_chromium_src.py
index 8d766fd99307..cad910ff6565 100644
--- a/script/check_chromium_src.py
+++ b/script/check_chromium_src.py
@@ -11,9 +11,9 @@
 #    file under src tree (or grit).
 #
 # 2. Look for #defines that redefine symbols that aren't present in
-#    the overriden file.
+#    the overridden file.
 #
-# 3. Look for #include statements of the overriden file that have
+# 3. Look for #include statements of the overridden file that have
 #    incorrect number of ../ in the path.
 #
 # !!! This script does return false positives, but better check a
@@ -24,31 +24,33 @@
 import os
 import sys
 
-"""
-Look for potential problems in chromium_src overrides.
-"""
+# Look for potential problems in chromium_src overrides.
 
 BRAVE_SRC = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 BRAVE_CHROMIUM_SRC = os.path.join(BRAVE_SRC, 'chromium_src')
 CHROMIUM_SRC = os.path.abspath(os.path.dirname(BRAVE_SRC))
 
+# pylint: disable-next=line-too-long
 NORMAL_DEFINITIONS_REGEXP = r'#define[\s\\]+([a-zA-Z0-9_]+[^\s\(]*)(?:[ \t]+\\\s*|[ \t])+([a-zA-Z0-9_]+[^\s\(]*)'
+# pylint: disable-next=line-too-long
 FUNCTION_LIKE_DEFINITIONS_REGEXP = r'#define[\s\\]+([a-zA-Z0-9_]+)[\s\\]*\(.*?\)(?:[ \t]+\\\s*|[ \t])([a-zA-Z0-9_]*[\s\\]*\(.*?\))'
 
 EXCLUDES = [
-    'CPPLINT.cfg',
+    '.*/BUILD.gn',
     '.*/DEPS',
     '.*/sources.gni',
-    '_(unit|browser)test(_mac)?.cc',
+    'CPPLINT.cfg',
+    '_(unit|browser)test(_mac)?.(cc|mm)',
+    'base/feature_override.h',
+    'chrome/installer/linux/common/brave-browser/chromium-browser.appdata.xml',
+    'chrome/installer/linux/common/brave-browser/chromium-browser.info',
+    'content/browser/tld_ephemeral_lifetime.cc',
+    'content/public/browser/tld_ephemeral_lifetime.h',
     'third_party/blink/renderer/core/origin_trials/origin_trials.cc',
     'third_party/blink/renderer/modules/battery/navigator_batterytest.cc',
     'third_party/blink/renderer/modules/bluetooth/navigator_bluetoothtest.cc',
     'third_party/blink/renderer/modules/quota/navigator_storagetest.cc',
     'third_party/blink/renderer/modules/storage/brave_dom_window_storage.h',
-    'chrome/installer/linux/common/brave-browser/chromium-browser.appdata.xml',
-    'chrome/installer/linux/common/brave-browser/chromium-browser.info',
-    'content/browser/tld_ephemeral_lifetime.cc',
-    'content/public/browser/tld_ephemeral_lifetime.h'
 ]
 
 GRIT_EXCLUDES = [
@@ -77,7 +79,7 @@ def do_check_includes(override_filepath):
         # Check relative includes go up the expected amount of steps.
         for line in override_file:
             # We're only interested in include paths for parent directories.
-            regexp = r'^#include "(\.\./.*{})"'.format(override_filename)
+            regexp = rf'^#include "(\.\./.*{override_filename})"'
             line_match = re.search(regexp, line)
             if not line_match:
                 continue
@@ -89,17 +91,17 @@ def do_check_includes(override_filepath):
 
             # Check actual vs expected.
             if actual_count != expected_count:
-                print("ERROR: while processing {}".format(override_filepath))
+                print(f"ERROR: while processing {override_filepath}")
 
                 # Sanity check
                 saved_cwd = os.getcwd()
                 os.chdir(override_dirpath)
                 if not os.path.isfile(include_path):
-                    print("       File {} doesn't exist".format(include_path))
+                    print(f"       File {include_path} doesn't exist")
                 os.chdir(saved_cwd)
 
-                print("       Expected {} \"..\"".format(expected_count))
-                print("       Found {} \"..\"".format(actual_count))
+                print(f"       Expected {expected_count} \"..\"")
+                print(f"       Found {actual_count} \"..\"")
                 print("-------------------------")
 
 
@@ -141,10 +143,11 @@ def do_check_defines(override_filepath, original_filepath):
                 target = buildflag_match.group(1)
 
             # Report ERROR if target can't be found in the original file.
-            with open(original_filepath, mode='r', encoding='utf-8') as original_file:
+            with open(original_filepath, mode='r', encoding='utf-8') as \
+                original_file:
                 if target not in original_file.read():
-                    print("ERROR: Unable to find symbol {} in {}"
-                          .format(target, original_filepath))
+                    print(f"ERROR: Unable to find symbol {target}" +
+                          f" in {original_filepath}")
                     print("-------------------------")
 
 
@@ -154,13 +157,12 @@ def do_check_overrides(overrides_list, search_dir, check_includes=False):
     the passed in directory (|search_dir|), optionally checking includes too.
     """
     print("--------------------------------------------------")
-    print("Checking overrides in {} ...".format(search_dir))
+    print(f"Checking overrides in {search_dir} ...")
     print("--------------------------------------------------")
     for override_filepath in overrides_list:
         original_filepath = os.path.join(search_dir, override_filepath)
         if not os.path.isfile(original_filepath):
-            print("WARNING: No source for override {}"
-                  .format(override_filepath))
+            print(f"WARNING: No source for override {override_filepath}")
             print("-------------------------")
             continue
 
@@ -202,7 +204,8 @@ def filter_chromium_src_filepaths(include_regexp=None, exclude_regexp=None):
             # Normalize back slashes to forward slashes just in case we're in
             # Windows before trying to match them against a regular expression.
             normalized_path = relative_path.replace('\\', '/')
-            if include_regexp and not re.search(include_regexp, normalized_path):
+            if include_regexp and not re.search(
+                include_regexp, normalized_path):
                 continue
             if exclude_regexp and re.search(exclude_regexp, normalized_path):
                 continue
@@ -233,9 +236,9 @@ def main(args):
                                          options.arch)
 
     # Check that the required directories exist.
-    for dir in [BRAVE_SRC, gen_buildir]:
-        if not os.path.isdir(dir):
-            print("ERROR: {} is not a valid directory.".format(dir))
+    for directory in [BRAVE_SRC, gen_buildir]:
+        if not os.path.isdir(directory):
+            print(f"ERROR: {directory} is not a valid directory.")
             return 1
 
     # Change into the chromium_src directory for convenience.
@@ -251,6 +254,7 @@ def main(args):
         include_regexp='|'.join(GRIT_INCLUDES + ['.*grit.*']),
         exclude_regexp='|'.join(GRIT_EXCLUDES))
     do_check_overrides(grit_overrides, gen_buildir, False)
+    return 0
 
 
 if __name__ == '__main__':
diff --git a/test/BUILD.gn b/test/BUILD.gn
index bd837ba964a1..95e7da3fde84 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -20,6 +20,7 @@ import("//brave/test/testing.gni")
 import("//chrome/common/features.gni")
 import("//components/gcm_driver/config.gni")
 import("//testing/test.gni")
+import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
@@ -399,8 +400,16 @@ test("brave_unit_tests") {
       "//chrome/android:chrome_apk_paks",
       "//chrome/test/android:chrome_java_test_support",
       "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
-      "//v8:v8_external_startup_data_assets",
     ]
+
+    if (use_v8_context_snapshot) {
+      deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
+    }
+
+    if (!use_v8_context_snapshot || include_both_v8_snapshots) {
+      deps += [ "//v8:v8_external_startup_data_assets" ]
+    }
+
     data += [
       "$root_gen_dir/chrome/android/chrome_apk_paks/chrome_100_percent.pak",
       "$root_gen_dir/chrome/android/chrome_apk_paks/locales/en-US.pak",
@@ -752,6 +761,7 @@ if (!is_android) {
       "//brave/vendor/bat-native-ledger",
       "//brave/vendor/bat-native-ledger:publishers_proto",
       "//chrome/browser",
+      "//components/optimization_guide/core",
       "//components/reading_list/features:flags",
       "//components/security_interstitials/content:security_interstitial_page",
       "//components/user_prefs",
@@ -1049,6 +1059,7 @@ if (!is_android) {
       "//components/federated_learning",
       "//components/language/core/common",
       "//components/network_time",
+      "//components/optimization_guide/core",
       "//components/reading_list/features:flags",
       "//components/spellcheck/browser",
       "//services/device/public/cpp:device_features",
diff --git a/third_party/bitcoin-core/BUILD.gn b/third_party/bitcoin-core/BUILD.gn
index 60b73d783135..6b73de3e9743 100644
--- a/third_party/bitcoin-core/BUILD.gn
+++ b/third_party/bitcoin-core/BUILD.gn
@@ -2,7 +2,10 @@ config("warnings") {
   cflags = []
 
   if (is_clang) {
-    cflags += [ "-Wno-unused-function" ]
+    cflags += [
+      "-Wno-bitwise-instead-of-logical",
+      "-Wno-unused-function",
+    ]
   }
 }
 
diff --git a/utility/importer/brave_profile_import_impl.cc b/utility/importer/brave_profile_import_impl.cc
index faebd51c14d6..a9e8c6cbffb6 100644
--- a/utility/importer/brave_profile_import_impl.cc
+++ b/utility/importer/brave_profile_import_impl.cc
@@ -11,8 +11,8 @@
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
-#include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "brave/utility/importer/brave_external_process_importer_bridge.h"
diff --git a/vendor/bat-native-ads/src/bat/ads/ad_event_history.cc b/vendor/bat-native-ads/src/bat/ads/ad_event_history.cc
index a4055256e17b..51e70070d6b6 100644
--- a/vendor/bat-native-ads/src/bat/ads/ad_event_history.cc
+++ b/vendor/bat-native-ads/src/bat/ads/ad_event_history.cc
@@ -51,7 +51,7 @@ void AdEventHistory::Record(const std::string& ad_type,
 
   iter->second.push_back(timestamp);
 
-  const base::TimeDelta time_delta = base::TimeDelta::FromDays(1);
+  const base::TimeDelta time_delta = base::Days(1);
   PurgeHistoryOlderThan(&iter->second, time_delta);
 }
 
diff --git a/vendor/bat-native-ads/src/bat/ads/ad_event_history_unittest.cc b/vendor/bat-native-ads/src/bat/ads/ad_event_history_unittest.cc
index c1acbb2217ab..9984d71a234d 100644
--- a/vendor/bat-native-ads/src/bat/ads/ad_event_history_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/ad_event_history_unittest.cc
@@ -93,8 +93,7 @@ TEST_F(BatAdsAdEventHistoryTest, PurgeHistoryOlderThan) {
   // Arrange
   RecordAdEvent(AdType::kAdNotification, ConfirmationType::kViewed);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(1) +
-                     base::TimeDelta::FromSeconds(1));
+  FastForwardClockBy(base::Days(1) + base::Seconds(1));
 
   RecordAdEvent(AdType::kAdNotification, ConfirmationType::kViewed);
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/account/ad_rewards/ad_rewards.cc b/vendor/bat-native-ads/src/bat/ads/internal/account/ad_rewards/ad_rewards.cc
index 54ab0818ebae..574fcd97fd6d 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/account/ad_rewards/ad_rewards.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/account/ad_rewards/ad_rewards.cc
@@ -291,7 +291,7 @@ void AdRewards::Retry() {
   }
 
   const base::Time time = retry_timer_.StartWithPrivacy(
-      base::TimeDelta::FromSeconds(kRetryAfterSeconds),
+      base::Seconds(kRetryAfterSeconds),
       base::BindOnce(&AdRewards::OnRetry, base::Unretained(this)));
 
   BLOG(1, "Retry reconciling ad rewards " << FriendlyDateAndTime(time));
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/account/confirmations/confirmations.cc b/vendor/bat-native-ads/src/bat/ads/internal/account/confirmations/confirmations.cc
index 4313ab1eb1fb..c472515db62c 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/account/confirmations/confirmations.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/account/confirmations/confirmations.cc
@@ -99,7 +99,7 @@ void Confirmations::Retry() {
 
   DCHECK(!retry_timer_.IsRunning());
   const base::Time& time = retry_timer_.StartWithPrivacy(
-      base::TimeDelta::FromSeconds(kRetryAfterSeconds),
+      base::Seconds(kRetryAfterSeconds),
       base::BindOnce(&Confirmations::OnRetry, base::Unretained(this)));
 
   BLOG(1, "Retry sending failed confirmations " << FriendlyDateAndTime(time));
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/ad_event_util_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/ad_event_util_unittest.cc
index 482cccacecc8..bdbeca6e2bc2 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/ad_event_util_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/ad_event_util_unittest.cc
@@ -39,8 +39,7 @@ TEST(BatAdsAdEventUtilTest, GetLastSeenAdTimeForUnseenAd) {
   const CreativeAdNotificationInfo creative_ad_1 =
       BuildCreativeAdNotification();
 
-  const base::Time event_time =
-      base::Time::Now() - base::TimeDelta::FromHours(12);
+  const base::Time event_time = base::Time::Now() - base::Hours(12);
   const AdEventInfo ad_event =
       BuildAdEvent(creative_ad_1, ConfirmationType::kViewed, event_time);
   ad_events.push_back(ad_event);
@@ -67,24 +66,20 @@ TEST(BatAdsAdEventUtilTest, GetLastSeenAdTime) {
   const CreativeAdNotificationInfo creative_ad_2 =
       BuildCreativeAdNotification();
 
-  const AdEventInfo ad_event_4 =
-      BuildAdEvent(creative_ad_1, ConfirmationType::kConversion,
-                   now - base::TimeDelta::FromHours(3));
+  const AdEventInfo ad_event_4 = BuildAdEvent(
+      creative_ad_1, ConfirmationType::kConversion, now - base::Hours(3));
   ad_events.push_back(ad_event_4);
 
-  const AdEventInfo ad_event_3 =
-      BuildAdEvent(creative_ad_1, ConfirmationType::kViewed,
-                   now - base::TimeDelta::FromHours(6));
+  const AdEventInfo ad_event_3 = BuildAdEvent(
+      creative_ad_1, ConfirmationType::kViewed, now - base::Hours(6));
   ad_events.push_back(ad_event_3);
 
-  const AdEventInfo ad_event_2 =
-      BuildAdEvent(creative_ad_2, ConfirmationType::kViewed,
-                   now - base::TimeDelta::FromHours(11));
+  const AdEventInfo ad_event_2 = BuildAdEvent(
+      creative_ad_2, ConfirmationType::kViewed, now - base::Hours(11));
   ad_events.push_back(ad_event_2);
 
-  const AdEventInfo ad_event_1 =
-      BuildAdEvent(creative_ad_1, ConfirmationType::kViewed,
-                   now - base::TimeDelta::FromHours(12));
+  const AdEventInfo ad_event_1 = BuildAdEvent(
+      creative_ad_1, ConfirmationType::kViewed, now - base::Hours(12));
   ad_events.push_back(ad_event_1);
 
   // Act
@@ -92,8 +87,7 @@ TEST(BatAdsAdEventUtilTest, GetLastSeenAdTime) {
       GetLastSeenAdTime(ad_events, creative_ad_1);
 
   // Assert
-  const base::Time expected_last_seen_ad_time =
-      now - base::TimeDelta::FromHours(6);
+  const base::Time expected_last_seen_ad_time = now - base::Hours(6);
   EXPECT_EQ(expected_last_seen_ad_time, last_seen_ad_time.value());
 }
 
@@ -118,8 +112,7 @@ TEST(BatAdsAdEventUtilTest, GetLastSeenAdvertiserTimeForUnseenAdvertiser) {
   const CreativeAdNotificationInfo creative_ad_1 =
       BuildCreativeAdNotification();
 
-  const base::Time event_time =
-      base::Time::Now() - base::TimeDelta::FromHours(12);
+  const base::Time event_time = base::Time::Now() - base::Hours(12);
   const AdEventInfo ad_event =
       BuildAdEvent(creative_ad_1, ConfirmationType::kViewed, event_time);
   ad_events.push_back(ad_event);
@@ -152,24 +145,20 @@ TEST(BatAdsAdEventUtilTest, GetLastSeenAdvertiserTime) {
 
   const base::Time now = base::Time::Now();
 
-  const AdEventInfo ad_event_4 =
-      BuildAdEvent(creative_ad_1, ConfirmationType::kViewed,
-                   now - base::TimeDelta::FromHours(3));
+  const AdEventInfo ad_event_4 = BuildAdEvent(
+      creative_ad_1, ConfirmationType::kViewed, now - base::Hours(3));
   ad_events.push_back(ad_event_4);
 
-  const AdEventInfo ad_event_3 =
-      BuildAdEvent(creative_ad_3, ConfirmationType::kViewed,
-                   now - base::TimeDelta::FromHours(6));
+  const AdEventInfo ad_event_3 = BuildAdEvent(
+      creative_ad_3, ConfirmationType::kViewed, now - base::Hours(6));
   ad_events.push_back(ad_event_3);
 
-  const AdEventInfo ad_event_2 =
-      BuildAdEvent(creative_ad_2, ConfirmationType::kViewed,
-                   now - base::TimeDelta::FromHours(11));
+  const AdEventInfo ad_event_2 = BuildAdEvent(
+      creative_ad_2, ConfirmationType::kViewed, now - base::Hours(11));
   ad_events.push_back(ad_event_2);
 
-  const AdEventInfo ad_event_1 =
-      BuildAdEvent(creative_ad_1, ConfirmationType::kViewed,
-                   now - base::TimeDelta::FromHours(12));
+  const AdEventInfo ad_event_1 = BuildAdEvent(
+      creative_ad_1, ConfirmationType::kViewed, now - base::Hours(12));
   ad_events.push_back(ad_event_1);
 
   // Act
@@ -177,8 +166,7 @@ TEST(BatAdsAdEventUtilTest, GetLastSeenAdvertiserTime) {
       GetLastSeenAdvertiserTime(ad_events, creative_ad_3);
 
   // Assert
-  const base::Time expected_last_seen_advertiser_time =
-      now - base::TimeDelta::FromHours(3);
+  const base::Time expected_last_seen_advertiser_time = now - base::Hours(3);
   EXPECT_EQ(expected_last_seen_advertiser_time,
             last_seen_advertiser_time.value());
 }
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_server/ad_server.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_server/ad_server.cc
index 14dcd1166912..e42accdbc2f2 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ad_server/ad_server.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_server/ad_server.cc
@@ -150,7 +150,7 @@ void AdServer::FetchAfterDelay() {
       g_is_debug ? kDebugCatalogPing
                  : AdsClientHelper::Get()->GetInt64Pref(prefs::kCatalogPing);
 
-  const base::TimeDelta delay = base::TimeDelta::FromSeconds(ping);
+  const base::TimeDelta delay = base::Seconds(ping);
 
   const base::Time time = timer_.StartWithPrivacy(
       delay, base::BindOnce(&AdServer::Fetch, base::Unretained(this)));
@@ -160,7 +160,7 @@ void AdServer::FetchAfterDelay() {
 
 void AdServer::Retry() {
   const base::Time time = retry_timer_.StartWithPrivacy(
-      base::TimeDelta::FromSeconds(kRetryAfterSeconds),
+      base::Seconds(kRetryAfterSeconds),
       base::BindOnce(&AdServer::OnRetry, base::Unretained(this)));
 
   BLOG(1, "Retry fetching catalog " << FriendlyDateAndTime(time));
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving.cc
index 0e8324125e2d..dded5fadaaf8 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving.cc
@@ -39,14 +39,11 @@ namespace ad_notifications {
 
 namespace {
 
-constexpr base::TimeDelta kServeFirstAdAfterDelay =
-    base::TimeDelta::FromMinutes(2);
+constexpr base::TimeDelta kServeFirstAdAfterDelay = base::Minutes(2);
 
-constexpr base::TimeDelta kMinimumDelayBeforeServingAnAd =
-    base::TimeDelta::FromMinutes(1);
+constexpr base::TimeDelta kMinimumDelayBeforeServingAnAd = base::Minutes(1);
 
-constexpr base::TimeDelta kRetryServingAdAfterDelay =
-    base::TimeDelta::FromMinutes(2);
+constexpr base::TimeDelta kRetryServingAdAfterDelay = base::Minutes(2);
 
 }  // namespace
 
@@ -226,7 +223,7 @@ void AdServing::MaybeServeAdAtNextRegularInterval() {
   }
 
   const int64_t seconds = base::Time::kSecondsPerHour / ads_per_hour;
-  const base::TimeDelta delay = base::TimeDelta::FromSeconds(seconds);
+  const base::TimeDelta delay = base::Seconds(seconds);
   const base::Time serve_ad_at = MaybeServeAdAfter(delay);
   BLOG(1, "Maybe serve ad notification " << FriendlyDateAndTime(serve_ad_at));
 }
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving_test.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving_test.cc
index b13a020943ea..bf5a047ce2d0 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving_test.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_notifications/ad_notification_serving_test.cc
@@ -193,12 +193,15 @@ TEST_F(BatAdsAdNotificationServingTest, ServeAdWithAdServingVersion2) {
                                          &anti_targeting_resource);
 
   std::map<std::string, std::string> ad_serving_parameters;
-  ad_serving_parameters["ad_serving_version"] = 2;
+  ad_serving_parameters["ad_serving_version"] = "2";
 
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitWithFeaturesAndParameters(
       {{features::kAdServing, ad_serving_parameters}}, {});
 
+  ASSERT_TRUE(features::IsAdServingEnabled());
+  ASSERT_EQ(2, features::GetAdServingVersion());
+
   // Act
   EXPECT_CALL(*ads_client_mock_, ShowNotification(DoesMatchCreativeInstanceId(
                                      creative_ad.creative_instance_id)))
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/subdivision_targeting.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/subdivision_targeting.cc
index cfc27a024ba3..1a0d25f17a8d 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/subdivision_targeting.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/geographic/subdivision/subdivision_targeting.cc
@@ -259,7 +259,7 @@ bool SubdivisionTargeting::ParseJson(const std::string& json) {
 
 void SubdivisionTargeting::Retry() {
   const base::Time time = retry_timer_.StartWithPrivacy(
-      base::TimeDelta::FromSeconds(kRetryAfterSeconds),
+      base::Seconds(kRetryAfterSeconds),
       base::BindOnce(&SubdivisionTargeting::Fetch, base::Unretained(this)));
 
   BLOG(1, "Retry fetching subdivision target " << FriendlyDateAndTime(time));
@@ -269,7 +269,7 @@ void SubdivisionTargeting::FetchAfterDelay() {
   const int64_t ping = g_is_debug ? kDebugFetchSubdivisionTargetingPing
                                   : kFetchSubdivisionTargetingPing;
 
-  const base::TimeDelta delay = base::TimeDelta::FromSeconds(ping);
+  const base::TimeDelta delay = base::Seconds(ping);
 
   const base::Time time = timer_.StartWithPrivacy(
       delay,
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model.cc
index 2fddd12c4809..e99dfe64197e 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model.cc
@@ -28,7 +28,7 @@ uint16_t CalculateScoreForHistory(
   const int64_t time_window = features::GetPurchaseIntentTimeWindowInSeconds();
   for (const auto& signal_segment : history) {
     const base::Time signal_decayed_time =
-        signal_segment.created_at + base::TimeDelta::FromSeconds(time_window);
+        signal_segment.created_at + base::Seconds(time_window);
 
     if (base::Time::Now() > signal_decayed_time) {
       continue;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model_unittest.cc
index 7201c7b9e294..ebcdf9e49ae5 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_serving/ad_targeting/models/behavioral/purchase_intent/purchase_intent_model_unittest.cc
@@ -51,7 +51,7 @@ TEST_F(BatAdsPurchaseIntentModelTest, DoNotGetSegmentsForExpiredSignals) {
   const GURL url_1 = GURL("https://www.brave.com/test?foo=bar");
   processor.Process(url_1);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(1));
+  FastForwardClockBy(base::Days(1));
 
   const GURL url_2 = GURL("https://www.basicattentiontoken.org/test?bar=foo");
   processor.Process(url_2);
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/processors/behavioral/purchase_intent/purchase_intent_processor_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/processors/behavioral/purchase_intent/purchase_intent_processor_unittest.cc
index ffdfc4c016a0..13bac1fedfe3 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/processors/behavioral/purchase_intent/purchase_intent_processor_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/processors/behavioral/purchase_intent/purchase_intent_processor_unittest.cc
@@ -144,7 +144,7 @@ TEST_F(BatAdsPurchaseIntentProcessorTest, ProcessMultipleUniqueUrls) {
   const GURL url_1 = GURL("https://www.brave.com/test?foo=bar");
   processor.Process(url_1);
 
-  FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+  FastForwardClockBy(base::Minutes(5));
 
   const base::Time now_2 = Now();
   const GURL url_2 = GURL("https://www.basicattentiontoken.org/test?foo=bar");
@@ -180,7 +180,7 @@ TEST_F(BatAdsPurchaseIntentProcessorTest, ProcessMultipleMatchingKeywords) {
       GURL("https://duckduckgo.com/?q=segment+keyword+1&foo=bar");
   processor.Process(url_1);
 
-  FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+  FastForwardClockBy(base::Minutes(5));
 
   const base::Time now_2 = Now();
   const GURL url_2 =
@@ -215,7 +215,7 @@ TEST_F(BatAdsPurchaseIntentProcessorTest, ProcessMultipleUniqueKeywords) {
       GURL("https://duckduckgo.com/?q=segment+keyword+1&foo=bar");
   processor.Process(url_1);
 
-  FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+  FastForwardClockBy(base::Minutes(5));
 
   const base::Time now_2 = Now();
   const GURL url_2 = GURL("https://google.com/?q=segment+keyword+1&bar=foo");
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_transfer/ad_transfer.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_transfer/ad_transfer.cc
index bf63667cd7eb..e65beab75710 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ad_transfer/ad_transfer.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_transfer/ad_transfer.cc
@@ -75,8 +75,7 @@ void AdTransfer::TransferAd(const int32_t tab_id,
 
   transferring_ad_tab_id_ = tab_id;
 
-  const base::TimeDelta delay =
-      base::TimeDelta::FromSeconds(kTransferAdAfterSeconds);
+  const base::TimeDelta delay = base::Seconds(kTransferAdAfterSeconds);
 
   const base::Time time = timer_.Start(
       delay, base::BindOnce(&AdTransfer::OnTransferAd, base::Unretained(this),
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_transfer/ad_transfer_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_transfer/ad_transfer_unittest.cc
index ee8a99032106..dd52c2fc6295 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ad_transfer/ad_transfer_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_transfer/ad_transfer_unittest.cc
@@ -58,7 +58,7 @@ TEST_F(BatAdsAdTransferTest, DoNotTransferAdIfUrlIsMissingHTTPOrHTTPSScheme) {
 
   // Act
   ad_transfer_->MaybeTransferAd(1, {"brave.com"});
-  FastForwardClockBy(base::TimeDelta::FromSeconds(10));
+  FastForwardClockBy(base::Seconds(10));
 
   // Assert
   EXPECT_EQ(0, GetAdTransferCount());
@@ -75,7 +75,7 @@ TEST_F(BatAdsAdTransferTest,
 
   // Act
   ad_transfer_->MaybeTransferAd(1, {"brave.com"});
-  FastForwardClockBy(base::TimeDelta::FromSeconds(10));
+  FastForwardClockBy(base::Seconds(10));
 
   // Assert
   EXPECT_EQ(0, GetAdTransferCount());
@@ -93,7 +93,7 @@ TEST_F(BatAdsAdTransferTest, DoNotTransferAdIfTheSameAdIsAlreadyTransferring) {
 
   // Act
   ad_transfer_->MaybeTransferAd(1, {"https://brave.com"});
-  FastForwardClockBy(base::TimeDelta::FromSeconds(10));
+  FastForwardClockBy(base::Seconds(10));
 
   // Assert
   EXPECT_EQ(1, GetAdTransferCount());
@@ -117,7 +117,7 @@ TEST_F(BatAdsAdTransferTest, TransferAdIfAnotherAdIsAlreadyTransferring) {
 
   // Act
   ad_transfer_->MaybeTransferAd(2, {"https://brave.com"});
-  FastForwardClockBy(base::TimeDelta::FromSeconds(10));
+  FastForwardClockBy(base::Seconds(10));
 
   // Assert
   EXPECT_EQ(1, GetAdTransferCount());
@@ -134,7 +134,7 @@ TEST_F(BatAdsAdTransferTest,
 
   // Act
   ad_transfer_->MaybeTransferAd(1, {"https://brave.com"});
-  FastForwardClockBy(base::TimeDelta::FromSeconds(10));
+  FastForwardClockBy(base::Seconds(10));
 
   // Assert
   EXPECT_EQ(1, GetAdTransferCount());
@@ -150,7 +150,7 @@ TEST_F(BatAdsAdTransferTest, FailToTransferAdIfNotVisible) {
 
   // Act
   ad_transfer_->MaybeTransferAd(1, {"https://brave.com"});
-  FastForwardClockBy(base::TimeDelta::FromSeconds(10));
+  FastForwardClockBy(base::Seconds(10));
 
   // Assert
   EXPECT_EQ(-1, GetAdTransferCount());
@@ -171,7 +171,7 @@ TEST_F(BatAdsAdTransferTest,
   TabManager::Get()->OnUpdated(1, "https://foobar.com", /* is_visible */ true,
                                /* is_incognito */ false);
 
-  FastForwardClockBy(base::TimeDelta::FromSeconds(10));
+  FastForwardClockBy(base::Seconds(10));
 
   // Assert
   EXPECT_EQ(-1, GetAdTransferCount());
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ads_history/ads_history_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ads_history/ads_history_unittest.cc
index 82426ad9d336..bd0d003a0c2f 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ads_history/ads_history_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ads_history/ads_history_unittest.cc
@@ -31,7 +31,7 @@ class BatAdsAdsHistoryTest : public UnitTestBase {
   void SetUp() override {
     UnitTestBase::SetUp();
 
-    AdvanceClock(base::TimeDelta::FromDays(history::kForDays));
+    AdvanceClock(base::Days(history::kForDays));
   }
 };
 
@@ -161,7 +161,7 @@ TEST_F(BatAdsAdsHistoryTest, PurgedHistoryEntriesOnOrAfter30Days) {
   NewTabPageAdInfo new_tab_page_ad;
   history::AddNewTabPageAd(new_tab_page_ad, ConfirmationType::kViewed);
 
-  AdvanceClock(base::TimeDelta::FromDays(30) + base::TimeDelta::FromSeconds(1));
+  AdvanceClock(base::Days(30) + base::Seconds(1));
 
   // Act
   PromotedContentAdInfo promoted_content_ad;
@@ -177,7 +177,7 @@ TEST_F(BatAdsAdsHistoryTest, DoNotPurgedHistoryEntriesBefore30Days) {
   NewTabPageAdInfo new_tab_page_ad;
   history::AddNewTabPageAd(new_tab_page_ad, ConfirmationType::kViewed);
 
-  AdvanceClock(base::TimeDelta::FromDays(30));
+  AdvanceClock(base::Days(30));
 
   // Act
   PromotedContentAdInfo promoted_content_ad;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ads_impl.cc b/vendor/bat-native-ads/src/bat/ads/internal/ads_impl.cc
index 6c826daa8e15..4feddadb5019 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/ads_impl.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/ads_impl.cc
@@ -223,8 +223,7 @@ void AdsImpl::OnUnIdle(const int idle_time, const bool was_locked) {
 
   MaybeUpdateIdleTimeThreshold();
 
-  BLOG(1, "Browser state changed to unidle after "
-              << base::TimeDelta::FromSeconds(idle_time));
+  BLOG(1, "Browser state changed to unidle after " << base::Seconds(idle_time));
 
   MaybeUpdateCatalog();
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/backoff_timer.cc b/vendor/bat-native-ads/src/bat/ads/internal/backoff_timer.cc
index 6774fb9be281..fb7db446588f 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/backoff_timer.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/backoff_timer.cc
@@ -12,7 +12,7 @@
 namespace ads {
 
 BackoffTimer::BackoffTimer() {
-  max_backoff_delay_ = base::TimeDelta::FromHours(1);
+  max_backoff_delay_ = base::Hours(1);
 }
 
 BackoffTimer::~BackoffTimer() = default;
@@ -58,8 +58,7 @@ base::TimeDelta BackoffTimer::CalculateDelay(const base::TimeDelta& delay) {
   int64_t delay_in_seconds = delay.InSeconds();
   delay_in_seconds <<= backoff_count_++;
 
-  base::TimeDelta backoff_delay =
-      base::TimeDelta::FromSeconds(delay_in_seconds);
+  base::TimeDelta backoff_delay = base::Seconds(delay_in_seconds);
   if (backoff_delay > max_backoff_delay_) {
     backoff_delay = max_backoff_delay_;
   }
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/browser_manager/browser_manager_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/browser_manager/browser_manager_unittest.cc
index fa5f0aecbff3..bbf6f73d464d 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/browser_manager/browser_manager_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/browser_manager/browser_manager_unittest.cc
@@ -52,8 +52,7 @@ TEST_F(BatAdsBrowserManagerTest, BrowserWindowIsActiveUserActivityEvent) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
@@ -84,8 +83,7 @@ TEST_F(BatAdsBrowserManagerTest, BrowserWindowIsInactiveUserActivityEvent) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
@@ -115,8 +113,7 @@ TEST_F(BatAdsBrowserManagerTest, BrowserDidBecomeActiveUserActivityEvent) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
@@ -147,8 +144,7 @@ TEST_F(BatAdsBrowserManagerTest, BrowserDidEnterBackgroundUserActivityEvent) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_info.cc b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_info.cc
index 722ec17b7b4d..8ed40baaecef 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_info.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_info.cc
@@ -165,8 +165,8 @@ bool CatalogInfo::FromJson(const std::string& json,
           continue;
         }
 
-        conversion.expire_at = end_at_time + base::TimeDelta::FromDays(
-                                                 conversion.observation_window);
+        conversion.expire_at =
+            end_at_time + base::Days(conversion.observation_window);
 
         creative_set_info.conversions.push_back(conversion);
       }
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util.cc b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util.cc
index cd9d5302960e..e64e890c920b 100755
--- a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util.cc
@@ -30,7 +30,7 @@ bool HasCatalogExpired() {
   const base::Time time =
       base::Time::FromDoubleT(catalog_last_updated_timestamp);
 
-  if (now < time + base::TimeDelta::FromDays(kCatalogLifespanInDays)) {
+  if (now < time + base::Days(kCatalogLifespanInDays)) {
     return false;
   }
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util_unittest.cc
index 05aaac7bdd5e..bd542fe6b7af 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util_unittest.cc
@@ -51,7 +51,7 @@ TEST_F(BatAdsCatalogUtilTest, CatalogHasExpired) {
                                         NowAsTimestamp());
 
   // Act
-  AdvanceClock(base::TimeDelta::FromDays(1));
+  AdvanceClock(base::Days(1));
 
   // Assert
   const bool has_expired = HasCatalogExpired();
@@ -64,7 +64,7 @@ TEST_F(BatAdsCatalogUtilTest, CatalogHasNotExpired) {
                                         NowAsTimestamp());
 
   // Act
-  AdvanceClock(base::TimeDelta::FromDays(1) - base::TimeDelta::FromSeconds(1));
+  AdvanceClock(base::Days(1) - base::Seconds(1));
 
   // Assert
   const bool has_expired = HasCatalogExpired();
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/client/client.cc b/vendor/bat-native-ads/src/bat/ads/internal/client/client.cc
index 4a88d387b1cc..59908c8059fa 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/client/client.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/client/client.cc
@@ -129,7 +129,7 @@ void Client::AppendAdHistory(const AdHistoryInfo& ad_history) {
   client_->ads_shown_history.push_front(ad_history);
 
   const base::Time distant_past =
-      base::Time::Now() - base::TimeDelta::FromDays(history::kForDays);
+      base::Time::Now() - base::Days(history::kForDays);
 
   const auto iter = std::remove_if(
       client_->ads_shown_history.begin(), client_->ads_shown_history.end(),
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversions.cc b/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversions.cc
index f7166ff4729b..0973afbb9cd7 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversions.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversions.cc
@@ -43,8 +43,7 @@ const char kSearchInUrl[] = "url";
 
 bool HasObservationWindowForAdEventExpired(const int observation_window,
                                            const AdEventInfo& ad_event) {
-  const base::Time time =
-      base::Time::Now() - base::TimeDelta::FromDays(observation_window);
+  const base::Time time = base::Time::Now() - base::Days(observation_window);
 
   if (time < ad_event.created_at) {
     return false;
@@ -388,7 +387,7 @@ void Conversions::AddItemToQueue(
   const int64_t rand_delay = static_cast<int64_t>(brave_base::random::Geometric(
       g_is_debug ? kDebugConvertAfterSeconds : kConvertAfterSeconds));
   conversion_queue_item.confirm_at =
-      base::Time::Now() + base::TimeDelta::FromSeconds(rand_delay);
+      base::Time::Now() + base::Seconds(rand_delay);
 
   database::table::ConversionQueue database_table;
   database_table.Save({conversion_queue_item}, [=](const bool success) {
@@ -484,7 +483,7 @@ void Conversions::StartTimer(
   } else {
     const int64_t rand_delay = static_cast<int64_t>(
         brave_base::random::Geometric(kExpiredConvertAfterSeconds));
-    delay = base::TimeDelta::FromSeconds(rand_delay);
+    delay = base::Seconds(rand_delay);
   }
 
   const base::Time time = timer_.Start(
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversions_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversions_unittest.cc
index 4d373ec7b52a..c476ec281ccf 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversions_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversions_unittest.cc
@@ -41,7 +41,7 @@ class BatAdsConversionsTest : public UnitTestBase {
   }
 
   base::Time CalculateExpireAtTime(const int observation_window) {
-    return Now() + base::TimeDelta::FromDays(observation_window);
+    return Now() + base::Days(observation_window);
   }
 
   std::unique_ptr<Conversions> conversions_;
@@ -192,7 +192,7 @@ TEST_F(BatAdsConversionsTest, ConvertMultipleAds) {
                    conversion_1.creative_set_id, ConfirmationType::kViewed);
   FireAdEvent(ad_event_1);
 
-  AdvanceClock(base::TimeDelta::FromMinutes(1));
+  AdvanceClock(base::Minutes(1));
 
   const AdEventInfo ad_event_2 =
       BuildAdEvent("da2d3397-bc97-46d1-a323-d8723c0a6b33",
@@ -471,8 +471,7 @@ TEST_F(BatAdsConversionsTest, ConvertAdWhenTheConversionIsOnTheCuspOfExpiring) {
       BuildAdEvent(conversion.creative_set_id, ConfirmationType::kViewed);
   FireAdEvent(ad_event);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromDays(3) -
-                                  base::TimeDelta::FromMinutes(1));
+  task_environment_.FastForwardBy(base::Days(3) - base::Minutes(1));
 
   // Act
   conversions_->MaybeConvert({"https://foo.bar.com/qux"}, "", {});
@@ -512,7 +511,7 @@ TEST_F(BatAdsConversionsTest, DoNotConvertAdWhenTheConversionHasExpired) {
       BuildAdEvent(conversion.creative_set_id, ConfirmationType::kViewed);
   FireAdEvent(ad_event);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromDays(3));
+  task_environment_.FastForwardBy(base::Days(3));
 
   // Act
   conversions_->MaybeConvert({"https://www.foo.com/bar/qux"}, "", {});
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/database/tables/conversions_database_table_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/database/tables/conversions_database_table_unittest.cc
index dbed8c73d9b3..e903f50e7321 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/database/tables/conversions_database_table_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/database/tables/conversions_database_table_unittest.cc
@@ -34,7 +34,7 @@ class BatAdsConversionsDatabaseTableTest : public UnitTestBase {
   }
 
   base::Time CalculateExpireAtTime(const int observation_window) {
-    return Now() + base::TimeDelta::FromDays(observation_window);
+    return Now() + base::Days(observation_window);
   }
 
   std::unique_ptr<database::table::Conversions> database_table_;
@@ -151,7 +151,7 @@ TEST_F(BatAdsConversionsDatabaseTableTest, PurgeExpiredConversions) {
   Save(conversions);
 
   // Act
-  FastForwardClockBy(base::TimeDelta::FromDays(4));
+  FastForwardClockBy(base::Days(4));
 
   PurgeExpired();
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_ad_notifications_database_table_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_ad_notifications_database_table_unittest.cc
index 80a4ec3671fa..dc46bedca72f 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_ad_notifications_database_table_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_ad_notifications_database_table_unittest.cc
@@ -572,7 +572,7 @@ TEST_F(BatAdsCreativeAdNotificationsDatabaseTableTest,
   Save(creative_ads);
 
   // Act
-  FastForwardClockBy(base::TimeDelta::FromHours(1));
+  FastForwardClockBy(base::Hours(1));
 
   // Assert
   CreativeAdNotificationList expected_creative_ads;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_inline_content_ads_database_table_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_inline_content_ads_database_table_unittest.cc
index 1d6ea2829731..b92293ad4584 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_inline_content_ads_database_table_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_inline_content_ads_database_table_unittest.cc
@@ -670,7 +670,7 @@ TEST_F(BatAdsCreativeInlineContentAdsDatabaseTableTest,
   Save(creative_ads);
 
   // Act
-  FastForwardClockBy(base::TimeDelta::FromHours(1));
+  FastForwardClockBy(base::Hours(1));
 
   // Assert
   CreativeInlineContentAdList expected_creative_ads;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_new_tab_page_ads_database_table_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_new_tab_page_ads_database_table_unittest.cc
index 6f71d8d458c9..626b49fdc7d4 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_new_tab_page_ads_database_table_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_new_tab_page_ads_database_table_unittest.cc
@@ -673,7 +673,7 @@ TEST_F(BatAdsCreativeNewTabPageAdsDatabaseTableTest,
   Save(creative_new_tab_page_ads);
 
   // Act
-  FastForwardClockBy(base::TimeDelta::FromSeconds(1));
+  FastForwardClockBy(base::Seconds(1));
 
   // Assert
   CreativeNewTabPageAdList expected_creative_new_tab_page_ads;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_promoted_content_ads_database_table_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_promoted_content_ads_database_table_unittest.cc
index 0bce595c0342..64e47189a9ed 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_promoted_content_ads_database_table_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_promoted_content_ads_database_table_unittest.cc
@@ -684,7 +684,7 @@ TEST_F(BatAdsCreativePromotedContentAdsDatabaseTableTest,
   Save(creative_promoted_content_ads);
 
   // Act
-  FastForwardClockBy(base::TimeDelta::FromHours(1));
+  FastForwardClockBy(base::Hours(1));
 
   // Assert
   CreativePromotedContentAdList expected_creative_promoted_content_ads;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/features/user_activity/user_activity_features.cc b/vendor/bat-native-ads/src/bat/ads/internal/features/user_activity/user_activity_features.cc
index 724319e97528..8e783f2e2b61 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/features/user_activity/user_activity_features.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/features/user_activity/user_activity_features.cc
@@ -19,15 +19,14 @@ const char kFeatureName[] = "UserActivity";
 const char kFieldTrialParameterTriggers[] = "triggers";
 const char kDefaultTriggers[] = "01=.5;02=.5;08=1;09=1;0D=1;0E=1";
 const char kFieldTrialParameterTimeWindow[] = "time_window";
-const base::TimeDelta kDefaultTimeWindow = base::TimeDelta::FromHours(1);
+const base::TimeDelta kDefaultTimeWindow = base::Hours(1);
 const char kFieldTrialParameterThreshold[] = "threshold";
 const double kDefaultTreshold = 2.0;
 
 const char kFieldTrialParameterIdleTimeThreshold[] = "idle_time_threshold";
-const base::TimeDelta kDefaultIdleTimeThreshold =
-    base::TimeDelta::FromSeconds(15);
+const base::TimeDelta kDefaultIdleTimeThreshold = base::Seconds(15);
 const char kFieldTrialParameterMaximumIdleTime[] = "maximum_idle_time";
-const base::TimeDelta kDefaultMaximumIdleTime = base::TimeDelta::FromSeconds(0);
+const base::TimeDelta kDefaultMaximumIdleTime = base::Seconds(0);
 
 const char kFieldTrialParameterShouldDetectWasLocked[] =
     "should_detect_was_locked";
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/features/user_activity/user_activity_features_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/features/user_activity/user_activity_features_unittest.cc
index 36b2f5baa348..3a9ce4fa3352 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/features/user_activity/user_activity_features_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/features/user_activity/user_activity_features_unittest.cc
@@ -122,7 +122,7 @@ TEST(BatAdsUserActivityFeaturesTest, TimeWindow) {
   const base::TimeDelta time_window = features::user_activity::GetTimeWindow();
 
   // Assert
-  const base::TimeDelta expected_time_window = base::TimeDelta::FromHours(2);
+  const base::TimeDelta expected_time_window = base::Hours(2);
   EXPECT_EQ(expected_time_window, time_window);
 }
 
@@ -141,7 +141,7 @@ TEST(BatAdsUserActivityFeaturesTest, DefaultTimeWindow) {
   const base::TimeDelta time_window = features::user_activity::GetTimeWindow();
 
   // Assert
-  const base::TimeDelta expected_time_window = base::TimeDelta::FromHours(1);
+  const base::TimeDelta expected_time_window = base::Hours(1);
   EXPECT_EQ(expected_time_window, time_window);
 }
 
@@ -161,7 +161,7 @@ TEST(BatAdsUserActivityFeaturesTest, DefaultTimeWindowWhenDisabled) {
   const base::TimeDelta time_window = features::user_activity::GetTimeWindow();
 
   // Assert
-  const base::TimeDelta expected_time_window = base::TimeDelta::FromHours(1);
+  const base::TimeDelta expected_time_window = base::Hours(1);
   EXPECT_EQ(expected_time_window, time_window);
 }
 
@@ -245,8 +245,7 @@ TEST(BatAdsUserActivityFeaturesTest, IdleTimeThreshold) {
       features::user_activity::GetIdleTimeThreshold();
 
   // Assert
-  const base::TimeDelta expected_idle_time_threshold =
-      base::TimeDelta::FromSeconds(5);
+  const base::TimeDelta expected_idle_time_threshold = base::Seconds(5);
   EXPECT_EQ(expected_idle_time_threshold, idle_time_threshold);
 }
 
@@ -266,8 +265,7 @@ TEST(BatAdsUserActivityFeaturesTest, DefaultIdleTimeThreshold) {
       features::user_activity::GetIdleTimeThreshold();
 
   // Assert
-  const base::TimeDelta expected_idle_time_threshold =
-      base::TimeDelta::FromSeconds(15);
+  const base::TimeDelta expected_idle_time_threshold = base::Seconds(15);
   EXPECT_EQ(expected_idle_time_threshold, idle_time_threshold);
 }
 
@@ -288,8 +286,7 @@ TEST(BatAdsUserActivityFeaturesTest, DefaultIdleTimeThresholdWhenDisabled) {
       features::user_activity::GetIdleTimeThreshold();
 
   // Assert
-  const base::TimeDelta expected_idle_time_threshold =
-      base::TimeDelta::FromSeconds(15);
+  const base::TimeDelta expected_idle_time_threshold = base::Seconds(15);
   EXPECT_EQ(expected_idle_time_threshold, idle_time_threshold);
 }
 
@@ -312,8 +309,7 @@ TEST(BatAdsUserActivityFeaturesTest, MaximumIdleTime) {
       features::user_activity::GetMaximumIdleTime();
 
   // Assert
-  const base::TimeDelta expected_maximum_idle_time =
-      base::TimeDelta::FromMinutes(30);
+  const base::TimeDelta expected_maximum_idle_time = base::Minutes(30);
   EXPECT_EQ(expected_maximum_idle_time, maximum_idle_time);
 }
 
@@ -333,8 +329,7 @@ TEST(BatAdsUserActivityFeaturesTest, DefaultMaximumIdleTime) {
       features::user_activity::GetMaximumIdleTime();
 
   // Assert
-  const base::TimeDelta expected_maximum_idle_time =
-      base::TimeDelta::FromSeconds(0);
+  const base::TimeDelta expected_maximum_idle_time = base::Seconds(0);
   EXPECT_EQ(expected_maximum_idle_time, maximum_idle_time);
 }
 
@@ -355,8 +350,7 @@ TEST(BatAdsUserActivityFeaturesTest, DefaultMaximumIdleTimeWhenDisabled) {
       features::user_activity::GetMaximumIdleTime();
 
   // Assert
-  const base::TimeDelta expected_maximum_idle_time =
-      base::TimeDelta::FromSeconds(0);
+  const base::TimeDelta expected_maximum_idle_time = base::Seconds(0);
   EXPECT_EQ(expected_maximum_idle_time, maximum_idle_time);
 }
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap.cc
index 4af05154527f..fa2dd9820d69 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap.cc
@@ -43,8 +43,8 @@ bool DailyCapFrequencyCap::DoesRespectCap(const AdEventList& ad_events,
                                           const CreativeAdInfo& creative_ad) {
   const base::Time now = base::Time::Now();
 
-  const base::TimeDelta time_constraint = base::TimeDelta::FromSeconds(
-      base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
+  const base::TimeDelta time_constraint =
+      base::Seconds(base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
 
   const int count = std::count_if(
       ad_events.cbegin(), ad_events.cend(),
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap_unittest.cc
index 9aa97c1e4694..effab5817915 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap_unittest.cc
@@ -134,7 +134,7 @@ TEST_F(BatAdsDailyCapFrequencyCapTest, AllowAdIfDoesNotExceedCapWithin1Day) {
 
   ad_events.push_back(ad_event);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromHours(23));
+  task_environment_.FastForwardBy(base::Hours(23));
 
   // Act
   DailyCapFrequencyCap frequency_cap(ad_events);
@@ -157,7 +157,7 @@ TEST_F(BatAdsDailyCapFrequencyCapTest, AllowAdIfDoesNotExceedCapAfter1Day) {
 
   ad_events.push_back(ad_event);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromDays(1));
+  task_environment_.FastForwardBy(base::Days(1));
 
   // Act
   DailyCapFrequencyCap frequency_cap(ad_events);
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/dismissed_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/dismissed_frequency_cap_unittest.cc
index ac3a39fe912e..d90817f4383a 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/dismissed_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/dismissed_frequency_cap_unittest.cc
@@ -82,10 +82,10 @@ TEST_F(BatAdsDismissedFrequencyCapTest,
 
     ad_events.push_back(ad_event);
 
-    FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+    FastForwardClockBy(base::Minutes(5));
   }
 
-  FastForwardClockBy(base::TimeDelta::FromHours(47));
+  FastForwardClockBy(base::Hours(47));
 
   // Act
   DismissedFrequencyCap frequency_cap(ad_events);
@@ -167,10 +167,10 @@ TEST_F(BatAdsDismissedFrequencyCapTest,
 
     ad_events.push_back(ad_event);
 
-    FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+    FastForwardClockBy(base::Minutes(5));
   }
 
-  FastForwardClockBy(base::TimeDelta::FromHours(47));
+  FastForwardClockBy(base::Hours(47));
 
   // Act
   DismissedFrequencyCap frequency_cap(ad_events);
@@ -211,10 +211,10 @@ TEST_F(BatAdsDismissedFrequencyCapTest,
 
     ad_events.push_back(ad_event);
 
-    FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+    FastForwardClockBy(base::Minutes(5));
   }
 
-  FastForwardClockBy(base::TimeDelta::FromHours(48));
+  FastForwardClockBy(base::Hours(48));
 
   // Act
   DismissedFrequencyCap frequency_cap(ad_events);
@@ -255,10 +255,10 @@ TEST_F(BatAdsDismissedFrequencyCapTest,
 
     ad_events.push_back(ad_event);
 
-    FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+    FastForwardClockBy(base::Minutes(5));
   }
 
-  FastForwardClockBy(base::TimeDelta::FromHours(47));
+  FastForwardClockBy(base::Hours(47));
 
   // Act
   DismissedFrequencyCap frequency_cap(ad_events);
@@ -299,10 +299,10 @@ TEST_F(BatAdsDismissedFrequencyCapTest,
 
     ad_events.push_back(ad_event);
 
-    FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+    FastForwardClockBy(base::Minutes(5));
   }
 
-  FastForwardClockBy(base::TimeDelta::FromHours(48));
+  FastForwardClockBy(base::Hours(48));
 
   // Act
   DismissedFrequencyCap frequency_cap(ad_events);
@@ -344,10 +344,10 @@ TEST_F(BatAdsDismissedFrequencyCapTest,
 
     ad_events.push_back(ad_event);
 
-    FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+    FastForwardClockBy(base::Minutes(5));
   }
 
-  FastForwardClockBy(base::TimeDelta::FromHours(48));
+  FastForwardClockBy(base::Hours(48));
 
   // Act
   DismissedFrequencyCap frequency_cap(ad_events);
@@ -389,10 +389,10 @@ TEST_F(BatAdsDismissedFrequencyCapTest,
 
     ad_events.push_back(ad_event);
 
-    FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+    FastForwardClockBy(base::Minutes(5));
   }
 
-  FastForwardClockBy(base::TimeDelta::FromHours(47));
+  FastForwardClockBy(base::Hours(47));
 
   // Act
   DismissedFrequencyCap frequency_cap(ad_events);
@@ -434,10 +434,10 @@ TEST_F(BatAdsDismissedFrequencyCapTest,
 
     ad_events.push_back(ad_event);
 
-    FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+    FastForwardClockBy(base::Minutes(5));
   }
 
-  FastForwardClockBy(base::TimeDelta::FromHours(47));
+  FastForwardClockBy(base::Hours(47));
 
   // Act
   DismissedFrequencyCap frequency_cap(ad_events);
@@ -482,10 +482,10 @@ TEST_F(BatAdsDismissedFrequencyCapTest,
 
     ad_events.push_back(ad_event);
 
-    FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+    FastForwardClockBy(base::Minutes(5));
   }
 
-  FastForwardClockBy(base::TimeDelta::FromHours(47));
+  FastForwardClockBy(base::Hours(47));
 
   // Act
   DismissedFrequencyCap frequency_cap(ad_events);
@@ -518,10 +518,10 @@ TEST_F(BatAdsDismissedFrequencyCapTest,
 
     ad_events.push_back(ad_event);
 
-    FastForwardClockBy(base::TimeDelta::FromMinutes(5));
+    FastForwardClockBy(base::Minutes(5));
   }
 
-  FastForwardClockBy(base::TimeDelta::FromHours(48));
+  FastForwardClockBy(base::Hours(48));
 
   // Act
   DismissedFrequencyCap frequency_cap(ad_events);
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap.cc
index cf3b7659929a..e02d0cf1bfcd 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap.cc
@@ -48,8 +48,8 @@ bool PerDayFrequencyCap::DoesRespectCap(const AdEventList& ad_events,
 
   const base::Time now = base::Time::Now();
 
-  const base::TimeDelta time_constraint = base::TimeDelta::FromSeconds(
-      base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
+  const base::TimeDelta time_constraint =
+      base::Seconds(base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
 
   const int count = std::count_if(
       ad_events.cbegin(), ad_events.cend(),
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap_unittest.cc
index 6e6b12f1ac6a..cfe837481b5e 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap_unittest.cc
@@ -120,7 +120,7 @@ TEST_F(BatAdsPerDayFrequencyCapTest, AllowAdIfDoesNotExceedCapAfter1Day) {
   ad_events.push_back(ad_event);
   ad_events.push_back(ad_event);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(1));
+  FastForwardClockBy(base::Days(1));
 
   // Act
   PerDayFrequencyCap frequency_cap(ad_events);
@@ -144,7 +144,7 @@ TEST_F(BatAdsPerDayFrequencyCapTest, DoNotAllowAdIfExceedsCapWithin1Day) {
   ad_events.push_back(ad_event);
   ad_events.push_back(ad_event);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(23));
+  FastForwardClockBy(base::Hours(23));
 
   // Act
   PerDayFrequencyCap frequency_cap(ad_events);
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap.cc
index 77518ea1e5cd..f67b49197b1b 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap.cc
@@ -49,7 +49,7 @@ bool PerHourFrequencyCap::DoesRespectCap(const AdEventList& ad_events,
   const base::Time now = base::Time::Now();
 
   const base::TimeDelta time_constraint =
-      base::TimeDelta::FromSeconds(base::Time::kSecondsPerHour);
+      base::Seconds(base::Time::kSecondsPerHour);
 
   const int count = std::count_if(
       ad_events.cbegin(), ad_events.cend(),
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap_unittest.cc
index 5034531002ab..8ddaa60eb576 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap_unittest.cc
@@ -51,7 +51,7 @@ TEST_F(BatAdsPerHourFrequencyCapTest, AdAllowedAfter1Hour) {
 
   ad_events.push_back(ad_event);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(1));
+  FastForwardClockBy(base::Hours(1));
 
   // Act
   PerHourFrequencyCap frequency_cap(ad_events);
@@ -80,7 +80,7 @@ TEST_F(BatAdsPerHourFrequencyCapTest, AdAllowedAfter1HourForMultipleTypes) {
       AdType::kPromotedContentAd, creative_ad, ConfirmationType::kServed);
   ad_events.push_back(ad_event_3);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(1));
+  FastForwardClockBy(base::Hours(1));
 
   // Act
   PerHourFrequencyCap frequency_cap(ad_events);
@@ -102,7 +102,7 @@ TEST_F(BatAdsPerHourFrequencyCapTest, DoNotAllowTheSameAdWithin1Hour) {
 
   ad_events.push_back(ad_event);
 
-  FastForwardClockBy(base::TimeDelta::FromMinutes(59));
+  FastForwardClockBy(base::Minutes(59));
 
   // Act
   PerHourFrequencyCap frequency_cap(ad_events);
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_month_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_month_frequency_cap.cc
index f3f3f92ac621..dca6cc2b5b93 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_month_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_month_frequency_cap.cc
@@ -49,7 +49,7 @@ bool PerMonthFrequencyCap::DoesRespectCap(const AdEventList& ad_events,
 
   const base::Time now = base::Time::Now();
 
-  const base::TimeDelta time_constraint = base::TimeDelta::FromSeconds(
+  const base::TimeDelta time_constraint = base::Seconds(
       28 * (base::Time::kSecondsPerHour * base::Time::kHoursPerDay));
 
   const int count = std::count_if(
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_month_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_month_frequency_cap_unittest.cc
index 63f5a2852a94..032c86162b96 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_month_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_month_frequency_cap_unittest.cc
@@ -91,7 +91,7 @@ TEST_F(BatAdsPerMonthFrequencyCapTest, AllowAdIfDoesNotExceedCapAfter1Month) {
   ad_events.push_back(ad_event);
   ad_events.push_back(ad_event);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(28));
+  FastForwardClockBy(base::Days(28));
 
   // Act
   PerMonthFrequencyCap frequency_cap(ad_events);
@@ -115,7 +115,7 @@ TEST_F(BatAdsPerMonthFrequencyCapTest, DoNotAllowAdIfExceedsCapWithin1Month) {
   ad_events.push_back(ad_event);
   ad_events.push_back(ad_event);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(27));
+  FastForwardClockBy(base::Days(27));
 
   // Act
   PerMonthFrequencyCap frequency_cap(ad_events);
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_week_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_week_frequency_cap.cc
index a06593b5f5e1..4702de6a64e3 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_week_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_week_frequency_cap.cc
@@ -49,7 +49,7 @@ bool PerWeekFrequencyCap::DoesRespectCap(const AdEventList& ad_events,
 
   const base::Time now = base::Time::Now();
 
-  const base::TimeDelta time_constraint = base::TimeDelta::FromSeconds(
+  const base::TimeDelta time_constraint = base::Seconds(
       7 * (base::Time::kSecondsPerHour * base::Time::kHoursPerDay));
 
   const int count = std::count_if(
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_week_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_week_frequency_cap_unittest.cc
index 9d9c59104fad..3d43668d96ab 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_week_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_week_frequency_cap_unittest.cc
@@ -91,7 +91,7 @@ TEST_F(BatAdsPerWeekFrequencyCapTest, AllowAdIfDoesNotExceedCapAfter1Week) {
   ad_events.push_back(ad_event);
   ad_events.push_back(ad_event);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(7));
+  FastForwardClockBy(base::Days(7));
 
   // Act
   PerWeekFrequencyCap frequency_cap(ad_events);
@@ -115,7 +115,7 @@ TEST_F(BatAdsPerWeekFrequencyCapTest, DoNotAllowAdIfExceedsCapWithin1Week) {
   ad_events.push_back(ad_event);
   ad_events.push_back(ad_event);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(6));
+  FastForwardClockBy(base::Days(6));
 
   // Act
   PerWeekFrequencyCap frequency_cap(ad_events);
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/transferred_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/transferred_frequency_cap_unittest.cc
index e8a81b0eb2f9..af1f1bfea5f1 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/transferred_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/transferred_frequency_cap_unittest.cc
@@ -80,7 +80,7 @@ TEST_F(BatAdsTransferredFrequencyCapTest,
 
   ad_events.push_back(ad_event);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromHours(47));
+  task_environment_.FastForwardBy(base::Hours(47));
 
   // Act
   TransferredFrequencyCap frequency_cap(ad_events);
@@ -128,7 +128,7 @@ TEST_F(BatAdsTransferredFrequencyCapTest,
                       ConfirmationType::kTransferred);
   ad_events.push_back(ad_event_3);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromHours(47));
+  task_environment_.FastForwardBy(base::Hours(47));
 
   // Act
   TransferredFrequencyCap frequency_cap(ad_events);
@@ -164,7 +164,7 @@ TEST_F(BatAdsTransferredFrequencyCapTest,
 
   ad_events.push_back(ad_event);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromHours(47));
+  task_environment_.FastForwardBy(base::Hours(47));
 
   // Act
   TransferredFrequencyCap frequency_cap(ad_events);
@@ -200,7 +200,7 @@ TEST_F(BatAdsTransferredFrequencyCapTest,
 
   ad_events.push_back(ad_event);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromHours(47));
+  task_environment_.FastForwardBy(base::Hours(47));
 
   // Act
   TransferredFrequencyCap frequency_cap(ad_events);
@@ -236,7 +236,7 @@ TEST_F(BatAdsTransferredFrequencyCapTest,
 
   ad_events.push_back(ad_event);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromHours(48));
+  task_environment_.FastForwardBy(base::Hours(48));
 
   // Act
   TransferredFrequencyCap frequency_cap(ad_events);
@@ -276,7 +276,7 @@ TEST_F(BatAdsTransferredFrequencyCapTest,
 
   ad_events.push_back(ad_event);
 
-  task_environment_.FastForwardBy(base::TimeDelta::FromHours(48));
+  task_environment_.FastForwardBy(base::Hours(48));
 
   // Act
   TransferredFrequencyCap frequency_cap(ad_events);
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/frequency_capping_features.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/frequency_capping_features.cc
index 1fb78573634a..dcee8e970e30 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/frequency_capping_features.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/frequency_capping_features.cc
@@ -23,12 +23,12 @@ const bool kDefaultShouldExcludeAdIfConverted = true;
 const char kFieldTrialParameterExcludeAdIfDismissedWithinTimeWindow[] =
     "exclude_ad_if_dismissed_within_time_window";
 const base::TimeDelta kDefaultExcludeAdIfDismissedWithinTimeWindow =
-    base::TimeDelta::FromDays(2);
+    base::Days(2);
 
 const char kFieldTrialParameterExcludeAdIfTransferredWithinTimeWindow[] =
     "exclude_ad_if_transferred_within_time_window";
 const base::TimeDelta kDefaultExcludeAdIfTransferredWithinTimeWindow =
-    base::TimeDelta::FromDays(2);
+    base::Days(2);
 
 const char kFieldTrialParameterShouldOnlyServeAdsInWindowedMode[] =
     "should_only_serve_ads_in_windowed_mode";
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/frequency_capping_features_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/frequency_capping_features_unittest.cc
index 4629e79bfbdf..1e07f895d839 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/frequency_capping_features_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/frequency_capping_features_unittest.cc
@@ -130,7 +130,7 @@ TEST(BatAdsFrequencyCappingFeaturesTest, ExcludeAdIfDismissedWithinTimeWindow) {
       features::frequency_capping::ExcludeAdIfDismissedWithinTimeWindow();
 
   // Assert
-  const base::TimeDelta expected_time_window = base::TimeDelta::FromDays(1);
+  const base::TimeDelta expected_time_window = base::Days(1);
   EXPECT_EQ(expected_time_window, time_window);
 }
 
@@ -151,7 +151,7 @@ TEST(BatAdsFrequencyCappingFeaturesTest,
       features::frequency_capping::ExcludeAdIfDismissedWithinTimeWindow();
 
   // Assert
-  const base::TimeDelta expected_time_window = base::TimeDelta::FromDays(2);
+  const base::TimeDelta expected_time_window = base::Days(2);
   EXPECT_EQ(expected_time_window, time_window);
 }
 
@@ -173,7 +173,7 @@ TEST(BatAdsFrequencyCappingFeaturesTest,
       features::frequency_capping::ExcludeAdIfDismissedWithinTimeWindow();
 
   // Assert
-  const base::TimeDelta expected_time_window = base::TimeDelta::FromDays(2);
+  const base::TimeDelta expected_time_window = base::Days(2);
   EXPECT_EQ(expected_time_window, time_window);
 }
 
@@ -197,7 +197,7 @@ TEST(BatAdsUserActivityFeaturesTest, ExcludeAdIfTransferredWithinTimeWindow) {
       features::frequency_capping::ExcludeAdIfTransferredWithinTimeWindow();
 
   // Assert
-  const base::TimeDelta expected_time_window = base::TimeDelta::FromDays(1);
+  const base::TimeDelta expected_time_window = base::Days(1);
   EXPECT_EQ(expected_time_window, time_window);
 }
 
@@ -218,7 +218,7 @@ TEST(BatAdsUserActivityFeaturesTest,
       features::frequency_capping::ExcludeAdIfTransferredWithinTimeWindow();
 
   // Assert
-  const base::TimeDelta expected_time_window = base::TimeDelta::FromDays(2);
+  const base::TimeDelta expected_time_window = base::Days(2);
   EXPECT_EQ(expected_time_window, time_window);
 }
 
@@ -240,7 +240,7 @@ TEST(BatAdsUserActivityFeaturesTest,
       features::frequency_capping::ExcludeAdIfTransferredWithinTimeWindow();
 
   // Assert
-  const base::TimeDelta expected_time_window = base::TimeDelta::FromDays(2);
+  const base::TimeDelta expected_time_window = base::Days(2);
   EXPECT_EQ(expected_time_window, time_window);
 }
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap.cc
index 98706a18eec2..e89ceb4443bd 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap.cc
@@ -34,8 +34,8 @@ std::string AdsPerDayFrequencyCap::GetLastMessage() const {
 
 bool AdsPerDayFrequencyCap::DoesRespectCap(
     const std::deque<base::Time>& history) {
-  const base::TimeDelta time_constraint = base::TimeDelta::FromSeconds(
-      base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
+  const base::TimeDelta time_constraint =
+      base::Seconds(base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
 
   const int cap = features::GetMaximumAdNotificationsPerDay();
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap_unittest.cc
index 4244aeda7724..07546c763f28 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap_unittest.cc
@@ -67,7 +67,7 @@ TEST_F(BatAdsAdsPerDayFrequencyCapTest, AllowAdIfDoesNotExceedCapAfter1Day) {
   const size_t count = features::GetMaximumAdNotificationsPerDay();
   RecordAdEvents(AdType::kAdNotification, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(1));
+  FastForwardClockBy(base::Days(1));
 
   // Act
   AdsPerDayFrequencyCap frequency_cap;
@@ -82,7 +82,7 @@ TEST_F(BatAdsAdsPerDayFrequencyCapTest, DoNotAllowAdIfExceedsCapWithin1Day) {
   const size_t count = features::GetMaximumAdNotificationsPerDay();
   RecordAdEvents(AdType::kAdNotification, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(23));
+  FastForwardClockBy(base::Hours(23));
 
   // Act
   AdsPerDayFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap.cc
index 638dccc93a3b..fa594412e591 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap.cc
@@ -42,7 +42,7 @@ std::string AdsPerHourFrequencyCap::GetLastMessage() const {
 bool AdsPerHourFrequencyCap::DoesRespectCap(
     const std::deque<base::Time>& history) {
   const base::TimeDelta time_constraint =
-      base::TimeDelta::FromSeconds(base::Time::kSecondsPerHour);
+      base::Seconds(base::Time::kSecondsPerHour);
 
   const int cap = settings::GetAdsPerHour();
   if (cap == 0) {
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap_unittest.cc
index 96b9daceefa2..50d072060789 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap_unittest.cc
@@ -99,7 +99,7 @@ TEST_F(BatAdsAdsPerHourFrequencyCapTest, AllowAdIfDoesNotExceedCapAfter1Hour) {
   RecordAdEvents(AdType::kAdNotification, ConfirmationType::kServed,
                  ads_per_hour);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(1));
+  FastForwardClockBy(base::Hours(1));
 
   // Act
   AdsPerHourFrequencyCap frequency_cap;
@@ -118,7 +118,7 @@ TEST_F(BatAdsAdsPerHourFrequencyCapTest, DoNotAllowAdIfExceedsCapWithin1Hour) {
   RecordAdEvents(AdType::kAdNotification, ConfirmationType::kServed,
                  ads_per_hour);
 
-  FastForwardClockBy(base::TimeDelta::FromMinutes(59));
+  FastForwardClockBy(base::Minutes(59));
 
   // Act
   AdsPerHourFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/catalog_frequency_cap_test.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/catalog_frequency_cap_test.cc
index d0acd183b4e5..f63ab8754536 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/catalog_frequency_cap_test.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/catalog_frequency_cap_test.cc
@@ -54,8 +54,7 @@ TEST_F(BatAdsCatalogFrequencyCapTest,
 
   InitializeAds();
 
-  AdvanceClock(base::TimeDelta::FromHours(23) +
-               base::TimeDelta::FromMinutes(59));
+  AdvanceClock(base::Hours(23) + base::Minutes(59));
 
   // Act
   CatalogFrequencyCap frequency_cap;
@@ -75,7 +74,7 @@ TEST_F(BatAdsCatalogFrequencyCapTest,
 
   InitializeAds();
 
-  AdvanceClock(base::TimeDelta::FromDays(1));
+  AdvanceClock(base::Days(1));
 
   // Act
   CatalogFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/do_not_disturb_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/do_not_disturb_frequency_cap_unittest.cc
index fa7cc80da72c..b5ba1f065d6e 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/do_not_disturb_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/do_not_disturb_frequency_cap_unittest.cc
@@ -33,8 +33,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest,
   // Act
   {
     // Verify 5:59 AM
-    AdvanceClock(base::TimeDelta::FromHours(5) +
-                 base::TimeDelta::FromMinutes(59));
+    AdvanceClock(base::Hours(5) + base::Minutes(59));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -44,7 +43,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest,
 
   {
     // Verify 6:00 AM
-    AdvanceClock(base::TimeDelta::FromMinutes(1));
+    AdvanceClock(base::Minutes(1));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -54,8 +53,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest,
 
   {
     // Verify 8:59 PM
-    AdvanceClock(base::TimeDelta::FromHours(14) +
-                 base::TimeDelta::FromMinutes(59));
+    AdvanceClock(base::Hours(14) + base::Minutes(59));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -65,7 +63,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest,
 
   {
     // Verify 9:00 PM
-    AdvanceClock(base::TimeDelta::FromMinutes(1));
+    AdvanceClock(base::Minutes(1));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -82,13 +80,12 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest,
   BrowserManager::Get()->OnActive();
   BrowserManager::Get()->OnForegrounded();
 
-  AdvanceClock(Now().LocalMidnight() + base::TimeDelta::FromHours(24) - Now());
+  AdvanceClock(Now().LocalMidnight() + base::Hours(24) - Now());
 
   // Act
   {
     // Verify 5:59 AM
-    AdvanceClock(base::TimeDelta::FromHours(5) +
-                 base::TimeDelta::FromMinutes(59));
+    AdvanceClock(base::Hours(5) + base::Minutes(59));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -98,7 +95,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest,
 
   {
     // Verify 6:00 AM
-    AdvanceClock(base::TimeDelta::FromMinutes(1));
+    AdvanceClock(base::Minutes(1));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -108,8 +105,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest,
 
   {
     // Verify 8:59 PM
-    AdvanceClock(base::TimeDelta::FromHours(14) +
-                 base::TimeDelta::FromMinutes(59));
+    AdvanceClock(base::Hours(14) + base::Minutes(59));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -119,7 +115,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest,
 
   {
     // Verify 9:00 PM
-    AdvanceClock(base::TimeDelta::FromMinutes(1));
+    AdvanceClock(base::Minutes(1));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -135,7 +131,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest, AlwaysAllowAdForIOS) {
   BrowserManager::Get()->OnActive();
   BrowserManager::Get()->OnForegrounded();
 
-  AdvanceClock(Now().LocalMidnight() + base::TimeDelta::FromHours(24) - Now());
+  AdvanceClock(Now().LocalMidnight() + base::Hours(24) - Now());
 
   // Act
   {
@@ -149,7 +145,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest, AlwaysAllowAdForIOS) {
 
   {
     // Verify 12:00 PM
-    AdvanceClock(base::TimeDelta::FromHours(12));
+    AdvanceClock(base::Hours(12));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -165,7 +161,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest, AlwaysAllowAdForMacOS) {
   BrowserManager::Get()->OnActive();
   BrowserManager::Get()->OnForegrounded();
 
-  AdvanceClock(Now().LocalMidnight() + base::TimeDelta::FromHours(24) - Now());
+  AdvanceClock(Now().LocalMidnight() + base::Hours(24) - Now());
 
   // Act
   {
@@ -179,7 +175,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest, AlwaysAllowAdForMacOS) {
 
   {
     // Verify 12:00 PM
-    AdvanceClock(base::TimeDelta::FromHours(12));
+    AdvanceClock(base::Hours(12));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -195,7 +191,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest, AlwaysAllowAdForWindows) {
   BrowserManager::Get()->OnActive();
   BrowserManager::Get()->OnForegrounded();
 
-  AdvanceClock(Now().LocalMidnight() + base::TimeDelta::FromHours(24) - Now());
+  AdvanceClock(Now().LocalMidnight() + base::Hours(24) - Now());
 
   // Act
   {
@@ -209,7 +205,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest, AlwaysAllowAdForWindows) {
 
   {
     // Verify 12:00 PM
-    AdvanceClock(base::TimeDelta::FromHours(12));
+    AdvanceClock(base::Hours(12));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
@@ -225,7 +221,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest, AlwaysAllowAdForLinux) {
   BrowserManager::Get()->OnActive();
   BrowserManager::Get()->OnForegrounded();
 
-  AdvanceClock(Now().LocalMidnight() + base::TimeDelta::FromHours(24) - Now());
+  AdvanceClock(Now().LocalMidnight() + base::Hours(24) - Now());
 
   // Act
   {
@@ -239,7 +235,7 @@ TEST_F(BatAdsDoNotDisturbFrequencyCapTest, AlwaysAllowAdForLinux) {
 
   {
     // Verify 12:00 PM
-    AdvanceClock(base::TimeDelta::FromHours(12));
+    AdvanceClock(base::Hours(12));
 
     // Assert
     DoNotDisturbFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_day_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_day_frequency_cap.cc
index 3e707701eaa9..14e7b280ef6c 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_day_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_day_frequency_cap.cc
@@ -36,8 +36,8 @@ std::string InlineContentAdsPerDayFrequencyCap::GetLastMessage() const {
 
 bool InlineContentAdsPerDayFrequencyCap::DoesRespectCap(
     const std::deque<base::Time>& history) {
-  const base::TimeDelta time_constraint = base::TimeDelta::FromSeconds(
-      base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
+  const base::TimeDelta time_constraint =
+      base::Seconds(base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
 
   const int cap = features::GetMaximumInlineContentAdsPerDay();
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_day_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_day_frequency_cap_unittest.cc
index b64b683d3eca..86d6e798f65b 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_day_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_day_frequency_cap_unittest.cc
@@ -70,7 +70,7 @@ TEST_F(BatAdsInlineContentAdsPerDayFrequencyCapTest,
   const int count = features::GetMaximumInlineContentAdsPerDay();
   RecordAdEvents(AdType::kInlineContentAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(1));
+  FastForwardClockBy(base::Days(1));
 
   // Act
   InlineContentAdsPerDayFrequencyCap frequency_cap;
@@ -86,7 +86,7 @@ TEST_F(BatAdsInlineContentAdsPerDayFrequencyCapTest,
   const int count = features::GetMaximumInlineContentAdsPerDay();
   RecordAdEvents(AdType::kInlineContentAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(23));
+  FastForwardClockBy(base::Hours(23));
 
   // Act
   InlineContentAdsPerDayFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_hour_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_hour_frequency_cap.cc
index 79b367af5122..4ba954fead98 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_hour_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_hour_frequency_cap.cc
@@ -37,7 +37,7 @@ std::string InlineContentAdsPerHourFrequencyCap::GetLastMessage() const {
 bool InlineContentAdsPerHourFrequencyCap::DoesRespectCap(
     const std::deque<base::Time>& history) {
   const base::TimeDelta time_constraint =
-      base::TimeDelta::FromSeconds(base::Time::kSecondsPerHour);
+      base::Seconds(base::Time::kSecondsPerHour);
 
   const int cap = features::GetMaximumInlineContentAdsPerHour();
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_hour_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_hour_frequency_cap_unittest.cc
index de81cd77ca08..bb02717ffdd3 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_hour_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/inline_content_ads_per_hour_frequency_cap_unittest.cc
@@ -70,7 +70,7 @@ TEST_F(BatAdsInlineContentAdsPerHourFrequencyCapTest,
   const int count = features::GetMaximumInlineContentAdsPerHour();
   RecordAdEvents(AdType::kInlineContentAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(1));
+  FastForwardClockBy(base::Hours(1));
 
   // Act
   InlineContentAdsPerHourFrequencyCap frequency_cap;
@@ -86,7 +86,7 @@ TEST_F(BatAdsInlineContentAdsPerHourFrequencyCapTest,
   const int count = features::GetMaximumInlineContentAdsPerHour();
   RecordAdEvents(AdType::kInlineContentAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromMinutes(59));
+  FastForwardClockBy(base::Minutes(59));
 
   // Act
   InlineContentAdsPerHourFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap.cc
index 3272ca4bedf5..2f06f58ba027 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap.cc
@@ -53,7 +53,7 @@ bool MinimumWaitTimeFrequencyCap::DoesRespectCap(
   }
 
   const base::TimeDelta time_constraint =
-      base::TimeDelta::FromSeconds(base::Time::kSecondsPerHour / ads_per_hour);
+      base::Seconds(base::Time::kSecondsPerHour / ads_per_hour);
 
   return DoesHistoryRespectCapForRollingTimeConstraint(
       history, time_constraint, kMinimumWaitTimeFrequencyCap);
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap_unittest.cc
index d93fba321597..524ed3d6a2c3 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap_unittest.cc
@@ -40,7 +40,7 @@ TEST_F(BatAdsMinimumWaitTimeFrequencyCapTest, AllowAdIfDoesNotExceedCap) {
 
   RecordAdEvent(AdType::kAdNotification, ConfirmationType::kServed);
 
-  FastForwardClockBy(base::TimeDelta::FromMinutes(12));
+  FastForwardClockBy(base::Minutes(12));
 
   // Act
   MinimumWaitTimeFrequencyCap frequency_cap;
@@ -56,7 +56,7 @@ TEST_F(BatAdsMinimumWaitTimeFrequencyCapTest, DoNotAllowAdIfExceedsCap) {
 
   RecordAdEvent(AdType::kAdNotification, ConfirmationType::kServed);
 
-  FastForwardClockBy(base::TimeDelta::FromMinutes(11));
+  FastForwardClockBy(base::Minutes(11));
 
   // Act
   MinimumWaitTimeFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap.cc
index 864bd9a7558b..f2958a8b69eb 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap.cc
@@ -34,8 +34,8 @@ std::string NewTabPageAdsPerDayFrequencyCap::GetLastMessage() const {
 
 bool NewTabPageAdsPerDayFrequencyCap::DoesRespectCap(
     const std::deque<base::Time>& history) {
-  const base::TimeDelta time_constraint = base::TimeDelta::FromSeconds(
-      base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
+  const base::TimeDelta time_constraint =
+      base::Seconds(base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
 
   const int cap = features::GetMaximumNewTabPageAdsPerDay();
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap_unittest.cc
index d3738b18e013..4f2261eeb990 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap_unittest.cc
@@ -69,7 +69,7 @@ TEST_F(BatAdsNewTabPageAdsPerDayFrequencyCapTest,
   const int count = features::GetMaximumNewTabPageAdsPerDay();
   RecordAdEvents(AdType::kNewTabPageAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(1));
+  FastForwardClockBy(base::Days(1));
 
   // Act
   NewTabPageAdsPerDayFrequencyCap frequency_cap;
@@ -85,7 +85,7 @@ TEST_F(BatAdsNewTabPageAdsPerDayFrequencyCapTest,
   const int count = features::GetMaximumNewTabPageAdsPerDay();
   RecordAdEvents(AdType::kNewTabPageAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(23));
+  FastForwardClockBy(base::Hours(23));
 
   // Act
   NewTabPageAdsPerDayFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap.cc
index ef6f1b895c4c..c9255148bcfa 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap.cc
@@ -35,7 +35,7 @@ std::string NewTabPageAdsPerHourFrequencyCap::GetLastMessage() const {
 bool NewTabPageAdsPerHourFrequencyCap::DoesRespectCap(
     const std::deque<base::Time>& history) {
   const base::TimeDelta time_constraint =
-      base::TimeDelta::FromSeconds(base::Time::kSecondsPerHour);
+      base::Seconds(base::Time::kSecondsPerHour);
 
   const int cap = features::GetMaximumNewTabPageAdsPerHour();
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap_unittest.cc
index dd07372afe33..2b6802edbc60 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap_unittest.cc
@@ -69,7 +69,7 @@ TEST_F(BatAdsNewTabPageAdsPerHourFrequencyCapTest,
   const int count = features::GetMaximumNewTabPageAdsPerHour();
   RecordAdEvents(AdType::kNewTabPageAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(1));
+  FastForwardClockBy(base::Hours(1));
 
   // Act
   NewTabPageAdsPerHourFrequencyCap frequency_cap;
@@ -85,7 +85,7 @@ TEST_F(BatAdsNewTabPageAdsPerHourFrequencyCapTest,
   const int count = features::GetMaximumNewTabPageAdsPerHour();
   RecordAdEvents(AdType::kNewTabPageAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromMinutes(59));
+  FastForwardClockBy(base::Minutes(59));
 
   // Act
   NewTabPageAdsPerHourFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_day_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_day_frequency_cap.cc
index bbbc7952714a..50faaa368d8e 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_day_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_day_frequency_cap.cc
@@ -37,8 +37,8 @@ std::string PromotedContentAdsPerDayFrequencyCap::GetLastMessage() const {
 
 bool PromotedContentAdsPerDayFrequencyCap::DoesRespectCap(
     const std::deque<base::Time>& history) {
-  const base::TimeDelta time_constraint = base::TimeDelta::FromSeconds(
-      base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
+  const base::TimeDelta time_constraint =
+      base::Seconds(base::Time::kSecondsPerHour * base::Time::kHoursPerDay);
 
   const int cap = features::GetMaximumPromotedContentAdsPerDay();
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_day_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_day_frequency_cap_unittest.cc
index 9d2ae9d9c6a4..ff98e5b1279f 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_day_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_day_frequency_cap_unittest.cc
@@ -70,7 +70,7 @@ TEST_F(BatAdsPromotedContentAdsPerDayFrequencyCapTest,
   const int count = features::GetMaximumPromotedContentAdsPerDay();
   RecordAdEvents(AdType::kPromotedContentAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromDays(1));
+  FastForwardClockBy(base::Days(1));
 
   // Act
   PromotedContentAdsPerDayFrequencyCap frequency_cap;
@@ -86,7 +86,7 @@ TEST_F(BatAdsPromotedContentAdsPerDayFrequencyCapTest,
   const int count = features::GetMaximumPromotedContentAdsPerDay();
   RecordAdEvents(AdType::kPromotedContentAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(23));
+  FastForwardClockBy(base::Hours(23));
 
   // Act
   PromotedContentAdsPerDayFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_hour_frequency_cap.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_hour_frequency_cap.cc
index 52ed93eb7af8..eebb33f4f97d 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_hour_frequency_cap.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_hour_frequency_cap.cc
@@ -38,7 +38,7 @@ std::string PromotedContentAdsPerHourFrequencyCap::GetLastMessage() const {
 bool PromotedContentAdsPerHourFrequencyCap::DoesRespectCap(
     const std::deque<base::Time>& history) {
   const base::TimeDelta time_constraint =
-      base::TimeDelta::FromSeconds(base::Time::kSecondsPerHour);
+      base::Seconds(base::Time::kSecondsPerHour);
 
   const int cap = features::GetMaximumPromotedContentAdsPerHour();
 
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_hour_frequency_cap_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_hour_frequency_cap_unittest.cc
index d251ec1f2471..710248338878 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_hour_frequency_cap_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/promoted_content_ads_per_hour_frequency_cap_unittest.cc
@@ -70,7 +70,7 @@ TEST_F(BatAdsPromotedContentAdsPerHourFrequencyCapTest,
   const int count = features::GetMaximumPromotedContentAdsPerHour();
   RecordAdEvents(AdType::kPromotedContentAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromHours(1));
+  FastForwardClockBy(base::Hours(1));
 
   // Act
   PromotedContentAdsPerHourFrequencyCap frequency_cap;
@@ -86,7 +86,7 @@ TEST_F(BatAdsPromotedContentAdsPerHourFrequencyCapTest,
   const int count = features::GetMaximumPromotedContentAdsPerHour();
   RecordAdEvents(AdType::kPromotedContentAd, ConfirmationType::kServed, count);
 
-  FastForwardClockBy(base::TimeDelta::FromMinutes(59));
+  FastForwardClockBy(base::Minutes(59));
 
   // Act
   PromotedContentAdsPerHourFrequencyCap frequency_cap;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_manager_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_manager_unittest.cc
index c39badc32ebb..4f884a5a61dd 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_manager_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_manager_unittest.cc
@@ -76,8 +76,7 @@ TEST_F(BatAdsTabManagerTest, OpenedNewTabUserActivityEvent) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
@@ -97,8 +96,7 @@ TEST_F(BatAdsTabManagerTest, FocusedOnExistingTabUserActivityEvent) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
@@ -128,8 +126,7 @@ TEST_F(BatAdsTabManagerTest, DoNotRecordEventWhenUpdatingIncognitoTab) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   const UserActivityEventList expected_events = {};
 
@@ -161,8 +158,7 @@ TEST_F(BatAdsTabManagerTest, DoNotRecordEventWhenUpdatingOccludedTab) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   const UserActivityEventList expected_events = {};
 
@@ -197,8 +193,7 @@ TEST_F(BatAdsTabManagerTest,
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
@@ -236,8 +231,7 @@ TEST_F(BatAdsTabManagerTest, RecordEventWhenUpdatingExistingTab) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
@@ -272,8 +266,7 @@ TEST_F(BatAdsTabManagerTest, RecordEventWhenClosingTab) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
@@ -307,8 +300,7 @@ TEST_F(BatAdsTabManagerTest, RecordEventWhenPlayingMedia) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
@@ -344,8 +336,7 @@ TEST_F(BatAdsTabManagerTest, DoNotRecordEventWhenAlreadyPlayingMedia) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
@@ -381,8 +372,7 @@ TEST_F(BatAdsTabManagerTest, RecordEventWhenStoppedPlayingMedia) {
 
   // Assert
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   UserActivityEventList expected_events;
   UserActivityEventInfo event;
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/timer.cc b/vendor/bat-native-ads/src/bat/ads/internal/timer.cc
index 88007413bdf2..ded7e898af14 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/timer.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/timer.cc
@@ -45,8 +45,7 @@ base::Time Timer::StartWithPrivacy(const base::TimeDelta& delay,
   const int64_t rand_delay_in_seconds =
       static_cast<int64_t>(brave_base::random::Geometric(delay_in_seconds));
 
-  return Start(base::TimeDelta::FromSeconds(rand_delay_in_seconds),
-               std::move(user_task));
+  return Start(base::Seconds(rand_delay_in_seconds), std::move(user_task));
 }
 
 bool Timer::IsRunning() const {
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/tokens/issuers/issuers.cc b/vendor/bat-native-ads/src/bat/ads/internal/tokens/issuers/issuers.cc
index 60e9c2963646..c97ce4862b88 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/tokens/issuers/issuers.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/tokens/issuers/issuers.cc
@@ -133,14 +133,14 @@ void Issuers::FetchAfterDelay() {
 
 base::TimeDelta Issuers::GetFetchDelay() const {
   const int ping = AdsClientHelper::Get()->GetIntegerPref(prefs::kIssuerPing);
-  return base::TimeDelta::FromMilliseconds(ping);
+  return base::Milliseconds(ping);
 }
 
 void Issuers::Retry() {
   DCHECK(!timer_.IsRunning());
 
   const base::Time& time = retry_timer_.StartWithPrivacy(
-      base::TimeDelta::FromSeconds(kRetryAfterSeconds),
+      base::Seconds(kRetryAfterSeconds),
       base::BindOnce(&Issuers::OnRetry, base::Unretained(this)));
 
   BLOG(1, "Retry fetching issuers " << FriendlyDateAndTime(time));
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/tokens/redeem_unblinded_payment_tokens/redeem_unblinded_payment_tokens.cc b/vendor/bat-native-ads/src/bat/ads/internal/tokens/redeem_unblinded_payment_tokens/redeem_unblinded_payment_tokens.cc
index 4e14982f16d6..ed0d284d1609 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/tokens/redeem_unblinded_payment_tokens/redeem_unblinded_payment_tokens.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/tokens/redeem_unblinded_payment_tokens/redeem_unblinded_payment_tokens.cc
@@ -170,7 +170,7 @@ void RedeemUnblindedPaymentTokens::Retry() {
   }
 
   const base::Time& time = retry_timer_.StartWithPrivacy(
-      base::TimeDelta::FromSeconds(kRetryAfterSeconds),
+      base::Seconds(kRetryAfterSeconds),
       base::BindOnce(&RedeemUnblindedPaymentTokens::OnRetry,
                      base::Unretained(this)));
 
@@ -205,8 +205,7 @@ base::TimeDelta RedeemUnblindedPaymentTokens::CalculateTokenRedemptionDelay() {
   base::TimeDelta delay;
   if (now >= next_token_redemption_date) {
     // Browser was launched after the next token redemption date
-    delay =
-        base::TimeDelta::FromSeconds(kExpiredNextTokenRedemptionAfterSeconds);
+    delay = base::Seconds(kExpiredNextTokenRedemptionAfterSeconds);
   } else {
     delay = next_token_redemption_date - now;
   }
@@ -228,7 +227,7 @@ base::Time RedeemUnblindedPaymentTokens::CalculateNextTokenRedemptionDate() {
   const int64_t rand_delay =
       static_cast<int64_t>(brave_base::random::Geometric(delay));
 
-  return now + base::TimeDelta::FromSeconds(rand_delay);
+  return now + base::Seconds(rand_delay);
 }
 
 }  // namespace ads
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/tokens/refill_unblinded_tokens/refill_unblinded_tokens.cc b/vendor/bat-native-ads/src/bat/ads/internal/tokens/refill_unblinded_tokens/refill_unblinded_tokens.cc
index db8582f97d3c..e44adcebddfa 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/tokens/refill_unblinded_tokens/refill_unblinded_tokens.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/tokens/refill_unblinded_tokens/refill_unblinded_tokens.cc
@@ -357,7 +357,7 @@ void RefillUnblindedTokens::Retry() {
   }
 
   const base::Time& time = retry_timer_.StartWithPrivacy(
-      base::TimeDelta::FromSeconds(kRetryAfterSeconds),
+      base::Seconds(kRetryAfterSeconds),
       base::BindOnce(&RefillUnblindedTokens::OnRetry, base::Unretained(this)));
 
   BLOG(1, "Retry refilling unblinded tokens " << FriendlyDateAndTime(time));
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/unittest_base.cc b/vendor/bat-native-ads/src/bat/ads/internal/unittest_base.cc
index 241675b34a0f..b50bc0540f06 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/unittest_base.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/unittest_base.cc
@@ -123,7 +123,7 @@ void UnitTestBase::FastForwardClockTo(const base::Time& time) {
 
 void UnitTestBase::AdvanceClockToMidnightUTC() {
   const base::TimeDelta time_delta =
-      Now().LocalMidnight() + base::TimeDelta::FromHours(24) - Now();
+      Now().LocalMidnight() + base::Hours(24) - Now();
 
   return AdvanceClock(time_delta);
 }
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/unittest_tag_parser_util.cc b/vendor/bat-native-ads/src/bat/ads/internal/unittest_tag_parser_util.cc
index 7c8e0a7ac424..0b066d9f5172 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/unittest_tag_parser_util.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/unittest_tag_parser_util.cc
@@ -44,13 +44,13 @@ bool ParseTimeDelta(const std::string& value, base::TimeDelta* time_delta) {
 
   const std::string period = components.at(1);
   if (period == kFromSecondsTagValue) {
-    *time_delta = base::TimeDelta::FromSeconds(offset);
+    *time_delta = base::Seconds(offset);
   } else if (period == kFromMinutesTagValue) {
-    *time_delta = base::TimeDelta::FromMinutes(offset);
+    *time_delta = base::Minutes(offset);
   } else if (period == kFromHoursTagValue) {
-    *time_delta = base::TimeDelta::FromHours(offset);
+    *time_delta = base::Hours(offset);
   } else if (period == kFromDaysTagValue) {
-    *time_delta = base::TimeDelta::FromDays(offset);
+    *time_delta = base::Days(offset);
   } else {
     return false;
   }
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_scoring_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_scoring_unittest.cc
index a167df1b2085..f83d934c27c6 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_scoring_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_scoring_unittest.cc
@@ -36,8 +36,7 @@ TEST_F(BatAdsUserActivityScoringTest, GetUserActivityScore) {
   UserActivity::Get()->RecordEvent(UserActivityEventType::kClickedLink);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Act
   const double score = GetUserActivityScore(triggers, events);
@@ -52,7 +51,7 @@ TEST_F(BatAdsUserActivityScoringTest, GetUserActivityScoreForTimeWindow) {
       ToUserActivityTriggers("06=.3;0D1406=1.0;0D14=0.5");
 
   UserActivity::Get()->RecordEvent(UserActivityEventType::kClickedLink);
-  AdvanceClock(base::TimeDelta::FromHours(2));
+  AdvanceClock(base::Hours(2));
   UserActivity::Get()->RecordEvent(UserActivityEventType::kClickedReloadButton);
   UserActivity::Get()->RecordEvent(UserActivityEventType::kOpenedNewTab);
   UserActivity::Get()->RecordEvent(UserActivityEventType::kTypedUrl);
@@ -62,8 +61,7 @@ TEST_F(BatAdsUserActivityScoringTest, GetUserActivityScoreForTimeWindow) {
   UserActivity::Get()->RecordEvent(UserActivityEventType::kClickedLink);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Act
   const double score = GetUserActivityScore(triggers, events);
@@ -87,8 +85,7 @@ TEST_F(BatAdsUserActivityScoringTest,
   UserActivity::Get()->RecordEvent(UserActivityEventType::kClickedLink);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Act
   const double score = GetUserActivityScore(triggers, events);
@@ -113,8 +110,7 @@ TEST_F(BatAdsUserActivityScoringTest,
   UserActivity::Get()->RecordEvent(UserActivityEventType::kClickedLink);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Act
   const double score = GetUserActivityScore(triggers, events);
@@ -139,8 +135,7 @@ TEST_F(BatAdsUserActivityScoringTest,
   UserActivity::Get()->RecordEvent(UserActivityEventType::kClickedLink);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Act
   const double score = GetUserActivityScore(triggers, events);
@@ -164,8 +159,7 @@ TEST_F(BatAdsUserActivityScoringTest,
   UserActivity::Get()->RecordEvent(UserActivityEventType::kClickedLink);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Act
   const double score = GetUserActivityScore(triggers, events);
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_scoring_util_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_scoring_util_unittest.cc
index 4461ebf4d9c9..b38dfd2968cf 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_scoring_util_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_scoring_util_unittest.cc
@@ -87,8 +87,7 @@ TEST_F(BatAdsUserActivityScoringUtilTest,
   UserActivity::Get()->RecordEvent(UserActivityEventType::kClosedTab);
 
   const base::TimeDelta elapsed_time_window =
-      features::user_activity::GetTimeWindow() +
-      base::TimeDelta::FromSeconds(1);
+      features::user_activity::GetTimeWindow() + base::Seconds(1);
   AdvanceClock(elapsed_time_window);
 
   // Act
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_unittest.cc
index 975d1c57d349..c5f6fd315baa 100644
--- a/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_unittest.cc
+++ b/vendor/bat-native-ads/src/bat/ads/internal/user_activity/user_activity_unittest.cc
@@ -39,8 +39,7 @@ TEST_F(BatAdsUserActivityTest, RecordLaunchedBrowserEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -61,8 +60,7 @@ TEST_F(BatAdsUserActivityTest, RecordBrowserDidBecomeActiveEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -83,8 +81,7 @@ TEST_F(BatAdsUserActivityTest, RecordBrowserDidEnterBackgroundEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -106,8 +103,7 @@ TEST_F(BatAdsUserActivityTest,
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -128,8 +124,7 @@ TEST_F(BatAdsUserActivityTest, RecordClickedBookmarkEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -150,8 +145,7 @@ TEST_F(BatAdsUserActivityTest, RecordClickedHomePageButtonEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -171,8 +165,7 @@ TEST_F(BatAdsUserActivityTest, RecordClickedLinkEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -193,8 +186,7 @@ TEST_F(BatAdsUserActivityTest, RecordClickedReloadButtonEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -214,8 +206,7 @@ TEST_F(BatAdsUserActivityTest, RecordClosedTabEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -236,8 +227,7 @@ TEST_F(BatAdsUserActivityTest, RecordFocusedOnExistingTabEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -258,8 +248,7 @@ TEST_F(BatAdsUserActivityTest, RecordGeneratedKeywordEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -280,8 +269,7 @@ TEST_F(BatAdsUserActivityTest, RecordNewNavigationEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -302,8 +290,7 @@ TEST_F(BatAdsUserActivityTest, RecordOpenedLinkFromExternalApplicationEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -323,8 +310,7 @@ TEST_F(BatAdsUserActivityTest, RecordOpenedNewTabEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -344,8 +330,7 @@ TEST_F(BatAdsUserActivityTest, RecordPlayedMediaEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -366,8 +351,7 @@ TEST_F(BatAdsUserActivityTest, RecordStoppedPlayingMediaEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -388,8 +372,7 @@ TEST_F(BatAdsUserActivityTest, RecordSubmittedFormEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -409,8 +392,7 @@ TEST_F(BatAdsUserActivityTest, RecordTabUpdatedEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -431,8 +413,7 @@ TEST_F(BatAdsUserActivityTest, RecordTypedAndSelectedNonUrlEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -454,8 +435,7 @@ TEST_F(BatAdsUserActivityTest,
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -475,8 +455,7 @@ TEST_F(BatAdsUserActivityTest, RecordTypedUrlEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -497,8 +476,7 @@ TEST_F(BatAdsUserActivityTest, RecordUsedAddressBarEvent) {
   UserActivity::Get()->RecordEvent(event_type);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -536,7 +514,7 @@ TEST_F(BatAdsUserActivityTest, GetHistoryForTimeWindow) {
   UserActivity::Get()->RecordEvent(UserActivityEventType::kStoppedPlayingMedia);
   UserActivity::Get()->RecordEvent(UserActivityEventType::kSubmittedForm);
 
-  AdvanceClock(base::TimeDelta::FromHours(1));
+  AdvanceClock(base::Hours(1));
 
   const base::Time time = Now();
 
@@ -548,12 +526,11 @@ TEST_F(BatAdsUserActivityTest, GetHistoryForTimeWindow) {
   UserActivity::Get()->RecordEvent(UserActivityEventType::kTypedUrl);
   UserActivity::Get()->RecordEvent(UserActivityEventType::kUsedAddressBar);
 
-  AdvanceClock(base::TimeDelta::FromHours(1));
+  AdvanceClock(base::Hours(1));
 
   // Act
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
@@ -589,8 +566,7 @@ TEST_F(BatAdsUserActivityTest, MaximumHistoryEntries) {
   UserActivity::Get()->RecordEvent(UserActivityEventType::kOpenedNewTab);
 
   const UserActivityEventList events =
-      UserActivity::Get()->GetHistoryForTimeWindow(
-          base::TimeDelta::FromHours(1));
+      UserActivity::Get()->GetHistoryForTimeWindow(base::Hours(1));
 
   // Assert
   UserActivityEventList expected_events;
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/api/api_parameters.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/api/api_parameters.cc
index fa77654a438a..412aa1d9fc77 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/api/api_parameters.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/api/api_parameters.cc
@@ -52,22 +52,20 @@ void APIParameters::OnFetch(
     const type::RewardsParameters& parameters) {
   if (result == type::Result::RETRY_SHORT) {
     RunCallbacks();
-    SetRefreshTimer(base::TimeDelta::FromSeconds(90));
+    SetRefreshTimer(base::Seconds(90));
     return;
   }
 
   if (result != type::Result::LEDGER_OK) {
     BLOG(1, "Couldn't parse response");
     RunCallbacks();
-    SetRefreshTimer(base::TimeDelta::FromMinutes(10));
+    SetRefreshTimer(base::Minutes(10));
     return;
   }
 
   ledger_->state()->SetRewardsParameters(parameters);
   RunCallbacks();
-  SetRefreshTimer(
-      base::TimeDelta::FromMinutes(10),
-      base::TimeDelta::FromHours(3));
+  SetRefreshTimer(base::Minutes(10), base::Hours(3));
 }
 
 void APIParameters::RunCallbacks() {
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/bitflyer/bitflyer.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/bitflyer/bitflyer.cc
index 27f5630f4c6c..cab2683a748b 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/bitflyer/bitflyer.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/bitflyer/bitflyer.cc
@@ -206,8 +206,7 @@ void Bitflyer::StartTransferFeeTimer(const std::string& fee_id,
                                      const int attempts) {
   DCHECK(!fee_id.empty());
 
-  base::TimeDelta delay =
-      util::GetRandomizedDelay(base::TimeDelta::FromSeconds(45));
+  base::TimeDelta delay = util::GetRandomizedDelay(base::Seconds(45));
 
   BLOG(1, "Bitflyer transfer fee timer set for " << delay);
 
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/common/time_util.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/common/time_util.cc
index 5a3a56e0e717..9959fc3ca29d 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/common/time_util.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/common/time_util.cc
@@ -39,7 +39,7 @@ uint64_t GetCurrentTimeStamp() {
 
 base::TimeDelta GetRandomizedDelay(base::TimeDelta delay) {
   uint64_t seconds = brave_base::random::Geometric(delay.InSecondsF());
-  return base::TimeDelta::FromSeconds(static_cast<int64_t>(seconds));
+  return base::Seconds(static_cast<int64_t>(seconds));
 }
 
 base::TimeDelta GetRandomizedDelayWithBackoff(
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc
index 98f030296155..0060833161ea 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc
@@ -84,9 +84,8 @@ void Contribution::Initialize() {
 
 void Contribution::CheckContributionQueue() {
   base::TimeDelta delay = ledger::is_testing
-      ? base::TimeDelta::FromSeconds(1)
-      : util::GetRandomizedDelay(
-          base::TimeDelta::FromSeconds(15));
+                              ? base::Seconds(1)
+                              : util::GetRandomizedDelay(base::Seconds(15));
 
   BLOG(1, "Queue timer set for " << delay);
 
@@ -206,7 +205,7 @@ void Contribution::SetReconcileTimer() {
 
   base::TimeDelta delay;
   if (next_reconcile_stamp > now) {
-    delay = base::TimeDelta::FromSeconds(next_reconcile_stamp - now);
+    delay = base::Seconds(next_reconcile_stamp - now);
   }
 
   BLOG(1, "Last reconcile timer set for " << delay);
@@ -594,15 +593,12 @@ void Contribution::Result(
     const type::Result result,
     const std::string& contribution_id) {
   if (result == type::Result::RETRY_SHORT) {
-    SetRetryTimer(contribution_id, base::TimeDelta::FromSeconds(5));
+    SetRetryTimer(contribution_id, base::Seconds(5));
     return;
   }
 
   if (result == type::Result::RETRY) {
-    SetRetryTimer(
-        contribution_id,
-        util::GetRandomizedDelay(
-            base::TimeDelta::FromSeconds(45)));
+    SetRetryTimer(contribution_id, util::GetRandomizedDelay(base::Seconds(45)));
     return;
   }
 
@@ -625,15 +621,11 @@ void Contribution::OnResult(
   if (result == type::Result::RETRY_LONG) {
     if (contribution->processor ==
         type::ContributionProcessor::BRAVE_TOKENS) {
-      SetRetryTimer(
-          contribution->contribution_id,
-          util::GetRandomizedDelay(
-              base::TimeDelta::FromSeconds(45)));
+      SetRetryTimer(contribution->contribution_id,
+                    util::GetRandomizedDelay(base::Seconds(45)));
     } else {
-      SetRetryTimer(
-          contribution->contribution_id,
-          util::GetRandomizedDelay(
-              base::TimeDelta::FromSeconds(450)));
+      SetRetryTimer(contribution->contribution_id,
+                    util::GetRandomizedDelay(base::Seconds(450)));
     }
 
     return;
@@ -651,7 +643,7 @@ void Contribution::SetRetryTimer(
   }
 
   if (ledger::retry_interval) {
-    delay = base::TimeDelta::FromSeconds(retry_interval);
+    delay = base::Seconds(retry_interval);
   }
 
   BLOG(1, "Timer for contribution retry (" << contribution_id << ") "
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/unverified.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/unverified.cc
index 9df5d99101b4..80f1c8ac8809 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/unverified.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/unverified.cc
@@ -163,9 +163,8 @@ void Unverified::QueueSaved(
   }
 
   base::TimeDelta delay = ledger::is_testing
-      ? base::TimeDelta::FromSeconds(2)
-      : util::GetRandomizedDelay(
-          base::TimeDelta::FromSeconds(45));
+                              ? base::Seconds(2)
+                              : util::GetRandomizedDelay(base::Seconds(45));
 
   BLOG(1, "Unverified contribution timer set for " << delay);
 
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/core/test_ledger_client.h b/vendor/bat-native-ledger/src/bat/ledger/internal/core/test_ledger_client.h
index 2d72dff99bfb..f3fc2afc7f82 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/core/test_ledger_client.h
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/core/test_ledger_client.h
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
-#include "base/sequenced_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/values.h"
 #include "bat/ledger/internal/ledger_database_impl.h"
 #include "bat/ledger/ledger_client.h"
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/gemini/gemini.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/gemini/gemini.cc
index 3c0bff241b79..c544754ad4e7 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/gemini/gemini.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/gemini/gemini.cc
@@ -207,8 +207,7 @@ void Gemini::StartTransferFeeTimer(const std::string& fee_id,
                                    const int attempts) {
   DCHECK(!fee_id.empty());
 
-  base::TimeDelta delay =
-      util::GetRandomizedDelay(base::TimeDelta::FromSeconds(45));
+  base::TimeDelta delay = util::GetRandomizedDelay(base::Seconds(45));
 
   BLOG(1, "Gemini transfer fee timer set for " << delay);
 
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/gemini/gemini_transfer.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/gemini/gemini_transfer.cc
index ea184b412f0b..fba282b0bdf5 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/gemini/gemini_transfer.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/gemini/gemini_transfer.cc
@@ -77,7 +77,7 @@ void GeminiTransfer::StartTransactionStatusTimer(
 
   size_t new_attempts = attempts + 1;
   size_t mins = 3 * new_attempts;
-  base::TimeDelta delay = base::TimeDelta::FromMinutes(mins);
+  base::TimeDelta delay = base::Minutes(mins);
   BLOG(1, "Will fetch transaction status after " << mins << " minutes");
   retry_timer_[id].Start(
       FROM_HERE, delay,
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion.cc
index cd8a12ddd499..3d08c4ea68f5 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion.cc
@@ -496,9 +496,9 @@ void Promotion::CredentialsProcessed(
     const std::string& promotion_id,
     ledger::ResultCallback callback) {
   if (result == type::Result::RETRY) {
-    retry_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(5),
-        base::BindOnce(&Promotion::OnRetryTimerElapsed,
-            base::Unretained(this)));
+    retry_timer_.Start(FROM_HERE, base::Seconds(5),
+                       base::BindOnce(&Promotion::OnRetryTimerElapsed,
+                                      base::Unretained(this)));
     callback(type::Result::LEDGER_OK);
     return;
   }
@@ -556,8 +556,7 @@ void Promotion::Refresh(const bool retry_after_error) {
   base::TimeDelta start_timer_in;
 
   if (retry_after_error) {
-    start_timer_in = util::GetRandomizedDelay(
-        base::TimeDelta::FromSeconds(300));
+    start_timer_in = util::GetRandomizedDelay(base::Seconds(300));
 
     BLOG(1, "Failed to refresh promotion, will try again in "
         << start_timer_in);
@@ -574,11 +573,11 @@ void Promotion::Refresh(const bool retry_after_error) {
     }
 
     if (now == last_promo_stamp) {
-      start_timer_in = base::TimeDelta::FromSeconds(default_time);
+      start_timer_in = base::Seconds(default_time);
     } else if (time_since_last_promo_check > 0 &&
         default_time > time_since_last_promo_check) {
-      start_timer_in = base::TimeDelta::FromSeconds(
-          default_time - time_since_last_promo_check);
+      start_timer_in =
+          base::Seconds(default_time - time_since_last_promo_check);
     }
   }
 
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/publisher/publisher_prefix_list_updater.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/publisher/publisher_prefix_list_updater.cc
index ac9a39f2b043..dc7f4ec1dfa7 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/publisher/publisher_prefix_list_updater.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/publisher/publisher_prefix_list_updater.cc
@@ -144,17 +144,14 @@ base::TimeDelta PublisherPrefixListUpdater::GetAutoUpdateDelay() {
     fetch_time = now;
   }
 
-  fetch_time += base::TimeDelta::FromSeconds(interval_sec);
-  return fetch_time < now
-      ? base::TimeDelta::FromSeconds(0)
-      : fetch_time - now;
+  fetch_time += base::Seconds(interval_sec);
+  return fetch_time < now ? base::Seconds(0) : fetch_time - now;
 }
 
 base::TimeDelta PublisherPrefixListUpdater::GetRetryAfterFailureDelay() {
   return util::GetRandomizedDelayWithBackoff(
-      base::TimeDelta::FromSeconds(kRetryAfterFailureDelay),
-      base::TimeDelta::FromSeconds(kMaxRetryAfterFailureDelay),
-      retry_count_++);
+      base::Seconds(kRetryAfterFailureDelay),
+      base::Seconds(kMaxRetryAfterFailureDelay), retry_count_++);
 }
 
 }  // namespace publisher
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.cc
index d69c30a18ed6..022888a8b373 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.cc
@@ -238,8 +238,7 @@ void Uphold::SaveTransferFee(const std::string& contribution_id,
 void Uphold::StartTransferFeeTimer(const std::string& fee_id, int attempts) {
   DCHECK(!fee_id.empty());
 
-  base::TimeDelta delay =
-      util::GetRandomizedDelay(base::TimeDelta::FromSeconds(45));
+  base::TimeDelta delay = util::GetRandomizedDelay(base::Seconds(45));
 
   BLOG(1, "Uphold transfer fee timer set for " << delay);