[WebAPKs] Compute the default scope from the manifest start URL.

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java
index 2a6cf5d038ef803eca0c7ff86461ac49b7021424..50ee188790495b72ce8d43137a0c104d7816a498 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java
@@ -122,11 +122,20 @@ public class WebApkInfo extends WebappInfo {
             String shortName, int displayMode, int orientation, int source, long themeColor,
             long backgroundColor, String webApkPackageName, int shellApkVersion, String manifestUrl,
             String manifestStartUrl, Map<String, String> iconUrlToMurmur2HashMap) {
-        if (id == null || url == null || webApkPackageName == null) {
-            Log.e(TAG, "Incomplete data provided: " + id + ", " + url + ", " + webApkPackageName);
+        if (id == null || url == null || manifestStartUrl == null || webApkPackageName == null) {
+            Log.e(TAG,
+                    "Incomplete data provided: " + id + ", " + url + ", " + manifestStartUrl + ", "
+                            + webApkPackageName);
             return null;
         }
 
+        // The default scope should be computed from the Web Manifest start URL. If the WebAPK was
+        // launched from a deep link {@link startUrl} may be different from the Web Manifest start
+        // URL.
+        if (TextUtils.isEmpty(scope)) {
+            scope = ShortcutHelper.getScopeFromUrl(manifestStartUrl);
+        }
+
         return new WebApkInfo(id, url, scope, icon, name, shortName, displayMode,
                 orientation, source, themeColor, backgroundColor, webApkPackageName,
                 shellApkVersion, manifestUrl, manifestStartUrl, iconUrlToMurmur2HashMap);