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

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
index 1872e6de5dd76cfd1b2fc70a026d5cf4ed1e2478..e6fcb4101fb922f40c6b7e21d5f82f2cab840568 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
@@ -62,7 +62,7 @@ public class WebApkActivity extends WebappActivity {
                         ExternalNavigationParams.Builder builder =
                                 super.buildExternalNavigationParams(
                                         navigationParams, tabRedirectHandler, shouldCloseTab);
-                        builder.setIsWebApk(true);
+                        builder.setWebApkPackageName(getWebApkPackageName());
                         return builder;
                     }
                 };
@@ -80,8 +80,14 @@ public class WebApkActivity extends WebappActivity {
 
     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();
     }
 }