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

chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc

Index: chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc
diff --git a/chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc b/chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc
index bff110e56371604385b77ad3f308b8e9f283d69b..784b8d8ccc08af244a2030641e7f02655080d6f3 100644
--- a/chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc
+++ b/chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc
@@ -7,6 +7,7 @@
 #include <jni.h>
 #include <vector>
 
+#include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/webapk/webapk_icon_hasher.h"
@@ -144,7 +145,7 @@ void ManifestUpgradeDetectorFetcher::OnDidGetInstallableData(
 
   info_.UpdateFromManifest(data.manifest);
   info_.manifest_url = data.manifest_url;
-  info_.icon_url = data.icon_url;
+  info_.best_icon_url = data.icon_url;
   icon_ = *data.icon;
 
   icon_hasher_.reset(new WebApkIconHasher());
@@ -184,15 +185,22 @@ void ManifestUpgradeDetectorFetcher::OnDataAvailable(
       base::android::ConvertUTF16ToJavaString(env, info.name);
   ScopedJavaLocalRef<jstring> java_short_name =
       base::android::ConvertUTF16ToJavaString(env, info.short_name);
-  ScopedJavaLocalRef<jstring> java_icon_url =
-      base::android::ConvertUTF8ToJavaString(env, info.icon_url.spec());
+  ScopedJavaLocalRef<jstring> java_best_icon_url =
+      base::android::ConvertUTF8ToJavaString(env, info.best_icon_url.spec());
   ScopedJavaLocalRef<jstring> java_icon_murmur2_hash =
       base::android::ConvertUTF8ToJavaString(env, icon_murmur2_hash);
   ScopedJavaLocalRef<jobject> java_bitmap =
       gfx::ConvertToJavaBitmap(&icon_bitmap);

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

Nit: |java_bitmap| -> |java_best_bitmap|

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

Done.

 
+  std::vector<std::string> icon_urls;
+  for (const auto& icon_url : info.icon_urls)

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

Nit: "const auto& icon_url" -> "const GURL& icon_url"

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

Done.

+    icon_urls.push_back(icon_url.spec());
+
+  ScopedJavaLocalRef<jobjectArray> java_icon_urls =
+      base::android::ToJavaArrayOfStrings(env, icon_urls);
+
   Java_ManifestUpgradeDetectorFetcher_onDataAvailable(
       env, java_ref_, java_url, java_scope, java_name, java_short_name,
-      java_icon_url, java_icon_murmur2_hash, java_bitmap, info.display,
-      info.orientation, info.theme_color, info.background_color);
+      java_best_icon_url, java_icon_murmur2_hash, java_bitmap, java_icon_urls,
+      info.display, info.orientation, info.theme_color, info.background_color);
 }