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

chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc

 // 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.
 
 #include "chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.h"
 
 #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"
 #include "chrome/browser/android/webapk/webapk_web_manifest_checker.h"
 #include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/manifest.h"
 #include "jni/ManifestUpgradeDetectorFetcher_jni.h"
 #include "third_party/smhasher/src/MurmurHash2.h"
@@ skipping 117 matching lines @@
 
   // TODO(pkotwicz): Tell Java side that the Web Manifest was fetched but the
   // Web Manifest is not WebAPK-compatible. (http://crbug.com/639536)
   if (data.error_code != NO_ERROR_DETECTED ||
       !AreWebManifestUrlsWebApkCompatible(data.manifest)) {
     return;
   }
 
   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());
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   icon_hasher_->DownloadAndComputeMurmur2Hash(
       profile->GetRequestContext(),
       data.icon_url,
       base::Bind(&ManifestUpgradeDetectorFetcher::OnGotIconMurmur2Hash,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ManifestUpgradeDetectorFetcher::OnGotIconMurmur2Hash(
     const std::string& icon_murmur2_hash) {

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

Nit: Rename |icon_murmur2_hash| to |best_icon_murmur2_hash|

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

Done.

   icon_hasher_.reset();
 
   if (icon_murmur2_hash.empty()) {
     // TODO(pkotwicz): Tell Java side that the Web Manifest was fetched but the
     // Web Manifest is not WebAPK-compatible. (http://crbug.com/639536)
     return;
   }
 
   OnDataAvailable(info_, icon_murmur2_hash, icon_);

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

Nit: |icon_| -> |best_icon_|

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

Done.

 }
 
 void ManifestUpgradeDetectorFetcher::OnDataAvailable(
     const ShortcutInfo& info,
     const std::string& icon_murmur2_hash,
     const SkBitmap& icon_bitmap) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_scope =
       base::android::ConvertUTF8ToJavaString(env, info.scope.spec());
   ScopedJavaLocalRef<jstring> java_name =
       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);
 }