[WebAPKs] Display same text for menu & engagement banner

chrome/browser/android/shortcut_helper.cc

Index: chrome/browser/android/shortcut_helper.cc
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index dba05a2f04b77390f9e53cdd6d6afbe3e224905d..5634add190134ccdce3a5cc5adb457f7b4c7c4fe 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -13,7 +13,6 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/guid.h"
-#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/android/webapk/chrome_webapk_host.h"
@@ -73,18 +72,19 @@ void GetHomescreenIconAndSplashImageSizes() {
 // exist before the splash image can be stored.
 void AddWebappWithSkBitmap(const ShortcutInfo& info,
                            const std::string& webapp_id,
+                           const base::string16& user_title,
                            const SkBitmap& icon_bitmap,
                            const base::Closure& splash_image_callback) {
   // Send the data to the Java side to create the shortcut.
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
       base::android::ConvertUTF8ToJavaString(env, webapp_id);
+  ScopedJavaLocalRef<jstring> java_user_title =
+      base::android::ConvertUTF16ToJavaString(env, user_title);
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_scope_url =
       base::android::ConvertUTF8ToJavaString(env, info.scope.spec());
-  ScopedJavaLocalRef<jstring> java_user_title =
-      base::android::ConvertUTF16ToJavaString(env, info.user_title);
   ScopedJavaLocalRef<jstring> java_name =
       base::android::ConvertUTF16ToJavaString(env, info.name);
   ScopedJavaLocalRef<jstring> java_short_name =
@@ -113,14 +113,15 @@ void AddWebappWithSkBitmap(const ShortcutInfo& info,
 // Adds a shortcut which opens in a browser tab to the launcher.
 void AddShortcutWithSkBitmap(const ShortcutInfo& info,
                              const std::string& id,
+                             const base::string16& user_title,
                              const SkBitmap& icon_bitmap) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_id =
       base::android::ConvertUTF8ToJavaString(env, id);
+  ScopedJavaLocalRef<jstring> java_user_title =
+      base::android::ConvertUTF16ToJavaString(env, user_title);
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
-  ScopedJavaLocalRef<jstring> java_user_title =
-      base::android::ConvertUTF16ToJavaString(env, info.user_title);
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (!icon_bitmap.drawsNothing())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
@@ -135,12 +136,13 @@ void AddShortcutWithSkBitmap(const ShortcutInfo& info,
 void ShortcutHelper::AddToLauncherWithSkBitmap(
     content::WebContents* web_contents,
     const ShortcutInfo& info,
+    const base::string16& user_title,
     const SkBitmap& icon_bitmap) {
   std::string webapp_id = base::GenerateGUID();
   if (info.display == blink::kWebDisplayModeStandalone ||
       info.display == blink::kWebDisplayModeFullscreen) {
     AddWebappWithSkBitmap(
-        info, webapp_id, icon_bitmap,
+        info, webapp_id, user_title, icon_bitmap,
         base::Bind(&ShortcutHelper::FetchSplashScreenImage, web_contents,
                    info.splash_image_url, info.ideal_splash_image_size_in_px,
                    info.minimum_splash_image_size_in_px, webapp_id));
@@ -150,7 +152,7 @@ void ShortcutHelper::AddToLauncherWithSkBitmap(
       webapk::TrackGooglePlayInstallState(state);
     return;
   }
-  AddShortcutWithSkBitmap(info, webapp_id, icon_bitmap);
+  AddShortcutWithSkBitmap(info, webapp_id, user_title, icon_bitmap);
 }
 
 // static