Upstream: Launch WebAPK without showing intent picker when user taps link in WebAPK scope

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.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.content.Intent;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.browser.ShortcutHelper;
@@ skipping 44 matching lines @@
             @Override
             public InterceptNavigationDelegateImpl createInterceptNavigationDelegate(Tab tab) {
                 return new InterceptNavigationDelegateImpl(tab) {
                     @Override
                     public ExternalNavigationParams.Builder buildExternalNavigationParams(
                             NavigationParams navigationParams,
                             TabRedirectHandler tabRedirectHandler, boolean shouldCloseTab) {
                         ExternalNavigationParams.Builder builder =
                                 super.buildExternalNavigationParams(
                                         navigationParams, tabRedirectHandler, shouldCloseTab);
-                        builder.setIsWebApk(true);
+                        builder.setWebApkPackageName(getWebApkPackageName());
                         return builder;
                     }
                 };
             }
 
             @Override
             public AppBannerManager createAppBannerManager(Tab tab) {
                 // Do not show app banners for WebAPKs regardless of the current page URL.
                 // A WebAPK can display a page outside of its WebAPK scope if a page within the
                 // WebAPK scope navigates via JavaScript while the WebAPK is in the background.
                 return null;
             }
         };
     }
 
     public void onStop() {
         super.onStop();
-        String packageName = getWebappInfo().webApkPackageName();
         WebApkServiceConnectionManager.getInstance().disconnect(
-                ContextUtils.getApplicationContext(), packageName);
+                ContextUtils.getApplicationContext(), getWebApkPackageName());
+    }
+
+    /**
+     * Returns the WebAPK's package name.
+     */
+    private String getWebApkPackageName() {
+        return getWebappInfo().webApkPackageName();
     }
 }