Merge pull request #17033 from brave/cr111 (#17348)

* Merge pull request #17033 from brave/cr111

* Partial refactor of PageGraph to use WTF types (#16953)

This is a partial refactor of PageGraph to make use of WTF types where
possible. A much larger change enforcing the use of WTF::String will be
submitted separately. The changes in this PR are aiming in making that
work easier.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/52472aba170b71f97ae9ab17f429ff494537adae

commit 52472aba170b71f97ae9ab17f429ff494537adae
Author: Xianzhu Wang <[email protected]>
Date:   Mon Jan 9 20:26:58 2023 +0000

    Enable discouraged type check for data members under blink/renderer

    For existing usages of discouraged type:
    - Simple cases are changed to use blink types;
    - For other cases, ALLOW_DISCOURAGED_TYPE(reason) is added.

    Rules audit_non_blink_usages.py checking such usages are removed.
    We'll use the clang plugin from now on.

    Bug: 1363780

* Using WTF::String for blink data members (#16988)

Upstream chromium has rolled out clang checks in upcoming versions that
will error out in cases where blink headers are using `std::string` as
data member type.

This change replaces all uses of `std::string` with `WTF::String` for
data members in blink headers.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/52472aba170b71f97ae9ab17f429ff494537adae

commit 52472aba170b71f97ae9ab17f429ff494537adae
Author: Xianzhu Wang <[email protected]>
Date:   Mon Jan 9 20:26:58 2023 +0000

    Enable discouraged type check for data members under blink/renderer

    For existing usages of discouraged type:
    - Simple cases are changed to use blink types;
    - For other cases, ALLOW_DISCOURAGED_TYPE(reason) is added.

    Rules audit_non_blink_usages.py checking such usages are removed.
    We'll use the clang plugin from now on.

    Bug: 1363780
    Change-Id: I808524abc06c24d8f0f9867c06f4c6597bff1889
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4130490
    Commit-Queue: Xianzhu Wang <[email protected]>
    Reviewed-by: Daniel Cheng <[email protected]>
    Reviewed-by: Chris Harrelson <[email protected]>
    Cr-Commit-Position: refs/heads/main@{#1090474}

* Merge pull request #17389 from brave/cr111-followup-fix-missing-shield-settings-header

Fix missing Shield settings header

* Merge pull request #17390 from brave/cr111-followup-fix-missing-ethereum-permissions-header

Fix missing Ethereum permissions header

* Upgrade from Chromium 111.0.5563.33 to Chromium 111.0.5563.41 (#17349)

* Upgrade from Chromium 111.0.5563.33 to Chromium 111.0.5563.41

* Upgrade patches from Chromium 111.0.5563.33 to Chromium 111.0.5563.41

* Update pins list timestamp

* Disable new DIPS-related upstream unit test

---------

Co-authored-by: brave-builds <[email protected]>

* [Android] Fix for rotation of NTP images

* Resolve rewards ANR with external wallet provider

---------

Co-authored-by: cdesouza-chromium <[email protected]>
Co-authored-by: brave-builds <[email protected]>
Co-authored-by: Artem Samoilenko <[email protected]>
Co-authored-by: deeppandya <[email protected]>

Author: 5 people

.storybook/BUILD.gn

@@ -21,7 +21,6 @@ group("storybook") {
     "//brave/components/brave_wallet/common:mojom_js",
     "//mojo/public/js:bindings",
     "//mojo/public/js:resources",
-    "//ui/webui/resources/js:preprocess",
   ]
 
   if (enable_speedreader) {

.storybook/webpack.config.js

@@ -99,7 +99,7 @@ module.exports = async ({ config, mode }) => {
             // build, but has previously made a Component build, then an outdated
             // version of a module will be used. Instead, accept a cli argument
             // or environment variable containing which build target to use.
-            ...getBuildOuptutPathList('gen/ui/webui/resources/preprocessed')
+            ...getBuildOuptutPathList('gen/ui/webui/resources/tsc')
           ]
         },
         {

BUILD.gn

@@ -126,8 +126,8 @@ group("resources") {
 if (is_android) {
   android_assets("brave_pak_assets") {
     sources = [
-      "$root_build_dir/brave_100_percent.pak",
-      "$root_build_dir/brave_resources.pak",
+      "$root_out_dir/brave_100_percent.pak",
+      "$root_out_dir/brave_resources.pak",
       "//brave/LICENSE.html",
       "//brave/android/java/org/chromium/chrome/browser/ntp/ntp_news_optin_icon_animation.json",
       "//brave/android/java/org/chromium/chrome/browser/onboarding/animations/onboarding_ads.json",
@@ -139,7 +139,12 @@ if (is_android) {
       "//brave/android/java/org/chromium/chrome/browser/shields/disconnect_entitylist.json",
       "//brave/android/java/org/chromium/chrome/browser/vpn/brave_vpn_confirm.json",
     ]
-    deps = [ "//brave:browser_dependencies" ]
+
+    deps = [
+      "//brave:browser_dependencies",
+      "//brave:packed_resources_100_percent",
+      "//brave:packed_resources_extra",
+    ]
     disable_compression = true
   }
 }

android/brave_java_resources.gni

@@ -740,6 +740,7 @@ brave_java_resources = [
   "java/res/drawable/wallet_toolbar_panel_gradient_bg.xml",
   "java/res/drawable/wallet_top_banner_bg.xml",
   "java/res/drawable/wallet_verify_button.xml",
+  "java/res/drawable/web_notification_small_icon_background.xml",
   "java/res/drawable/white_rounded_bg.xml",
   "java/res/drawable/white_rounded_holo_button_thin.xml",
   "java/res/drawable/yearly_selector.xml",
@@ -938,6 +939,7 @@ brave_java_resources = [
   "java/res/layout/wallet_balance_layout.xml",
   "java/res/layout/wallet_coin_list_item.xml",
   "java/res/layout/web_notification_icon_frame_brave.xml",
+  "java/res/layout/web_notification_small_icon.xml",
   "java/res/menu/bookmark_tab_menu.xml",
   "java/res/menu/exit_settings_menu.xml",
   "java/res/menu/menu_account_selector.xml",

android/java/apk_for_test.flags

@@ -23,10 +23,6 @@
     *** createBookmarkItem(...);
 }
 
--keep class org.chromium.components.external_intents.ExternalNavigationHandler {
-    *** clobberCurrentTabWithFallbackUrl(...);
-}
-
 -keep class org.chromium.chrome.browser.LaunchIntentDispatcher {
     *** isCustomTabIntent(...);
 }
@@ -154,6 +150,7 @@
 -keep class org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator {
     *** mTabSwitcherModeCoordinator;
     *** mOptionalButtonController;
+    *** mToolbarColorObserverManager;
     public <init>(...);
 }
 
@@ -538,7 +535,6 @@
 
 -keep class org.chromium.chrome.browser.omnibox.suggestions.DropdownItemViewInfoListManager {
     <init>(...);
-    *** removeSuggestionsForGroup(...);
 }
 
 -keep class org.chromium.chrome.browser.omnibox.suggestions.BraveDropdownItemViewInfoListManager {
@@ -670,3 +666,11 @@
 -keep class org.chromium.chrome.browser.settings.BravePreferenceFragment {
     public <init>(...);
 }
+
+-keep class org.chromium.chrome.browser.notifications.StandardNotificationBuilder {
+    public <init>(...);
+}
+
+-keep class org.chromium.chrome.browser.notifications.BraveNotificationBuilder {
+    public <init>(...);
+}

android/java/org/chromium/chrome/browser/BraveFeatureUtil.java

@@ -7,14 +7,9 @@
 
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
-import org.chromium.chrome.browser.flags.CachedFlag;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 
 @JNINamespace("chrome::android")
 public abstract class BraveFeatureUtil {
-    public static final CachedFlag sTabSwitcherOnReturn =
-            new CachedFlag(ChromeFeatureList.TAB_SWITCHER_ON_RETURN, false);
-
     // The method sets a feature state that is passed in `enabled` var. However it can
     // set the feature to a Default state if Default state is what is `enabled` var.
     // For example: A feature `dummy_name` has 3 states and a Default value is Disabled:

android/java/org/chromium/chrome/browser/BraveHelper.java

@@ -39,8 +39,4 @@ public static void maybeMigrateSettings() {
             BravePrefServiceBridge.getInstance().setDesktopModeEnabled(false);
         }
     }
-
-    public static void cacheNativeFeatures() {
-        BraveFeatureUtil.sTabSwitcherOnReturn.cacheFeature();
-    }
 }

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -852,7 +852,6 @@ public void finishNativeInitialization() {
         BraveVpnNativeWorker.getInstance().reloadPurchasedState();
 
         BraveHelper.maybeMigrateSettings();
-        BraveHelper.cacheNativeFeatures();
 
         PrefChangeRegistrar mPrefChangeRegistrar = new PrefChangeRegistrar();
         mPrefChangeRegistrar.addObserver(BravePref.SCHEDULED_CAPTCHA_ID, this);

android/java/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java

@@ -15,6 +15,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.ImageViewCompat;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
@@ -118,7 +119,7 @@ private void updateBookmarkMenuItem(BookmarkModel bookmarkBridge, @Nullable Tab
         if (currentTab != null && bookmarkBridge.hasBookmarkIdForTab(currentTab)) {
             mBookmarkButton.setImageResource(R.drawable.btn_star_filled);
             mBookmarkButton.setContentDescription(getContext().getString(R.string.edit_bookmark));
-            ApiCompatibilityUtils.setImageTintList(mBookmarkButton,
+            ImageViewCompat.setImageTintList(mBookmarkButton,
                     AppCompatResources.getColorStateList(
                             getContext(), R.color.default_icon_color_accent1_tint_list));
         } else {

android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java

@@ -24,8 +24,13 @@ public BraveExternalNavigationHandler(ExternalNavigationDelegate delegate) {
     @Override
     public OverrideUrlLoadingResult shouldOverrideUrlLoading(ExternalNavigationParams params) {
         if (isWalletProviderOverride(params)) {
-            completeWalletProviderVerification(params);
-            return OverrideUrlLoadingResult.forClobberingTab();
+            String originalUrl = params.getUrl().getSpec();
+            String url = originalUrl.replaceFirst("^rewards://", "brave://rewards/");
+            GURL browserFallbackGURL = new GURL(url);
+            if (params.getRedirectHandler() != null) {
+                params.getRedirectHandler().setShouldNotOverrideUrlLoadingOnCurrentRedirectChain();
+            }
+            return OverrideUrlLoadingResult.forNavigateTab(browserFallbackGURL, params);
         }
         return super.shouldOverrideUrlLoading(params);
     }
@@ -65,7 +70,6 @@ public OverrideUrlLoadingResult clobberCurrentTabWithFallbackUrl(
             params.getRedirectHandler().setShouldNotOverrideUrlLoadingOnCurrentRedirectChain();
         }
         GURL browserFallbackGURL = new GURL(browserFallbackUrl);
-        return clobberCurrentTab(
-                browserFallbackGURL, params.getReferrerUrl(), params.isRendererInitiated());
+        return OverrideUrlLoadingResult.forNavigateTab(browserFallbackGURL, params);
     }
 }

android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java

@@ -399,7 +399,7 @@ public void finishNativeInitialization() {
     }
 
     @Override
-    public void onBackPressed() {}
+    public void handleBackPress() {}
 
     @Override
     public void triggerLayoutInflation() {

android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java

@@ -77,18 +77,19 @@ protected NotificationBuilderBase prepareNotificationBuilder(String notification
             vibrationPattern = EMPTY_VIBRATION_PATTERN;
         }
 
-        return super.prepareNotificationBuilder(notificationId, notificationType, origin, scopeUrl,
-                profileId, incognito, vibrateEnabled, title, body, image, icon, badge,
-                vibrationPattern, timestamp, renotify, silent, actions, webApkPackage);
-    }
+        NotificationBuilderBase result =
+                super.prepareNotificationBuilder(notificationId, notificationType, origin, scopeUrl,
+                        profileId, incognito, vibrateEnabled, title, body, image, icon, badge,
+                        vibrationPattern, timestamp, renotify, silent, actions, webApkPackage);
 
-    @Override
-    protected NotificationBuilderBase createNotificationBuilder(Context context, boolean hasImage) {
-        if (mNotificationType == NotificationType.BRAVE_ADS) {
-            // TODO(jocelyn): Remove setPriority here since we already set the
-            // importance of Ads notification channel to IMPORTANCE_HIGH?
-            return new BraveAdsNotificationBuilder(context).setPriority(Notification.PRIORITY_HIGH);
+        assert result
+                instanceof BraveNotificationBuilder
+            : "Bytecode changes for BraveNotificationBuilder were not applied!";
+        if (result instanceof BraveNotificationBuilder) {
+            ((BraveNotificationBuilder) result)
+                    .setIsBraveNotification(mNotificationType == NotificationType.BRAVE_ADS);
         }
-        return super.createNotificationBuilder(context, hasImage);
+
+        return result;
     }
 }

android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java

@@ -19,7 +19,7 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.app.BraveActivity;
 import org.chromium.chrome.browser.dialogs.BraveAdsNotificationDialog;
-import org.chromium.chrome.browser.notifications.BraveAdsNotificationBuilder;
+import org.chromium.chrome.browser.notifications.BraveNotificationBuilder;
 import org.chromium.chrome.browser.notifications.NotificationBuilderBase;
 import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
 import org.chromium.chrome.browser.notifications.retention.RetentionNotificationPublisher;
@@ -63,14 +63,14 @@ public static void showOnboardingNotification() {
             new NotificationManagerProxyImpl(context);
 
         NotificationBuilderBase notificationBuilder =
-            new BraveAdsNotificationBuilder(context)
-        .setTitle(context.getString(R.string.brave_ui_brave_rewards))
-        .setBody(context.getString(R.string.this_is_your_first_ad))
-        .setSmallIconId(R.drawable.ic_chrome)
-        .setPriority(Notification.PRIORITY_HIGH)
-        .setDefaults(Notification.DEFAULT_ALL)
-        .setContentIntent(getDeepLinkIntent(context))
-        .setOrigin(getNotificationUrl());
+                new BraveNotificationBuilder(context)
+                        .setTitle(context.getString(R.string.brave_ui_brave_rewards))
+                        .setBody(context.getString(R.string.this_is_your_first_ad))
+                        .setSmallIconId(R.drawable.ic_chrome)
+                        .setPriority(Notification.PRIORITY_HIGH)
+                        .setDefaults(Notification.DEFAULT_ALL)
+                        .setContentIntent(getDeepLinkIntent(context))
+                        .setOrigin(getNotificationUrl());
 
         NotificationWrapper notification = notificationBuilder.build(new NotificationMetadata(
                                               NotificationUmaTracker.SystemNotificationType

android/java/org/chromium/chrome/browser/notifications/permissions/BraveNotificationPermissionRationaleDialogController.java

@@ -45,7 +45,7 @@ public BraveNotificationPermissionRationaleDialogController(
     }
 
     @Override
-    public void showRationaleUi(Callback<Boolean> rationaleCallback) {
+    public void showRationaleUi(Callback<Integer> rationaleCallback) {
         LayoutInflater inflater = LayoutInflater.from(mContext);
         Resources resources = mContext.getResources();
 
@@ -81,8 +81,8 @@ public void showRationaleUi(Callback<Boolean> rationaleCallback) {
         mModalDialogManager.showDialog(dialogModel, ModalDialogType.APP);
     }
 
-    private Callback<Integer> wrapDialogDismissalCallback(Callback<Boolean> rationaleCallback) {
-        assert false : "removeSuggestionsForGroup should be redirected to parent in bytecode!";
+    private Callback<Integer> wrapDialogDismissalCallback(Callback<Integer> rationaleCallback) {
+        assert false : "wrapDialogDismissalCallback should be redirected to parent in bytecode!";
         return null;
     }
 }

android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java

@@ -73,7 +73,6 @@
 import org.chromium.chrome.browser.brave_news.models.FeedItemCard;
 import org.chromium.chrome.browser.brave_news.models.FeedItemsCard;
 import org.chromium.chrome.browser.brave_stats.BraveStatsUtil;
-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;

android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarLayout.java

@@ -10,6 +10,8 @@
 import android.util.AttributeSet;
 import android.widget.ImageButton;
 
+import androidx.core.widget.ImageViewCompat;
+
 import org.chromium.base.ApiCompatibilityUtils;
 
 public class BraveLocationBarLayout extends LocationBarLayout {
@@ -26,7 +28,7 @@ public BraveLocationBarLayout(Context context, AttributeSet attrs, int layoutId)
     }
 
     void setQRButtonTint(ColorStateList colorStateList) {
-        ApiCompatibilityUtils.setImageTintList(mQRButton, colorStateList);
+        ImageViewCompat.setImageTintList(mQRButton, colorStateList);
     }
 
     void setQRButtonVisibility(boolean shouldShow) {

android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java

@@ -40,7 +40,8 @@ public BraveTabCreator(Activity activity, WindowAndroid nativeWindow,
     @Override
     public Tab launchUrl(String url, @TabLaunchType int type) {
         if (url.equals(UrlConstants.NTP_URL)
-                && (type == TabLaunchType.FROM_CHROME_UI || type == TabLaunchType.FROM_STARTUP)) {
+                && (type == TabLaunchType.FROM_CHROME_UI || type == TabLaunchType.FROM_STARTUP
+                        || type == TabLaunchType.FROM_TAB_SWITCHER_UI)) {
             registerPageView();
             ChromeTabbedActivity chromeTabbedActivity = BraveActivity.getChromeTabbedActivity();
             if (chromeTabbedActivity != null && Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {

android/java/org/chromium/chrome/browser/tasks/BraveReturnToChromeUtil.java

@@ -5,12 +5,11 @@
 
 package org.chromium.chrome.browser.tasks;
 
-import org.chromium.chrome.browser.BraveFeatureUtil;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 
 public final class BraveReturnToChromeUtil {
     public static boolean shouldShowTabSwitcher(final long lastBackgroundedTimeMillis) {
-        if (!BraveFeatureUtil.sTabSwitcherOnReturn.isEnabled()) {
+        if (!ChromeFeatureList.sStartSurfaceReturnTime.isEnabled()) {
             return false;
         }
 

android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java

@@ -11,6 +11,8 @@
 import android.content.res.ColorStateList;
 import android.util.AttributeSet;
 
+import androidx.core.widget.ImageViewCompat;
+
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.browser.theme.ThemeColorProvider;
 import org.chromium.chrome.browser.theme.ThemeColorProvider.TintObserver;
@@ -36,7 +38,7 @@ public void setThemeColorProvider(ThemeColorProvider themeColorProvider) {
 
     @Override
     public void onTintChanged(ColorStateList tint, int brandedColorScheme) {
-        ApiCompatibilityUtils.setImageTintList(this, tint);
+        ImageViewCompat.setImageTintList(this, tint);
     }
 
     public void destroy() {

android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java

@@ -140,15 +140,14 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont
             List<ButtonDataProvider> buttonDataProviders, ActivityTabProvider tabProvider,
             ScrimCoordinator scrimCoordinator, ToolbarActionModeCallback toolbarActionModeCallback,
             FindToolbarManager findToolbarManager, ObservableSupplier<Profile> profileSupplier,
-            ObservableSupplier<BookmarkModel> bookmarkBridgeSupplier,
+            ObservableSupplier<BookmarkModel> bookmarkModelSupplier,
             @Nullable Supplier<Boolean> canAnimateNativeBrowserControls,
             OneshotSupplier<LayoutStateProvider> layoutStateProviderSupplier,
             OneshotSupplier<AppMenuCoordinator> appMenuCoordinatorSupplier,
             boolean shouldShowUpdateBadge,
             ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
             OneshotSupplier<StartSurface> startSurfaceSupplier,
             ObservableSupplier<Boolean> omniboxFocusStateSupplier,
-            OneshotSupplier<ToolbarIntentMetadata> intentMetadataOneshotSupplier,
             OneshotSupplier<Boolean> promoShownOneshotSupplier, WindowAndroid windowAndroid,
             Supplier<Boolean> isInOverviewModeSupplier,
             Supplier<ModalDialogManager> modalDialogManagerSupplier,
@@ -170,16 +169,16 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont
                 urlFocusChangedCallback, topUiThemeColorProvider, tabObscuringHandler,
                 shareDelegateSupplier, identityDiscController, buttonDataProviders, tabProvider,
                 scrimCoordinator, toolbarActionModeCallback, findToolbarManager, profileSupplier,
-                bookmarkBridgeSupplier, canAnimateNativeBrowserControls,
-                layoutStateProviderSupplier, appMenuCoordinatorSupplier, shouldShowUpdateBadge,
-                tabModelSelectorSupplier, startSurfaceSupplier, omniboxFocusStateSupplier,
-                intentMetadataOneshotSupplier, promoShownOneshotSupplier, windowAndroid,
-                isInOverviewModeSupplier, modalDialogManagerSupplier, statusBarColorController,
-                appMenuDelegate, activityLifecycleDispatcher, startSurfaceParentTabSupplier,
-                bottomSheetController, isWarmOnResumeSupplier, tabContentManager, tabCreatorManager,
-                snackbarManager, jankTracker, merchantTrustSignalsCoordinatorSupplier,
-                tabReparentingControllerSupplier, omniboxPedalDelegate,
-                ephemeralTabCoordinatorSupplier, initializeWithIncognitoColors, backPressManager);
+                bookmarkModelSupplier, canAnimateNativeBrowserControls, layoutStateProviderSupplier,
+                appMenuCoordinatorSupplier, shouldShowUpdateBadge, tabModelSelectorSupplier,
+                startSurfaceSupplier, omniboxFocusStateSupplier, promoShownOneshotSupplier,
+                windowAndroid, isInOverviewModeSupplier, modalDialogManagerSupplier,
+                statusBarColorController, appMenuDelegate, activityLifecycleDispatcher,
+                startSurfaceParentTabSupplier, bottomSheetController, isWarmOnResumeSupplier,
+                tabContentManager, tabCreatorManager, snackbarManager, jankTracker,
+                merchantTrustSignalsCoordinatorSupplier, tabReparentingControllerSupplier,
+                omniboxPedalDelegate, ephemeralTabCoordinatorSupplier,
+                initializeWithIncognitoColors, backPressManager);
 
         mOmniboxFocusStateSupplier = omniboxFocusStateSupplier;
         mLayoutStateProviderSupplier = layoutStateProviderSupplier;
@@ -236,8 +235,7 @@ public void enableBottomControls() {
                     (ViewStub) mActivity.findViewById(R.id.bottom_controls_stub);
             mBottomControls =
                     (BraveScrollingBottomViewResourceFrameLayout) bottomControlsStub.inflate();
-            if (TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mActivity)
-                    || TabUiFeatureUtilities.isConditionalTabStripEnabled()) {
+            if (TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mActivity)) {
                 mTabGroupUi = TabManagementModuleProvider.getDelegate().createTabGroupUi(mActivity,
                         mBottomControls.findViewById(R.id.bottom_container_slot),
                         mIncognitoStateProvider, mScrimCoordinator, mOmniboxFocusStateSupplier,