Use getTabModelSelectorSupplier instead of deprecated getTabModelSelector, codereview notice.

Author: AlexeyBarabash

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

@@ -34,13 +34,15 @@
 
 import org.chromium.base.Callback;
 import org.chromium.base.ContextUtils;
+import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.app.BraveActivity;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.components.browser_ui.widget.RoundedIconGenerator;
 import org.chromium.components.favicon.IconType;
 import org.chromium.components.favicon.LargeIconBridge;
@@ -430,11 +432,16 @@ public static String getCurrentYear(Resources resources) {
 
     public static Tab currentActiveChromeTabbedActivityTab() {
         ChromeTabbedActivity activity = BraveRewardsHelper.getChromeTabbedActivity();
-        if (activity == null
-                || !activity.areTabModelsInitialized()
-                || activity.getTabModelSelector() == null) {
+        if (activity == null) {
             return null;
         }
+
+        ObservableSupplier<TabModelSelector> supplier = activity.getTabModelSelectorSupplier();
+        TabModelSelector selector = supplier.get();
+        if (selector == null) {
+            return null;
+        }
+
         return activity.getActivityTab();
     }
 

android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java

@@ -53,6 +53,7 @@
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
+import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
 import org.chromium.brave_wallet.mojom.AccountId;
@@ -77,6 +78,7 @@
 import org.chromium.chrome.browser.crypto_wallet.model.AccountSelectorItemModel;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileManager;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.util.TabUtils;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
 import org.chromium.ui.widget.Toast;
@@ -1218,10 +1220,17 @@ public static Profile getProfile(boolean isIncognito) {
         if (chromeActivity == null) {
             chromeActivity = BraveActivity.getChromeTabbedActivity();
         }
-        if (chromeActivity == null || !chromeActivity.areTabModelsInitialized()) {
+        if (chromeActivity == null) {
             return ProfileManager.getLastUsedRegularProfile(); // Last resort
         }
-        return chromeActivity.getTabModelSelector().getModel(isIncognito).getProfile();
+
+        ObservableSupplier<TabModelSelector> supplier =
+                chromeActivity.getTabModelSelectorSupplier();
+        TabModelSelector selector = supplier.get();
+        if (selector == null) {
+            return ProfileManager.getLastUsedRegularProfile();
+        }
+        return selector.getModel(isIncognito).getProfile();
     }
 
     public static String formatErc721TokenTitle(String title, String id) {

android/java/org/chromium/chrome/browser/util/TabUtils.java

@@ -39,6 +39,7 @@
 import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabLaunchType;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tasks.tab_management.BraveTabUiFeatureUtilities;
 import org.chromium.chrome.browser.toolbar.LocationBarModel;
 import org.chromium.components.bookmarks.BookmarkId;
@@ -193,8 +194,14 @@ public static void openNewTab() {
     }
 
     private static void openNewTab(BraveActivity braveActivity, boolean isIncognito) {
-        if (braveActivity == null || !braveActivity.areTabModelsInitialized()) return;
-        braveActivity.getTabModelSelector().getModel(isIncognito).commitAllTabClosures();
+        if (braveActivity == null) return;
+
+        ObservableSupplier<TabModelSelector> supplier = braveActivity.getTabModelSelectorSupplier();
+        TabModelSelector selector = supplier.get();
+        if (selector == null) {
+            return;
+        }
+        selector.getModel(isIncognito).commitAllTabClosures();
         braveActivity.getTabCreator(isIncognito).launchNtp();
     }
 
@@ -210,18 +217,19 @@ public static void openUrlInNewTab(boolean isIncognito, String url) {
     public static void openUrlInNewTabInBackground(boolean isIncognito, String url) {
         try {
             BraveActivity braveActivity = BraveActivity.getBraveActivity();
-            if (braveActivity.getTabModelSelector() != null
-                    && braveActivity.areTabModelsInitialized()
-                    && braveActivity.getActivityTab() != null) {
-                braveActivity
-                        .getTabModelSelector()
-                        .openNewTab(
-                                new LoadUrlParams(url),
-                                BraveTabUiFeatureUtilities.isBraveTabGroupsEnabled()
-                                        ? TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP
-                                        : TabLaunchType.FROM_LONGPRESS_BACKGROUND,
-                                braveActivity.getActivityTab(),
-                                isIncognito);
+
+            ObservableSupplier<TabModelSelector> supplier =
+                    braveActivity.getTabModelSelectorSupplier();
+            TabModelSelector selector = supplier.get();
+
+            if (selector != null && braveActivity.getActivityTab() != null) {
+                selector.openNewTab(
+                        new LoadUrlParams(url),
+                        BraveTabUiFeatureUtilities.isBraveTabGroupsEnabled()
+                                ? TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP
+                                : TabLaunchType.FROM_LONGPRESS_BACKGROUND,
+                        braveActivity.getActivityTab(),
+                        isIncognito);
             }
         } catch (BraveActivity.BraveActivityNotFoundException e) {
             Log.e(TAG, "openUrlInNewTabInBackground " + e);