Upstream: Add additional checks before creating a WebAPK after clicking "Add to Homescreen"

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 8e54002f2cdd6df1e8bb55d75de6b314b1ceb852..1a5b9a1e605f110ca56ac90dabb96fba3a982160 100644
--- a/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc
+++ b/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc
@@ -11,7 +11,6 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/shortcut_helper.h"
-#include "chrome/browser/android/shortcut_info.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/banners/app_banner_data_fetcher.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
@@ -42,12 +41,14 @@ AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     scoped_refptr<AppBannerDataFetcherAndroid> data_fetcher,
     const base::string16& app_title,
     SkBitmap* app_icon,
-    const content::Manifest& web_app_data)
+    const content::Manifest& web_app_data,
+    ShortcutInfo::Type webapp_type)
     : data_fetcher_(data_fetcher),
       app_title_(app_title),
       app_icon_(app_icon),
       event_request_id_(event_request_id),
       web_app_data_(web_app_data),
+      webapp_type_(webapp_type),
       has_user_interaction_(false) {
   DCHECK(!web_app_data.IsEmpty());
   CreateJavaDelegate();
@@ -63,6 +64,7 @@ AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     : app_title_(app_title),
       app_icon_(app_icon),
       event_request_id_(event_request_id),
+      webapp_type_(ShortcutInfo::Type::OTHER),
       native_app_data_(native_app_data),
       native_app_package_(native_app_package),
       referrer_(referrer),
@@ -250,6 +252,7 @@ bool AppBannerInfoBarDelegateAndroid::Accept() {
     ShortcutInfo info(GURL::EmptyGURL());
     info.UpdateFromManifest(web_app_data_);
     info.UpdateSource(ShortcutInfo::SOURCE_APP_BANNER);
+    info.type = webapp_type_;
 
     const std::string& uid = base::GenerateGUID();
     content::BrowserThread::PostTask(