Trigger app banner when add to homescreen is pressed and WebAPKs are enabled.

chrome/browser/android/banners/app_banner_manager_android.cc

Index: chrome/browser/android/banners/app_banner_manager_android.cc
diff --git a/chrome/browser/android/banners/app_banner_manager_android.cc b/chrome/browser/android/banners/app_banner_manager_android.cc
index d7ba9c2dc61d2f8311e06b84d11a1c68bc62bbea..ab2aabaaa4476bbdcc423f30e85a00231e450667 100644
--- a/chrome/browser/android/banners/app_banner_manager_android.cc
+++ b/chrome/browser/android/banners/app_banner_manager_android.cc
@@ -15,14 +15,13 @@
 #include "chrome/browser/android/webapk/chrome_webapk_host.h"
 #include "chrome/browser/android/webapk/webapk_web_manifest_checker.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
-#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/browser/manifest/manifest_icon_selector.h"
-#include "chrome/browser/ui/android/infobars/app_banner_infobar_android.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "jni/AppBannerManager_jni.h"
+#include "net/base/url_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using base::android::ConvertJavaStringToUTF8;
@@ -35,11 +34,24 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(banners::AppBannerManagerAndroid);
 
 namespace {
 
-const char kPlayPlatform[] = "play";
 const char kReferrerName[] = "referrer";
 const char kIdName[] = "id";
 const char kPlayInlineReferrer[] = "playinline=chrome_inline";
 
+std::unique_ptr<ShortcutInfo> CreateShortcutInfo(
+    const GURL& manifest_url,
+    const content::Manifest& manifest,
+    const GURL& icon_url) {
+  auto shortcut_info = base::MakeUnique<ShortcutInfo>(GURL());
+  if (!manifest.IsEmpty()) {
+    shortcut_info->UpdateFromManifest(manifest);
+    shortcut_info->manifest_url = manifest_url;
+    shortcut_info->icon_url = icon_url;
+    shortcut_info->UpdateSource(ShortcutInfo::SOURCE_APP_BANNER);
+  }
+  return shortcut_info;
+}
+
 }  // anonymous namespace
 
 namespace banners {
@@ -185,17 +197,13 @@ void AppBannerManagerAndroid::ShowBanner() {
   content::WebContents* contents = web_contents();
   DCHECK(contents);
 
-  infobars::InfoBar* infobar = nullptr;
   if (native_app_data_.is_null()) {
-    bool is_webapk = ChromeWebApkHost::AreWebApkEnabled();
-    std::unique_ptr<AppBannerInfoBarDelegateAndroid> delegate(
-        new AppBannerInfoBarDelegateAndroid(
-            GetWeakPtr(), app_title_, manifest_url_, manifest_, icon_url_,
-            std::move(icon_), event_request_id(), is_webapk));
-
-    infobar = new AppBannerInfoBarAndroid(
-        std::move(delegate), manifest_.start_url, is_webapk);
-    if (infobar) {
+    if (AppBannerInfoBarDelegateAndroid::Create(
+            contents, GetWeakPtr(), app_title_,
+            CreateShortcutInfo(manifest_url_, manifest_, icon_url_),
+            std::move(icon_), event_request_id(),
+            ChromeWebApkHost::AreWebApkEnabled(),
+            false /* start_install_webapk */)) {
       RecordDidShowBanner("AppBanner.WebApp.Shown");
       TrackDisplayEvent(DISPLAY_EVENT_WEB_APP_BANNER_CREATED);
       ReportStatus(contents, SHOWING_WEB_APP_BANNER);
@@ -203,13 +211,9 @@ void AppBannerManagerAndroid::ShowBanner() {
       ReportStatus(contents, FAILED_TO_CREATE_BANNER);
     }
   } else {
-    std::unique_ptr<AppBannerInfoBarDelegateAndroid> delegate(
-        new AppBannerInfoBarDelegateAndroid(
-            app_title_, native_app_data_, std::move(icon_), native_app_package_,
-            referrer_, event_request_id()));
-    infobar =
-        new AppBannerInfoBarAndroid(std::move(delegate), native_app_data_);
-    if (infobar) {
+    if (AppBannerInfoBarDelegateAndroid::Create(
+            contents, app_title_, native_app_data_, std::move(icon_),
+            native_app_package_, referrer_, event_request_id())) {
       RecordDidShowBanner("AppBanner.NativeApp.Shown");
       TrackDisplayEvent(DISPLAY_EVENT_NATIVE_APP_BANNER_CREATED);
       ReportStatus(contents, SHOWING_NATIVE_APP_BANNER);
@@ -217,11 +221,6 @@ void AppBannerManagerAndroid::ShowBanner() {
       ReportStatus(contents, FAILED_TO_CREATE_BANNER);
     }
   }
-
-  if (infobar) {
-    InfoBarService::FromWebContents(contents)->AddInfoBar(
-        base::WrapUnique(infobar));
-  }
 }
 
 bool AppBannerManagerAndroid::CanHandleNonWebApp(const std::string& platform,
@@ -270,31 +269,23 @@ void AppBannerManagerAndroid::CreateJavaBannerManager() {
 
 bool AppBannerManagerAndroid::CheckPlatformAndId(const std::string& platform,
                                                  const std::string& id) {
-  if (platform != kPlayPlatform) {
-    ReportStatus(web_contents(), PLATFORM_NOT_SUPPORTED_ON_ANDROID);
-    return false;
-  }
-  if (id.empty()) {
-    ReportStatus(web_contents(), NO_ID_SPECIFIED);
-    return false;
-  }
-  return true;
+  const bool correct_platform = (platform == "play");
+  if (correct_platform && !id.empty())
+    return true;
+  ReportStatus(web_contents(),
+               correct_platform ? NO_ID_SPECIFIED
+                                : PLATFORM_NOT_SUPPORTED_ON_ANDROID);
+  return false;
 }
 
 std::string AppBannerManagerAndroid::ExtractQueryValueForName(
     const GURL& url,
     const std::string& name) {
-  url::Component query = url.parsed_for_possibly_invalid_spec().query;
-  url::Component key, value;
-  const char* url_spec = url.spec().c_str();
-
-  while (url::ExtractQueryKeyValue(url_spec, &query, &key, &value)) {
-    std::string key_str(url_spec, key.begin, key.len);
-    std::string value_str(url_spec, value.begin, value.len);
-    if (key_str == name)
-      return value_str;
+  for (net::QueryIterator it(url); !it.IsAtEnd(); it.Advance()) {
+    if (it.GetKey() == name)
+      return it.GetValue();
   }
-  return "";
+  return std::string();
 }
 
 // static
@@ -309,10 +300,8 @@ ScopedJavaLocalRef<jobject> GetJavaBannerManagerForWebContents(
     const JavaParamRef<jobject>& java_web_contents) {
   AppBannerManagerAndroid* manager = AppBannerManagerAndroid::FromWebContents(
       content::WebContents::FromJavaWebContents(java_web_contents));
-  if (!manager)
-    return ScopedJavaLocalRef<jobject>();
-
-  return ScopedJavaLocalRef<jobject>(manager->GetJavaBannerManager());
+  return manager? ScopedJavaLocalRef<jobject>(manager->GetJavaBannerManager())
+                : ScopedJavaLocalRef<jobject>();
 }
 
 // static