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

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.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.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 
@@ skipping 48 matching lines @@
                                 storage.updateTimeOfLastCheckForUpdatedWebManifest();
                             }
                         }
                     }
         };
         WebappRegistry.getWebappDataStorage(
                 ContextUtils.getApplicationContext(), info.id(), 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();
         }
         mUpgradeDetector = null;
     }
 
     /**
      * 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.getWebApkPackageName();
+        int webApkVersion = getVersionFromMetaData(packageName);
+        nativeUpdateAsync(data.startUrl, data.scopeUrl, data.name, data.shortName, data.iconUrl,
+                Long.toString(data.iconMurmur2Hash), data.icon, data.displayMode, data.orientation,
+                data.themeColor, data.backgroundColor, mUpgradeDetector.getManifestUrl(),
+                packageName, webApkVersion);
     }
 
     public void destroy() {
         if (mUpgradeDetector != null) {
             mUpgradeDetector.destroy();
         }
         mUpgradeDetector = null;
     }
 
     private static int getVersionFromMetaData(String webApkPackage) {
@@ skipping 21 matching lines @@
                     public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
                         // Update the request time and result together. It prevents getting a
                         // correct request time but a result from the previous request.
                         storage.updateTimeOfLastWebApkUpdateRequestCompletion();
                         storage.updateDidLastWebApkUpdateRequestSucceed(success);
                     }
                 });
     }
 
     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, String iconMurmur2Hash, Bitmap icon, int displayMode,
+            int orientation, long themeColor, long backgroundColor, String manifestUrl,
+            String webApkPackage, int webApkVersion);
 }