Refactor the INSTALL_SHORTCUT broadcast code into ChromeShortcutManager

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 dfa0aefcbf07c44b81ebd844a50b1375cc0d9683..6306eb974175ec99b7fb38e71af8530acded0023 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -78,7 +78,7 @@ void ShortcutHelper::AddToLauncherWithSkBitmap(
     AddWebappWithSkBitmap(info, webapp_id, icon_bitmap, splash_image_callback);
     return;
   }
-  AddShortcutWithSkBitmap(info, icon_bitmap);
+  AddShortcutWithSkBitmap(info, webapp_id, icon_bitmap);
 }
 
 // static
@@ -133,8 +133,11 @@ void ShortcutHelper::AddWebappWithSkBitmap(
 }
 
 void ShortcutHelper::AddShortcutWithSkBitmap(const ShortcutInfo& info,
+                                             const std::string& id,
                                              const SkBitmap& icon_bitmap) {
   JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jstring> java_id =
+      base::android::ConvertUTF8ToJavaString(env, id);
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_user_title =
@@ -143,8 +146,8 @@ void ShortcutHelper::AddShortcutWithSkBitmap(const ShortcutInfo& info,
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
 
-  Java_ShortcutHelper_addShortcut(env, java_url, java_user_title, java_bitmap,
-                                  info.source);
+  Java_ShortcutHelper_addShortcut(env, java_id, java_url, java_user_title,
+                                  java_bitmap, info.source);
 }
 
 void ShortcutHelper::ShowWebApkInstallInProgressToast() {