Break apart shortcut icon generation

chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
index 32b3a817532588582e14efa2203746466b2dae50..f5708d5fe867350a96d5ed35c820c865f7273b40 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
@@ -155,12 +155,13 @@ public class ShortcutHelper {
             shortcutIntent.putExtra(EXTRA_MAC, getEncodedMac(context, url));
         } else {
             // Add the shortcut as a launcher icon to open in the browser Activity.
-            shortcutIntent = BookmarkUtils.createShortcutIntent(context, url);
+            shortcutIntent = BookmarkUtils.createShortcutIntent(url);
         }
 
         shortcutIntent.setPackage(context.getPackageName());
-        context.sendBroadcast(BookmarkUtils.createAddToHomeIntent(context, shortcutIntent, title,
-                icon, url, red, green, blue));
+        Bitmap launchIcon = BookmarkUtils.createLauncherIcon(context, icon, url, red, green, blue);
+        context.sendBroadcast(BookmarkUtils.createAddToHomeIntent(shortcutIntent, title,
+                launchIcon, url));
 
         // Alert the user about adding the shortcut.
         if (returnToHomescreen) {