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

chrome/browser/android/webapk/webapk_update_manager.cc

Index: chrome/browser/android/webapk/webapk_update_manager.cc
diff --git a/chrome/browser/android/webapk/webapk_update_manager.cc b/chrome/browser/android/webapk/webapk_update_manager.cc
index 88e708e03f335fa8f239a31d9b60543c4fbc9944..762521779b98eb45e0334c74129b85e3700f737a 100644
--- a/chrome/browser/android/webapk/webapk_update_manager.cc
+++ b/chrome/browser/android/webapk/webapk_update_manager.cc
@@ -6,6 +6,7 @@
 
 #include <jni.h>
 
+#include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "chrome/browser/android/webapk/webapk_installer.h"
@@ -50,9 +51,10 @@ static void UpdateAsync(JNIEnv* env,
                         const JavaParamRef<jstring>& java_scope,
                         const JavaParamRef<jstring>& java_name,
                         const JavaParamRef<jstring>& java_short_name,
-                        const JavaParamRef<jstring>& java_icon_url,
+                        const JavaParamRef<jstring>& java_best_icon_url,
                         const JavaParamRef<jstring>& java_icon_murmur2_hash,
                         const JavaParamRef<jobject>& java_icon_bitmap,

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

Nit:
|java_icon_murmur2_hash| -> |java_best_icon_murmur2_hash|
|java_icon_bitmap| -> |java_best_icon_bitmap|

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

Done.

+                        const JavaParamRef<jobjectArray>& java_icon_urls,
                         jint java_display_mode,
                         jint java_orientation,
                         jlong java_theme_color,
@@ -72,7 +74,7 @@ static void UpdateAsync(JNIEnv* env,
   GURL start_url(ConvertJavaStringToUTF8(env, java_start_url));
   GURL scope(ConvertJavaStringToUTF8(env, java_scope));
   GURL web_manifest_url(ConvertJavaStringToUTF8(env, java_web_manifest_url));
-  GURL icon_url(ConvertJavaStringToUTF8(env, java_icon_url));
+  GURL best_icon_url(ConvertJavaStringToUTF8(env, java_best_icon_url));
   ShortcutInfo info(start_url);
   info.scope = scope;
   info.name = ConvertJavaStringToUTF16(env, java_name);
@@ -82,7 +84,7 @@ static void UpdateAsync(JNIEnv* env,
       static_cast<blink::WebScreenOrientationLockType>(java_orientation);
   info.theme_color = (long)java_theme_color;
   info.background_color = (long)java_background_color;
-  info.icon_url = icon_url;
+  info.best_icon_url = best_icon_url;
   info.manifest_url = web_manifest_url;
 
   gfx::JavaBitmap java_bitmap_lock(java_icon_bitmap);
@@ -92,6 +94,14 @@ static void UpdateAsync(JNIEnv* env,
   std::string icon_murmur2_hash;
   ConvertJavaStringToUTF8(env, java_icon_murmur2_hash, &icon_murmur2_hash);
 
+  std::vector<std::string> icon_urls;
+  if (!java_icon_urls.is_null()) {
+    base::android::JavaArrayOfByteArrayToStringVector(
+        env, java_icon_urls.obj(), &icon_urls);
+  }
+  for (const auto& icon_url : icon_urls)
+    info.icon_urls.push_back(GURL(icon_url));
+
   std::string webapk_package;
   ConvertJavaStringToUTF8(env, java_webapk_package, &webapk_package);