Pass icon and icon murmur2 hash to WebApkInstaller when updating WebAPKs.

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 a4da684a344708f7e4135d4d33545c9d070bc8ee..6dd7571666bc27e86fff6daec368225a11d9e3dc 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
@@ -66,8 +66,9 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
     }
 
     @Override
-    public void onUpgradeNeededCheckFinished(boolean needsUpgrade, WebappInfo newInfo) {
-        if (needsUpgrade) updateAsync(newInfo);
+    public void onUpgradeNeededCheckFinished(boolean needsUpgrade,
+            ManifestUpgradeDetector.FetchedManifestData data) {
+        if (needsUpgrade) updateAsync(data);
         if (mUpgradeDetector != null) {
             mUpgradeDetector.destroy();
         }
@@ -76,15 +77,14 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
 
     /**
      * Sends request to WebAPK Server to update WebAPK.
-     * @param webappInfo The new fetched Web Manifest data of the WebAPK.
      */
-    public void updateAsync(WebappInfo webappInfo) {
-        int webApkVersion = getVersionFromMetaData(webappInfo.webApkPackageName());
-        nativeUpdateAsync(webappInfo.uri().toString(), webappInfo.scopeUri().toString(),
-                webappInfo.name(), webappInfo.shortName(), "", webappInfo.icon(),
-                webappInfo.displayMode(), webappInfo.orientation(), webappInfo.themeColor(),
-                webappInfo.backgroundColor(), mUpgradeDetector.getManifestUrl(),
-                webappInfo.webApkPackageName(), webApkVersion);
+    public void updateAsync(ManifestUpgradeDetector.FetchedManifestData data) {
+        String packageName = mUpgradeDetector.getWebApkPakcageName();
+        int webApkVersion = getVersionFromMetaData(packageName);
+        nativeUpdateAsync(data.startUrl, data.scopeUrl, data.name, data.shortName, data.iconUrl,
+                data.icon, data.iconMurmur2Hash, data.displayMode, data.orientation,
+                data.themeColor, data.backgroundColor, mUpgradeDetector.getManifestUrl(),
+                packageName, webApkVersion);
     }
 
     public void destroy() {
@@ -126,7 +126,7 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
     }
 
     private static native void nativeUpdateAsync(String startUrl, String scope, String name,
-            String shortName, String iconUrl, Bitmap icon, int displayMode, int orientation,
-            long themeColor, long backgroundColor, String manifestUrl, String webApkPackage,
-            int webApkVersion);
+            String shortName, String iconUrl, Bitmap icon, long iconMurmur2Hash, int displayMode,

[pkotwicz, 2016/08/19 23:38:17]

Nit: Switch the order of |iconMurmur2Hash| and |icon| to match
manifest_upgrade_detector_fetcher.cc

[Xi Han, 2016/08/26 17:54:08]

Done.

+            int orientation, long themeColor, long backgroundColor, String manifestUrl,
+            String webApkPackage, int webApkVersion);
 }