Send all of the icon URLs listed in Web Manifest to WebAPK Server.

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 5433a710d1f5f5b90fcf2e00f04a939ce39fb7c2..f819ec4cbc8ba4d4e41fa0cee00cdeb685dc8529 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
@@ -16,6 +16,7 @@ import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.webapk.lib.client.WebApkVersion;
 
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -126,9 +127,9 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
         recordUpdateInWebappDataStorage(mId, false);
 
         if (data != null) {
-            updateAsync(data.startUrl, data.scopeUrl, data.name, data.shortName, data.iconUrl,
-                    data.iconMurmur2Hash, data.icon, data.displayMode, data.orientation,
-                    data.themeColor, data.backgroundColor);
+            updateAsync(data.startUrl, data.scopeUrl, data.name, data.shortName, data.bestIconUrl,
+                    data.iconMurmur2Hash, data.icon, data.iconUrls, data.displayMode,
+                    data.orientation, data.themeColor, data.backgroundColor);
             return;
         }
 
@@ -149,19 +150,21 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
      */
     private void updateAsyncUsingAndroidManifestMetaData() {
         updateAsync(mMetaData.startUrl, mMetaData.scope, mMetaData.name, mMetaData.shortName,
-                mMetaData.iconUrl, mMetaData.iconMurmur2Hash, mIcon, mMetaData.displayMode,
-                mMetaData.orientation, mMetaData.themeColor, mMetaData.backgroundColor);
+                mMetaData.bestIconUrl, mMetaData.iconMurmur2Hash, mIcon, mMetaData.iconUrls,
+                mMetaData.displayMode, mMetaData.orientation, mMetaData.themeColor,
+                mMetaData.backgroundColor);
     }
 
     /**
      * Sends request to WebAPK Server to update WebAPK.
      */
     protected void updateAsync(String startUrl, String scopeUrl, String name, String shortName,
-            String iconUrl, String iconMurmur2Hash, Bitmap icon, int displayMode, int orientation,
-            long themeColor, long backgroundColor) {
+            String iconUrl, String iconMurmur2Hash, Bitmap icon, Set<String> iconUrls,
+            int displayMode, int orientation, long themeColor, long backgroundColor) {
         int versionCode = readVersionCodeFromAndroidManifest(mWebApkPackageName);
         nativeUpdateAsync(mId, startUrl, scopeUrl, name, shortName, iconUrl, iconMurmur2Hash, icon,
-                displayMode, orientation, themeColor, backgroundColor, mMetaData.manifestUrl,
+                iconUrls.toArray(new String[iconUrls.size()]), displayMode, orientation, themeColor,

[pkotwicz, 2016/11/01 00:29:49]

Is this better:
iconUrls.toArray(new String[0])

[Xi Han, 2016/11/07 16:51:42]

I am not sure which one is preferred, since both of them are used in chromium's
code base.

+                backgroundColor, mMetaData.manifestUrl,
                 mWebApkPackageName, versionCode);
     }
 
@@ -265,6 +268,6 @@ public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
 
     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);
+            String[] iconUrls, int displayMode, int orientation, long themeColor,
+            long backgroundColor, String manifestUrl, String webApkPackage, int webApkVersion);
 }