Android: TabPersistentStore fully on TaskRunners

Getting rid of the SERIAL_EXECUTOR path for finch trials.

Bug: 957735
Change-Id: I04577e3fe61c749b9f3bb634fa7252f2ab299a58
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1689035Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676180}

chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java

@@ -320,7 +320,6 @@ public abstract class ChromeFeatureList {
     public static final String TAB_GROUPS_UI_IMPROVEMENTS_ANDROID =
             "TabGroupsUiImprovementsAndroid";
     public static final String TAB_GRID_LAYOUT_ANDROID = "TabGridLayoutAndroid";
-    public static final String TAB_PERSISTENT_STORE_TASK_RUNNER = "TabPersistentStoreTaskRunner";
     public static final String TAB_REPARENTING = "TabReparenting";
     public static final String TAB_SWITCHER_ON_RETURN = "TabSwitcherOnReturn";
     public static final String TAB_TO_GTS_ANIMATION = "TabToGTSAnimation";

chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java

@@ -180,9 +180,9 @@ public class ChromePreferenceManager {
     private static final String NTP_BUTTON_VARIANT_KEY = "ntp_button_variant";
 
     /**
-     * Whether or not TabPersistentStore is using a TaskRunner instead of SERIAL_EXECUTOR.
-     * Default value is false.
+     * Deprecated in M77. This value may still exist in shared preferences file. Do not reuse.
      */
+    @Deprecated
     public static final String TAB_PERSISTENT_STORE_TASK_RUNNER_ENABLED_KEY =
             "tab_persistent_store_task_runner_enabled";
 

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java

@@ -36,7 +36,6 @@ import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabIdManager;
 import org.chromium.chrome.browser.tab.TabState;
-import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.UrlConstants;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
@@ -223,40 +222,7 @@ public class TabPersistentStore extends TabPersister {
         mObservers.addObserver(observer);
         mPreferences = ContextUtils.getAppSharedPreferences();
         TaskTraits taskTraits = TaskTraits.USER_BLOCKING_MAY_BLOCK;
-        if (FeatureUtilities.isTabPersistentStoreTaskRunnerEnabled()) {
-            mSequencedTaskRunner = PostTask.createSequencedTaskRunner(taskTraits);
-        } else {
-            mSequencedTaskRunner = new SequencedTaskRunner() {
-                @Override
-                public void postTask(Runnable task) {
-                    AsyncTask.SERIAL_EXECUTOR.execute(task);
-                }
-
-                @Override
-                public void destroy() {
-                    assert false : "Should not call destroy() on SERIAL_EXECUTOR TaskRunner";
-                }
-
-                @Override
-                public void disableLifetimeCheck() {
-                    assert false
-                        : "Should not call disableLifetimeCheck() on SERIAL_EXECUTOR TaskRunner";
-                }
-
-                @Override
-                public void postDelayedTask(Runnable task, long delay) {
-                    assert false
-                        : "Should not call postDelayedTask(...) on SERIAL_EXECUTOR TaskRunner";
-                }
-
-                @Override
-                public void initNativeTaskRunner() {
-                    assert false
-                        : "Should not call initNativeTaskRunner() on SERIAL_EXECUTOR TaskRunner";
-                }
-            };
-        }
-
+        mSequencedTaskRunner = PostTask.createSequencedTaskRunner(taskTraits);
         mPrefetchTabListToMergeTasks = new ArrayList<>();
         mMergedFileNames = new HashSet<>();
 

chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java

@@ -88,7 +88,6 @@ public class FeatureUtilities {
     private static Boolean sIsNetworkServiceEnabled;
     private static Boolean sIsNetworkServiceWarmUpEnabled;
     private static Boolean sIsImmersiveUiModeEnabled;
-    private static Boolean sIsTabPersistentStoreTaskRunnerEnabled;
     private static Boolean sServiceManagerForDownloadResumption;
 
     private static Boolean sDownloadAutoResumptionEnabledInNative;
@@ -192,7 +191,6 @@ public class FeatureUtilities {
         cacheNetworkServiceWarmUpEnabled();
         cacheImmersiveUiModeEnabled();
         cacheSwapPixelFormatToFixConvertFromTranslucentEnabled();
-        cacheTabPersistentStoreTaskRunnerVariant();
         cacheReachedCodeProfilerTrialGroup();
 
         if (isHighEndPhone()) cacheGridTabSwitcherEnabled();
@@ -370,29 +368,6 @@ public class FeatureUtilities {
         return sIsHomepageTileEnabled;
     }
 
-    /**
-     * Cache the whether or not TabPersistentStore is using TaskRunners, so on next startup, the
-     * value can be made available immediately.
-     */
-    private static void cacheTabPersistentStoreTaskRunnerVariant() {
-        ChromePreferenceManager.getInstance().writeBoolean(
-                ChromePreferenceManager.TAB_PERSISTENT_STORE_TASK_RUNNER_ENABLED_KEY,
-                ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_PERSISTENT_STORE_TASK_RUNNER));
-    }
-
-    /**
-     * @return Whether or not we are using the TaskRunner API in TabPersistentStore.
-     */
-    public static boolean isTabPersistentStoreTaskRunnerEnabled() {
-        if (sIsTabPersistentStoreTaskRunnerEnabled == null) {
-            ChromePreferenceManager prefManager = ChromePreferenceManager.getInstance();
-
-            sIsTabPersistentStoreTaskRunnerEnabled = prefManager.readBoolean(
-                    ChromePreferenceManager.TAB_PERSISTENT_STORE_TASK_RUNNER_ENABLED_KEY, false);
-        }
-        return sIsTabPersistentStoreTaskRunnerEnabled;
-    }
-
     /**
      * Cache whether or not the new tab page button is enabled so that on next startup, it can be
      * made available immediately.

chrome/browser/android/chrome_feature_list.cc

@@ -174,7 +174,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &kTabGroupsAndroid,
     &kTabGroupsUiImprovementsAndroid,
     &kTabGridLayoutAndroid,
-    &kTabPersistentStoreTaskRunner,
     &kTabReparenting,
     &kTabSwitcherOnReturn,
     &kTabToGTSAnimation,
@@ -541,9 +540,6 @@ const base::Feature kTabGroupsUiImprovementsAndroid{
 const base::Feature kTabGridLayoutAndroid{"TabGridLayoutAndroid",
                                           base::FEATURE_DISABLED_BY_DEFAULT};
 
-const base::Feature kTabPersistentStoreTaskRunner{
-    "TabPersistentStoreTaskRunner", base::FEATURE_DISABLED_BY_DEFAULT};
-
 const base::Feature kTabReparenting{"TabReparenting",
                                     base::FEATURE_ENABLED_BY_DEFAULT};
 

chrome/browser/android/chrome_feature_list.h

@@ -112,7 +112,6 @@ extern const base::Feature kTabEngagementReportingAndroid;
 extern const base::Feature kTabGroupsAndroid;
 extern const base::Feature kTabGroupsUiImprovementsAndroid;
 extern const base::Feature kTabGridLayoutAndroid;
-extern const base::Feature kTabPersistentStoreTaskRunner;
 extern const base::Feature kTabReparenting;
 extern const base::Feature kTabSwitcherOnReturn;
 extern const base::Feature kTabToGTSAnimation;