Use feature architecture as kill switch for WebAPKs instead of field trial

chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java
index 8f0e76d6723a4cb4c101958ed56e1cc6c07ff1bd..5f75e9039dcbd26b0a0300d16524615433debdee 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java
@@ -8,9 +8,9 @@ import android.os.StrictMode;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
-import org.chromium.base.FieldTrialList;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.webapk.lib.client.WebApkValidator;
@@ -21,12 +21,6 @@ import org.chromium.webapk.lib.client.WebApkValidator;
 public class ChromeWebApkHost {
     private static final String TAG = "ChromeWebApkHost";
 
-    /** Finch experiment name. */
-    private static final String WEBAPK_DISABLE_EXPERIMENT_NAME = "WebApkKillSwitch";
-
-    /** Finch experiment group which forces WebAPKs off. */
-    private static final String WEBAPK_RUNTIME_DISABLED = "Disabled";
-
     private static Boolean sEnabledForTesting;
 
     public static void init() {
@@ -72,9 +66,8 @@ public class ChromeWebApkHost {
     public static void cacheEnabledStateForNextLaunch() {
         boolean wasEnabled = isEnabledInPrefs();
         CommandLine instance = CommandLine.getInstance();
-        String experiment = FieldTrialList.findFullName(WEBAPK_DISABLE_EXPERIMENT_NAME);
-        boolean isEnabled = (!WEBAPK_RUNTIME_DISABLED.equals(experiment)
-                && instance.hasSwitch(ChromeSwitches.ENABLE_WEBAPK));
+        boolean isEnabled = ChromeFeatureList.isEnabled(ChromeFeatureList.WEBAPKS)
+                && instance.hasSwitch(ChromeSwitches.ENABLE_WEBAPK);
 
         if (isEnabled != wasEnabled) {
             Log.d(TAG, "WebApk setting changed (%s => %s)", wasEnabled, isEnabled);