diff --git a/build/android/lint/baseline.xml b/build/android/lint/baseline.xml
index 72714764953c3a..146dc6faed66c4 100644
--- a/build/android/lint/baseline.xml
+++ b/build/android/lint/baseline.xml
@@ -199,17 +199,6 @@
             column="17"/>
     </issue>
 
-    <issue
-        id="CheckResult"
-        message="The result of `shouldTriggerHelpUI` is not used"
-        errorLine1="        mTracker.shouldTriggerHelpUI(FeatureConstants.TAB_GROUPS_DRAG_AND_DROP_FEATURE);"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageService.java"
-            line="59"
-            column="9"/>
-    </issue>
-
     <issue
         id="CutPasteId"
         message="The id `R.id.bottom_container` has already been looked up in this method; possible cut &amp; paste error?"
@@ -3536,17 +3525,6 @@
             column="36"/>
     </issue>
 
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="        return TabPersistentStore.getStateFileName(Integer.toString(mTaskId));"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java"
-            line="105"
-            column="35"/>
-    </issue>
-
     <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
@@ -4009,17 +3987,6 @@
             column="79"/>
     </issue>
 
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="        NavigationEntry entry = controller.getEntryAtIndex(index);"
-        errorLine2="                                           ~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPage.java"
-            line="401"
-            column="44"/>
-    </issue>
-
     <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
@@ -5197,17 +5164,6 @@
             column="23"/>
     </issue>
 
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="                TabbedModeTabPersistencePolicy.getStateFileName(0));"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTab.java"
-            line="303"
-            column="48"/>
-    </issue>
-
     <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
@@ -5747,83 +5703,6 @@
             column="50"/>
     </issue>
 
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="                    tab.getWebContents().getNavigationController().getEntryAtIndex("
-        errorLine2="                                                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContext.java"
-            line="121"
-            column="68"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="                ConditionalTabStripUtils.setFeatureStatus(FeatureStatus.FORBIDDEN);"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java"
-            line="368"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="            ConditionalTabStripUtils.setFeatureStatus(FeatureStatus.ACTIVATED);"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java"
-            line="519"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="                    ConditionalTabStripUtils.setOptOutIndicator(true);"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java"
-            line="537"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="                ConditionalTabStripUtils.setContinuousDismissCount("
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java"
-            line="540"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="        ConditionalTabStripUtils.setFeatureStatus(FeatureStatus.ACTIVATED);"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java"
-            line="561"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="                &amp;&amp; !ConditionalTabStripUtils.getOptOutIndicator();"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiFeatureUtilities.java"
-            line="138"
-            column="46"/>
-    </issue>
-
     <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageService.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageService.java
index 68c89bd7cb28f3..60465cecbbbcf4 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageService.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageService.java
@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.tasks.tab_management;
 
+import android.annotation.SuppressLint;
+
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.feature_engagement.FeatureConstants;
@@ -55,6 +57,7 @@ private void review() {
         mIphController.showIph();
     }
 
+    @SuppressLint("CheckResult")
     private void dismiss() {
         mTracker.shouldTriggerHelpUI(FeatureConstants.TAB_GROUPS_DRAG_AND_DROP_FEATURE);
         mTracker.dismissed(FeatureConstants.TAB_GROUPS_DRAG_AND_DROP_FEATURE);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
index 7d00ab27a8e316..5e9b5db8652438 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
@@ -1432,7 +1432,6 @@ public void removeObserver(TabPersistentStoreObserver observer) {
      * @param uniqueId The ID that uniquely identifies this state file.
      * @return The name of the state file.
      */
-    @VisibleForTesting
     public static String getStateFileName(String uniqueId) {
         return SAVED_STATE_FILE_PREFIX + uniqueId;
     }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java
index 578522ec2b6110..579ba6bc7a6946 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java
@@ -111,7 +111,6 @@ public List<String> getStateToBeMergedFileNames() {
      * @param selectorIndex The index that represents which state file to pull and save state to.
      * @return The name of the state file.
      */
-    @VisibleForTesting
     public static String getStateFileName(int selectorIndex) {
         return TabPersistentStore.getStateFileName(Integer.toString(selectorIndex));
     }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ConditionalTabStripUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ConditionalTabStripUtils.java
index 8102adecf9db4d..66561534f48ecf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ConditionalTabStripUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ConditionalTabStripUtils.java
@@ -171,7 +171,6 @@ private static void recordUserStatusEnums(@UserStatus int userStatus) {
      *
      * @param featureStatus the target {@link FeatureStatus} to set.
      */
-    @VisibleForTesting
     public static void setFeatureStatus(@FeatureStatus int featureStatus) {
         SharedPreferencesManager sharedPreferencesManager = SharedPreferencesManager.getInstance();
         sharedPreferencesManager.writeInt(FEATURE_STATUS, featureStatus);
@@ -219,7 +218,6 @@ public static int getContinuousDismissCount() {
      *
      * @param count the updated count to save into SharedPreference.
      */
-    @VisibleForTesting
     public static void setContinuousDismissCount(int count) {
         SharedPreferencesManager sharedPreferencesManager = SharedPreferencesManager.getInstance();
         sharedPreferencesManager.writeInt(CONTINUOUS_DISMISS_COUNTER, count);
@@ -229,7 +227,6 @@ public static void setContinuousDismissCount(int count) {
      * Get the boolean indicator that indicates whether this user has opt-outed the conditional tab
      * strip feature from SharedPreference.
      */
-    @VisibleForTesting
     public static boolean getOptOutIndicator() {
         SharedPreferencesManager sharedPreferencesManager = SharedPreferencesManager.getInstance();
         return sharedPreferencesManager.readBoolean(OPT_OUT_INDICATOR, false);
@@ -241,7 +238,6 @@ public static boolean getOptOutIndicator() {
      *
      * @param isOptOut the boolean indicator to save into SharedPreference.
      */
-    @VisibleForTesting
     public static void setOptOutIndicator(boolean isOptOut) {
         SharedPreferencesManager sharedPreferencesManager = SharedPreferencesManager.getInstance();
         sharedPreferencesManager.writeBoolean(OPT_OUT_INDICATOR, isOptOut);
diff --git a/content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java b/content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java
index 63456a35f430c7..68c1f0f717c5b3 100644
--- a/content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java
+++ b/content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java
@@ -5,7 +5,6 @@
 package org.chromium.content_public.browser;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 
 /**
  * The NavigationController Java wrapper to allow communicating with the native
@@ -144,7 +143,6 @@ public interface NavigationController {
      * @param index Index to retrieve the NavigationEntry for.
      * @return Entry containing info about the navigation, null if the index is out of bounds.
      */
-    @VisibleForTesting
     public NavigationEntry getEntryAtIndex(int index);
 
     /**