Update WebApkInstaller to support badge icon in installation.

chrome/browser/android/webapps/add_to_homescreen_manager.cc

Index: chrome/browser/android/webapps/add_to_homescreen_manager.cc
diff --git a/chrome/browser/android/webapps/add_to_homescreen_manager.cc b/chrome/browser/android/webapps/add_to_homescreen_manager.cc
index c892d5c9afa4369403231bae137e6b3c57584bac..0bebc747ad60ccfc69bd07a52c989953ee988158 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_manager.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_manager.cc
@@ -163,14 +163,13 @@ void AddToHomescreenManager::OnDataAvailable(const ShortcutInfo& info,
                                              const SkBitmap& primary_icon,
                                              const SkBitmap& badge_icon) {
   if (is_webapk_compatible_) {
-    // TODO(zpeng): Add badge to WebAPK installation flow.
     WebApkInstallService* install_service =
         WebApkInstallService::Get(
             data_fetcher_->web_contents()->GetBrowserContext());
     if (install_service->IsInstallInProgress(info.manifest_url))
       ShortcutHelper::ShowWebApkInstallInProgressToast();
     else
-      CreateInfoBarForWebApk(info, primary_icon);
+      CreateInfoBarForWebApk(info, primary_icon, badge_icon);
 
     JNIEnv* env = base::android::AttachCurrentThread();
     Java_AddToHomescreenManager_onFinished(env, java_ref_);
@@ -188,12 +187,16 @@ void AddToHomescreenManager::OnDataAvailable(const ShortcutInfo& info,
     AddShortcut(info, primary_icon);
 }
 
-void AddToHomescreenManager::CreateInfoBarForWebApk(const ShortcutInfo& info,
-                                                    const SkBitmap& icon) {
+void AddToHomescreenManager::CreateInfoBarForWebApk(
+    const ShortcutInfo& info,
+    const SkBitmap& primary_icon,
+    const SkBitmap& badge_icon) {
   banners::AppBannerInfoBarDelegateAndroid::Create(
       data_fetcher_->web_contents(), nullptr, info.user_title,
-      base::MakeUnique<ShortcutInfo>(info), base::MakeUnique<SkBitmap>(icon),
-      -1 /* event_request_id */, webapk::INSTALL_SOURCE_MENU);
+      base::MakeUnique<ShortcutInfo>(info),
+      base::MakeUnique<SkBitmap>(primary_icon),

[pkotwicz, 2017/03/30 21:49:50]

You don't need to do base::MakeUnique<SkBitmap> for SkBitmaps. SkBitmaps are
cheeply copyable

(The Chrome codebase is written with that assumption)

[F, 2017/04/03 21:57:29]

Done.

+      base::MakeUnique<SkBitmap>(badge_icon), -1 /* event_request_id */,
+      webapk::INSTALL_SOURCE_MENU);
 }
 
 SkBitmap AddToHomescreenManager::FinalizeLauncherIconInBackground(