Fix crash on WebAPK startup

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

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java
index fe2f858fda27514698c331c0cba4f3cfdbd4fad7..43746d902864378a0569ccce636670354987587d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java
@@ -17,7 +17,6 @@ import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.chrome.browser.webapps.WebappRegistry.FetchWebappDataStorageCallback;
 import org.chromium.webapk.lib.client.WebApkVersion;
-import org.chromium.webapk.lib.common.WebApkConstants;
 import org.chromium.webapk.lib.common.WebApkMetaDataKeys;
 
 import java.util.concurrent.TimeUnit;
@@ -36,6 +35,11 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
      */
     private static final long RETRY_UPDATE_DURATION = TimeUnit.HOURS.toMillis(12L);
 
+    /**
+     * Id of WebAPK data in WebappDataStorage
+     */
+    private String mId;
+
     /** Version number of //chrome/android/webapk/shell_apk code. */
     private int mShellApkVersion;
 
@@ -62,6 +66,7 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
             return;
         }
 
+        mId = info.id();
         mVersionCode = packageInfo.versionCode;
         final Bundle metadata = packageInfo.applicationInfo.metaData;
         mShellApkVersion =
@@ -114,8 +119,8 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
      */
     public void updateAsync(ManifestUpgradeDetector.FetchedManifestData data) {
         String packageName = mUpgradeDetector.getWebApkPackageName();
-        nativeUpdateAsync(data.startUrl, data.scopeUrl, data.name, data.shortName, data.iconUrl,
-                data.iconMurmur2Hash, data.icon, data.displayMode, data.orientation,
+        nativeUpdateAsync(mId, data.startUrl, data.scopeUrl, data.name, data.shortName,
+                data.iconUrl, data.iconMurmur2Hash, data.icon, data.displayMode, data.orientation,
                 data.themeColor, data.backgroundColor, mUpgradeDetector.getManifestUrl(),
                 packageName, mVersionCode);
     }
@@ -166,8 +171,8 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
      * fails.
      */
     @CalledByNative
-    private static void onBuiltWebApk(final boolean success, String webapkPackage) {
-        WebappRegistry.getWebappDataStorage(WebApkConstants.WEBAPK_ID_PREFIX + webapkPackage,
+    private static void onBuiltWebApk(String id, final boolean success) {
+        WebappRegistry.getWebappDataStorage(id,
                 new FetchWebappDataStorageCallback() {
                     @Override
                     public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
@@ -179,8 +184,8 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
                 });
     }
 
-    private static native void nativeUpdateAsync(String startUrl, String scope, String name,
-            String shortName, String iconUrl, String iconMurmur2Hash, Bitmap icon, int displayMode,
-            int orientation, long themeColor, long backgroundColor, String manifestUrl,
-            String webApkPackage, int webApkVersion);
+    private static native void nativeUpdateAsync(String id, String startUrl, String scope,
+            String name, String shortName, String iconUrl, String iconMurmur2Hash, Bitmap icon,
+            int displayMode, int orientation, long themeColor, long backgroundColor,
+            String manifestUrl, String webApkPackage, int webApkVersion);
 }