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

chrome/browser/android/webapk/webapk_update_manager.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/webapk_update_manager.h"
 
 #include <jni.h>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 35 matching lines @@
 // static JNI method.
 static void UpdateAsync(
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz,
     const JavaParamRef<jstring>& java_id,
     const JavaParamRef<jstring>& java_start_url,
     const JavaParamRef<jstring>& java_scope,
     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();
   if (profile == nullptr) {
     NOTREACHED() << "Profile not found.";
     return;
   }
 
   std::string id(ConvertJavaStringToUTF8(env, java_id));
   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 best_icon_url(ConvertJavaStringToUTF8(env, java_best_icon_url));
   ShortcutInfo info(start_url);
   info.scope = scope;
   info.name = ConvertJavaStringToUTF16(env, java_name);
   info.short_name = ConvertJavaStringToUTF16(env, java_short_name);
   info.display = static_cast<blink::WebDisplayMode>(java_display_mode);
   info.orientation =
       static_cast<blink::WebScreenOrientationLockType>(java_orientation);
   info.theme_color = (long)java_theme_color;
   info.background_color = (long)java_background_color;
   info.best_icon_url = best_icon_url;
   info.manifest_url = web_manifest_url;
 
   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);
 
   WebApkInstaller* installer = new WebApkInstaller(info, best_icon_bitmap);
   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);
 }