[Android WebAPK] Make variations only control whether WebAPKs can be installed

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.java
index efb09f15f144d8bc09afecebe11f498aa56ea8e1..4e34d936ccdf456a3faa1880d0a55f90b309b9da 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.java
@@ -22,7 +22,6 @@ import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.document.AsyncTabCreationParams;
 import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
-import org.chromium.chrome.browser.webapps.ChromeWebApkHost;
 import org.chromium.chrome.browser.webapps.WebappDataStorage;
 import org.chromium.chrome.browser.webapps.WebappRegistry;
 import org.chromium.content_public.browser.LoadUrlParams;
@@ -80,18 +79,16 @@ public class ServiceTabLauncher {
         final TabDelegate tabDelegate = new TabDelegate(incognito);
 
         // 1. Launch WebAPK if one matches the target URL.
-        if (ChromeWebApkHost.isEnabled()) {
-            String webApkPackageName =
-                    WebApkValidator.queryWebApkPackage(ContextUtils.getApplicationContext(), url);
-            if (webApkPackageName != null) {
-                Intent intent = WebApkNavigationClient.createLaunchWebApkIntent(
-                        webApkPackageName, url, true /* forceNavigation */);
-                if (intent != null) {
-                    intent.putExtra(ShortcutHelper.EXTRA_SOURCE, ShortcutSource.NOTIFICATION);
-                    ContextUtils.getApplicationContext().startActivity(intent);
-                    return;
-                }
+        String webApkPackageName =
+                WebApkValidator.queryWebApkPackage(ContextUtils.getApplicationContext(), url);
+        if (webApkPackageName != null) {
+            Intent intent = WebApkNavigationClient.createLaunchWebApkIntent(
+                    webApkPackageName, url, true /* forceNavigation */);
+            if (intent != null) {
+                intent.putExtra(ShortcutHelper.EXTRA_SOURCE, ShortcutSource.NOTIFICATION);
+                ContextUtils.getApplicationContext().startActivity(intent);
             }
+            return;
         }
 
         // 2. Launch WebappActivity if one matches the target URL and was opened recently.
@@ -103,10 +100,7 @@ public class ServiceTabLauncher {
         // - We did not find a WebappDataStorage corresponding to this URL.
         // OR
         // - The WebappDataStorage hasn't been opened recently enough.
-        // OR
-        // - The WebappDataStorage corresponds to a WebAPK (and WebAPKs are disabled).
-        if (storage == null || !storage.wasUsedRecently()
-                || storage.getWebApkPackageName() != null) {
+        if (storage == null || !storage.wasUsedRecently()) {
             LoadUrlParams loadUrlParams = new LoadUrlParams(url, PageTransition.LINK);
             loadUrlParams.setPostData(postData);
             loadUrlParams.setVerbatimHeaders(extraHeaders);