Update WebApkInstaller to support badge icon in installation.

chrome/browser/android/banners/app_banner_infobar_delegate_android.cc

Index: chrome/browser/android/banners/app_banner_infobar_delegate_android.cc
diff --git a/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc b/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc
index b2a9533d0e6d2cde5cce3171c9ac8b0284e4efd7..1854d82438a56dca438e7d694217cb906f8999ed 100644
--- a/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc
+++ b/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc
@@ -52,7 +52,8 @@ bool AppBannerInfoBarDelegateAndroid::Create(
     base::WeakPtr<AppBannerManager> weak_manager,
     const base::string16& app_title,
     std::unique_ptr<ShortcutInfo> shortcut_info,
-    std::unique_ptr<SkBitmap> icon,
+    std::unique_ptr<SkBitmap> primary_icon,
+    std::unique_ptr<SkBitmap> badge_icon,
     int event_request_id,
     webapk::InstallSource webapk_install_source) {
   bool is_webapk = ChromeWebApkHost::CanInstallWebApk();
@@ -63,9 +64,9 @@ bool AppBannerInfoBarDelegateAndroid::Create(
   bool is_webapk_already_installed = !webapk_package_name.empty();
   auto infobar_delegate =
       base::WrapUnique(new banners::AppBannerInfoBarDelegateAndroid(
-          weak_manager, app_title, std::move(shortcut_info), std::move(icon),
-          event_request_id, is_webapk, is_webapk_already_installed,
-          webapk_install_source));
+          weak_manager, app_title, std::move(shortcut_info),
+          std::move(primary_icon), std::move(badge_icon), event_request_id,
+          is_webapk, is_webapk_already_installed, webapk_install_source));
   auto raw_delegate = infobar_delegate.get();
   auto infobar = base::MakeUnique<AppBannerInfoBarAndroid>(
       std::move(infobar_delegate), url, is_webapk);
@@ -217,7 +218,8 @@ AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     base::WeakPtr<AppBannerManager> weak_manager,
     const base::string16& app_title,
     std::unique_ptr<ShortcutInfo> shortcut_info,
-    std::unique_ptr<SkBitmap> icon,
+    std::unique_ptr<SkBitmap> primary_icon,
+    std::unique_ptr<SkBitmap> badge_icon,
     int event_request_id,
     bool is_webapk,
     bool is_webapk_already_installed,
@@ -225,7 +227,8 @@ AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     : weak_manager_(weak_manager),
       app_title_(app_title),
       shortcut_info_(std::move(shortcut_info)),
-      icon_(std::move(icon)),
+      primary_icon_(std::move(primary_icon)),
+      badge_icon_(std::move(badge_icon)),
       event_request_id_(event_request_id),
       has_user_interaction_(false),
       is_webapk_(is_webapk),
@@ -246,7 +249,7 @@ AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     int event_request_id)
     : app_title_(app_title),
       native_app_data_(native_app_data),
-      icon_(std::move(icon)),
+      primary_icon_(std::move(icon)),
       native_app_package_(native_app_package),
       referrer_(referrer),
       event_request_id_(event_request_id),
@@ -299,7 +302,8 @@ bool AppBannerInfoBarDelegateAndroid::AcceptWebApp(
     const std::string& uid = base::GenerateGUID();
     ShortcutHelper::AddToLauncherWithSkBitmap(
         web_contents->GetBrowserContext(), *shortcut_info_, uid,
-        *icon_.get(), weak_manager_->FetchWebappSplashScreenImageCallback(uid));
+        *primary_icon_.get(),
+        weak_manager_->FetchWebappSplashScreenImageCallback(uid));
   }
 
   SendBannerAccepted();
@@ -354,9 +358,9 @@ bool AppBannerInfoBarDelegateAndroid::AcceptWebApk(
   WebApkInstaller::FinishCallback callback =
       base::Bind(&AppBannerInfoBarDelegateAndroid::OnWebApkInstallFinished,
                   weak_ptr_factory_.GetWeakPtr());
-  ShortcutHelper::InstallWebApkWithSkBitmap(web_contents->GetBrowserContext(),
-                                            *shortcut_info_,
-                                            *icon_.get(), callback);
+  ShortcutHelper::InstallWebApkWithSkBitmap(
+      web_contents->GetBrowserContext(), *shortcut_info_, *primary_icon_.get(),
+      *badge_icon_.get(), callback);
   SendBannerAccepted();
 
   // Prevent the infobar from disappearing, because the infobar will show
@@ -419,7 +423,7 @@ AppBannerInfoBarDelegateAndroid::GetIdentifier() const {
 }
 
 gfx::Image AppBannerInfoBarDelegateAndroid::GetIcon() const {
-  return gfx::Image::CreateFrom1xBitmap(*icon_.get());
+  return gfx::Image::CreateFrom1xBitmap(*primary_icon_.get());
 }
 
 void AppBannerInfoBarDelegateAndroid::InfoBarDismissed() {