Add an about:flag to control WebApk enablement.

chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java

 // Copyright 2015 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.externalnav;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.SystemClock;
 import android.provider.Browser;
 import android.support.customtabs.CustomTabsIntent;
 import android.test.InstrumentationTestCase;
 import android.test.mock.MockContext;
 import android.test.mock.MockPackageManager;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.CommandLine;
 import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabRedirectHandler;
 import org.chromium.chrome.browser.util.FeatureUtilities;
+import org.chromium.chrome.browser.webapps.ChromeWebApkHost;
 import org.chromium.ui.base.PageTransition;
 import org.chromium.webapk.lib.common.WebApkConstants;
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Instrumentation tests for {@link ExternalNavigationHandler}.
  */
@@ skipping 63 matching lines @@
 
     public ExternalNavigationHandlerTest() {
         mDelegate = new TestExternalNavigationDelegate();
         mUrlHandler = new ExternalNavigationHandler(mDelegate);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mDelegate.setContext(getInstrumentation().getTargetContext());
-        CommandLine.init(new String[0]);
         RecordHistogram.disableForTests();
         mDelegate.mQueryIntentOverride = null;
+        ChromeWebApkHost.initForTesting(false);  // disabled by default
     }
 
     @SmallTest
     public void testOrdinaryIncognitoUri() {
         checkUrl("http://youtube.com/")
                 .withIsIncognito(true)
                 .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_ASYNC_ACTION, START_INCOGNITO);
     }
 
     @SmallTest
@@ skipping 731 matching lines @@
      */
     @SmallTest
     public void testLeaveWebApk_LinkOutOfScope() {
         checkUrl(SEARCH_RESULT_URL_FOR_TOM_HANKS)
                 .withWebApkPackageName(WEBAPK_PACKAGE_NAME)
                 .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT, START_CHROME);
     }
 
     /**
      * Test that tapping a link which falls solely into the scope of a WebAPK does not bypass the
-     * intent picker if WebAPKs are disabled in the command line.
+     * intent picker if WebAPKs are not enabled.
      */
     @SmallTest
-    public void testLaunchWebApk_WebApkDisabledCommandLine() {
+    public void testLaunchWebApk_WebApkNotEnabled() {
         checkUrl(WEBAPK_SCOPE)
                 .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT,
                         START_OTHER_ACTIVITY);
     }
 
     /**
      * Test that tapping a link which falls solely in the scope of a WebAPK launches a WebAPK
-     * without showing the intent picker if WebAPKs are enabled in the command line.
+     * without showing the intent picker if WebAPKs are enabled.
      */
     @SmallTest
     public void testLaunchWebApk_BypassIntentPicker() {
-        CommandLine.getInstance().appendSwitch(ChromeSwitches.ENABLE_WEBAPK);
+        ChromeWebApkHost.initForTesting(true);
         checkUrl(WEBAPK_SCOPE)
                 .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT, START_WEBAPK);
     }
 
     /**
      * Test that tapping a link which falls in the scope of multiple intent handlers, one of which
      * is a WebAPK, shows the intent picker.
      */
     @SmallTest
     public void testLaunchWebApk_ShowIntentPickerMultipleIntentHandlers() {
-        CommandLine.getInstance().appendSwitch(ChromeSwitches.ENABLE_WEBAPK);
+        ChromeWebApkHost.initForTesting(true);
         checkUrl(WEBAPK_WITH_NATIVE_APP_SCOPE)
                 .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT,
                         START_OTHER_ACTIVITY);
     }
 
     /**
      * Test that tapping a link which falls solely into the scope of a different WebAPK launches a
      * WebAPK without showing the intent picker.
      */
     @SmallTest
     public void testLaunchWebApk_BypassIntentPickerFromAnotherWebApk() {
-        CommandLine.getInstance().appendSwitch(ChromeSwitches.ENABLE_WEBAPK);
+        ChromeWebApkHost.initForTesting(true);
         checkUrl(WEBAPK_SCOPE)
                 .withReferrer(WEBAPK_WITH_NATIVE_APP_SCOPE)
                 .withWebApkPackageName(WEBAPK_WITH_NATIVE_APP_PACKAGE_NAME)
                 .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT, START_WEBAPK);
     }
 
     /**
      * Test that a link which falls into the scope of an invalid WebAPK (e.g. it was incorrectly
      * signed) does not get any special WebAPK handling. The first time that the user taps on the
      * link, the intent picker should be shown.
      */
     @SmallTest
     public void testLaunchWebApk_ShowIntentPickerInvalidWebApk() {
-        CommandLine.getInstance().appendSwitch(ChromeSwitches.ENABLE_WEBAPK);
+        ChromeWebApkHost.initForTesting(true);
         checkUrl(COUNTERFEIT_WEBAPK_SCOPE)
                 .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT,
                         START_OTHER_ACTIVITY);
     }
 
     /**
      * Test that tapping a link which falls into the scope of the current WebAPK stays within the
      * WebAPK.
      */
     @SmallTest
     public void testLaunchWebApk_StayInSameWebApk() {
-        CommandLine.getInstance().appendSwitch(ChromeSwitches.ENABLE_WEBAPK);
+        ChromeWebApkHost.initForTesting(true);
         checkUrl(WEBAPK_SCOPE + "/new.html")
                 .withWebApkPackageName(WEBAPK_PACKAGE_NAME)
                 .expecting(OverrideUrlLoadingResult.NO_OVERRIDE, IGNORE);
     }
 
     private static ResolveInfo newResolveInfo(String packageName, String name) {
         ActivityInfo ai = new ActivityInfo();
         ai.packageName = packageName;
         ai.name = name;
         ResolveInfo ri = new ResolveInfo();
@@ skipping 360 matching lines @@
             return new TestPackageManager();
         }
 
         @Override
         public String getPackageName() {
             return "test.app.name";
         }
 
     }
 }