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

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

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorFetcher.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorFetcher.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorFetcher.java
index 5c80c393c9b200381a15b4247ce4da641d18560e..0b5aa13f836030224b1439851b1b037592b95177 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorFetcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorFetcher.java
@@ -22,8 +22,9 @@ public class ManifestUpgradeDetectorFetcher extends EmptyTabObserver {
      */
     public interface Callback {
         void onGotManifestData(String startUrl, String scopeUrl, String name, String shortName,

[dominickn, 2016/11/17 02:34:38]

It's really confusing that this onGotManifestData takes lots of arguments, but
the onGotManifestData in WebApkUpdateManager just takes the FetchedManifestData.

I really think that all of them should take a WebApkInfo object and that should
have everything in it. The only time you should have an argument list this long
is for a CalledByNative method. Otherwise, we should use objects to encapsulate
the arguments.

[Xi Han, 2016/11/17 18:09:58]

I haven't thought about it before, but it does make sense to me. Move the
generation of the FetchedManifestData from ManifestUpgradeDetector to
ManifestUpgradeDetectorFetcher.
 
The WebApkInfo and FetchedManifestData are slightly different. For example,
WebApkInfo have encodedIcon, while we need to store the bestIconUrl and
bestIconHash in the FetchedManifestData. Personally I would prefer to use
FetchedManifestData here.

-                String iconUrl, String iconMurmur2Hash, Bitmap iconBitmap, int displayMode,
-                int orientation, long themeColor, long backgroundColor);
+                String bestIconUrl, String bestIconMurmur2Hash, Bitmap bestIconBitmap,
+                String[] iconUrls, int displayMode, int orientation, long themeColor,
+                long backgroundColor);
     }
 
     /**
@@ -86,10 +87,12 @@ public class ManifestUpgradeDetectorFetcher extends EmptyTabObserver {
      */
     @CalledByNative
     private void onDataAvailable(String startUrl, String scopeUrl, String name, String shortName,
-            String iconUrl, String iconMurmur2Hash, Bitmap iconBitmap, int displayMode,
-            int orientation, long themeColor, long backgroundColor) {
-        mCallback.onGotManifestData(startUrl, scopeUrl, name, shortName, iconUrl, iconMurmur2Hash,
-                iconBitmap, displayMode, orientation, themeColor, backgroundColor);
+            String bestIconUrl, String bestIconMurmur2Hash, Bitmap bestIconBitmap,
+            String[] iconUrls, int displayMode, int orientation, long themeColor,
+            long backgroundColor) {
+        mCallback.onGotManifestData(startUrl, scopeUrl, name, shortName, bestIconUrl,
+                bestIconMurmur2Hash, bestIconBitmap, iconUrls, displayMode, orientation, themeColor,
+                backgroundColor);
     }
 
     private native long nativeInitialize(String scope, String webManifestUrl);