Add a flag in WebAPK's proto when the Web App Manifest is no longer available.

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 c6da1e2d654d581c1326e089726fe6cccd81b047..2850b2574867813312ab2dcf5114d9aa76137424 100644
--- a/chrome/browser/android/webapk/webapk_update_manager.cc
+++ b/chrome/browser/android/webapk/webapk_update_manager.cc
@@ -53,16 +53,17 @@ static void UpdateAsync(
     const JavaParamRef<jstring>& java_name,
     const JavaParamRef<jstring>& java_short_name,
     const JavaParamRef<jstring>& java_best_icon_url,
-    const JavaParamRef<jstring>& java_best_icon_murmur2_hash,
     const JavaParamRef<jobject>& java_best_icon_bitmap,
     const JavaParamRef<jobjectArray>& java_icon_urls,
+    const JavaParamRef<jobjectArray>& java_icon_hashes,
     jint java_display_mode,
     jint java_orientation,
     jlong java_theme_color,
     jlong java_background_color,
     const JavaParamRef<jstring>& java_web_manifest_url,
     const JavaParamRef<jstring>& java_webapk_package,
-    jint java_webapk_version) {
+    jint java_webapk_version,
+    jboolean java_stale_manifest) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
@@ -91,15 +92,21 @@ static void UpdateAsync(
   base::android::JavaArrayOfByteArrayToStringVector(
       env, java_icon_urls.obj(), &info.icon_urls);
 
+  std::vector<std::string> icon_hashes;
+  base::android::AppendJavaStringArrayToStringVector(
+      env, java_icon_hashes.obj(), &icon_hashes);
+
+  std::map<std::string, std::string> icon_url_hash_map;

[pkotwicz, 2016/12/07 20:41:30]

Nit: Name this |icon_url_to_murmur2_hash_map| to match WebApkInfo.java

[Xi Han, 2016/12/09 18:40:12]

Done.

+  for (size_t i = 0; i < info.icon_urls.size(); ++i) {
+    std::string icon_hash = i < icon_hashes.size() ? icon_hashes[i] : "";

[pkotwicz, 2016/12/07 20:41:30]

I think that it is unnecessary to handle the case of |icon_hashes| and
|icon_urls| having a different length. This function is closesly coupled to
Java's WebApkUpdateManager#updateAsync()

[Xi Han, 2016/12/09 18:40:11]

Done.

+    icon_url_hash_map[info.icon_urls[i]] = icon_hash;
+  }
+
   gfx::JavaBitmap java_bitmap_lock(java_best_icon_bitmap);
   SkBitmap best_icon_bitmap =
       gfx::CreateSkBitmapFromJavaBitmap(java_bitmap_lock);
   best_icon_bitmap.setImmutable();
 
-  std::string best_icon_murmur2_hash;
-  ConvertJavaStringToUTF8(env, java_best_icon_murmur2_hash,
-                          &best_icon_murmur2_hash);
-
   std::string webapk_package;
   ConvertJavaStringToUTF8(env, java_webapk_package, &webapk_package);
 
@@ -107,5 +114,6 @@ static void UpdateAsync(
   installer->UpdateAsync(
       profile,
       base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id),
-      best_icon_murmur2_hash, webapk_package, java_webapk_version);
+      webapk_package, java_webapk_version, java_stale_manifest,
+      icon_url_hash_map);
 }