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

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 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;
 
 /**
  * Contains functionality needed for Chrome to host WebAPKs.
  */
 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() {
         WebApkValidator.initWithBrowserHostSignature(ChromeWebApkHostSignature.EXPECTED_SIGNATURE);
     }
 
     public static void initForTesting(boolean enabled) {
         sEnabledForTesting = enabled;
     }
 
@@ skipping 25 matching lines @@
         }
     }
 
     /**
      * Once native is loaded we can consult the command-line (set via about:flags) and also finch
      * state to see if we should enable WebAPKs.
      */
     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.WEBAPK)
+                && instance.hasSwitch(ChromeSwitches.ENABLE_WEBAPK);
 
         if (isEnabled != wasEnabled) {
             Log.d(TAG, "WebApk setting changed (%s => %s)", wasEnabled, isEnabled);
             ChromePreferenceManager.getInstance(ContextUtils.getApplicationContext())
                     .setCachedWebApkRuntimeEnabled(isEnabled);
         }
     }
 }