Support badge icon in WebAPK update components

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 31 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_primary_icon_url,
-    const JavaParamRef<jobject>& java_best_primary_icon_bitmap,
+    const JavaParamRef<jstring>& java_primary_icon_url,
+    const JavaParamRef<jobject>& java_primary_icon_bitmap,
+    const JavaParamRef<jstring>& java_badge_icon_url,
+    const JavaParamRef<jobject>& java_badge_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,
     jboolean java_is_manifest_stale) {
   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_primary_icon_url(
-      ConvertJavaStringToUTF8(env, java_best_primary_icon_url));
-  ShortcutInfo info(start_url);
-  info.scope = scope;
+  ShortcutInfo info(GURL(ConvertJavaStringToUTF8(env, java_start_url)));
+  info.scope = GURL(ConvertJavaStringToUTF8(env, java_scope));
   info.name = ConvertJavaStringToUTF16(env, java_name);
   info.short_name = ConvertJavaStringToUTF16(env, java_short_name);
   info.user_title = info.short_name;
   info.display = static_cast<blink::WebDisplayMode>(java_display_mode);
   info.orientation =
       static_cast<blink::WebScreenOrientationLockType>(java_orientation);
   info.theme_color = (int64_t)java_theme_color;
   info.background_color = (int64_t)java_background_color;
-  info.best_primary_icon_url = best_primary_icon_url;
-  info.manifest_url = web_manifest_url;
+  info.best_primary_icon_url =
+      GURL(ConvertJavaStringToUTF8(env, java_primary_icon_url));
+  info.best_badge_icon_url =
+      GURL(ConvertJavaStringToUTF8(env, java_badge_icon_url));
+  info.manifest_url = GURL(ConvertJavaStringToUTF8(env, java_web_manifest_url));
 
   base::android::AppendJavaStringArrayToStringVector(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_to_murmur2_hash;
   for (size_t i = 0; i < info.icon_urls.size(); ++i)
     icon_url_to_murmur2_hash[info.icon_urls[i]] = icon_hashes[i];
 
-  gfx::JavaBitmap java_bitmap_lock(java_best_primary_icon_bitmap);
-  SkBitmap best_primary_icon_bitmap =
-      gfx::CreateSkBitmapFromJavaBitmap(java_bitmap_lock);
-  best_primary_icon_bitmap.setImmutable();
+  gfx::JavaBitmap java_primary_icon_bitmap_lock(java_primary_icon_bitmap);
+  SkBitmap primary_icon =
+      gfx::CreateSkBitmapFromJavaBitmap(java_primary_icon_bitmap_lock);
+  primary_icon.setImmutable();
+
+  gfx::JavaBitmap java_badge_icon_bitmap_lock(java_badge_icon_bitmap);
+  SkBitmap badge_icon =
+      gfx::CreateSkBitmapFromJavaBitmap(java_badge_icon_bitmap_lock);
+  badge_icon.setImmutable();
 
   std::string webapk_package;
   ConvertJavaStringToUTF8(env, java_webapk_package, &webapk_package);
 
   WebApkInstallService* install_service = WebApkInstallService::Get(profile);
   if (install_service->IsInstallInProgress(info.manifest_url)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id,
                    WebApkInstallResult::FAILURE, false /* relax_updates */,
                    "" /* webapk_package */));
     return;
   }
   install_service->UpdateAsync(
-      info, best_primary_icon_bitmap, webapk_package, java_webapk_version,
+      info, primary_icon, badge_icon, webapk_package, java_webapk_version,
       icon_url_to_murmur2_hash, java_is_manifest_stale,
       base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id));
 }