| Index: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWeb.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWeb.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWeb.java
|
| index fbd92abb32b1a3811357284e709cdabd77cd288a..6aa7b5d52e465f01f0eb97708839c85e14661f5d 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWeb.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWeb.java
|
| @@ -7,27 +7,23 @@ package org.chromium.chrome.browser.physicalweb;
|
| import android.content.Context;
|
| import android.os.AsyncTask;
|
|
|
| -import org.chromium.base.CommandLine;
|
| import org.chromium.chrome.browser.ChromeApplication;
|
| -import org.chromium.chrome.browser.ChromeSwitches;
|
| -import org.chromium.chrome.browser.ChromeVersionInfo;
|
| +import org.chromium.chrome.browser.ChromeFeatureList;
|
| import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
|
|
|
| /**
|
| * This class provides the basic interface to the Physical Web feature.
|
| */
|
| public class PhysicalWeb {
|
| + private static final String FEATURE_NAME = "PhysicalWeb";
|
| +
|
| /**
|
| * Evaluate whether the environment is one in which the Physical Web should
|
| * be enabled.
|
| * @return true if the PhysicalWeb should be enabled
|
| */
|
| public static boolean featureIsEnabled() {
|
| - boolean allowedChannel =
|
| - ChromeVersionInfo.isLocalBuild() || ChromeVersionInfo.isDevBuild();
|
| - boolean switchEnabled =
|
| - CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_PHYSICAL_WEB);
|
| - return allowedChannel && switchEnabled;
|
| + return ChromeFeatureList.isEnabled(FEATURE_NAME);
|
| }
|
|
|
| /**
|
|
|