Use Manifest.icons instead of favicon in ShortcutHelper when possible.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ skipping 104 matching lines @@
     }
 
     /**
      * Called when we have to fire an Intent to add a shortcut to the homescreen.
      * If the webpage indicated that it was capable of functioning as a webapp, it is added as a
      * shortcut to a webapp Activity rather than as a general bookmark. User is sent to the
      * homescreen as soon as the shortcut is created.
      */
     @SuppressWarnings("unused")
     @CalledByNative
-    private static void addShortcut(Context context, String url, String title, Bitmap favicon,
+    private static void addShortcut(Context context, String url, String title, Bitmap icon,
             int red, int green, int blue, boolean isWebappCapable, int orientation) {
         assert sFullScreenAction != null;
 
         Intent shortcutIntent;
         if (isWebappCapable) {
-            // Encode the favicon as a base64 string (Launcher drops Bitmaps in the Intent).
+            // Encode the icon as a base64 string (Launcher drops Bitmaps in the Intent).
             String encodedIcon = "";
-            if (favicon != null) {
+            if (icon != null) {
                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-                favicon.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
+                icon.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
                 byte[] byteArray = byteArrayOutputStream.toByteArray();
                 encodedIcon = Base64.encodeToString(byteArray, Base64.DEFAULT);
             }
 
             // Add the shortcut as a launcher icon for a full-screen Activity.
             shortcutIntent = new Intent();
             shortcutIntent.setAction(sFullScreenAction);
             shortcutIntent.putExtra(EXTRA_ICON, encodedIcon);
             shortcutIntent.putExtra(EXTRA_ID, UUID.randomUUID().toString());
             shortcutIntent.putExtra(EXTRA_TITLE, title);
             shortcutIntent.putExtra(EXTRA_URL, url);
             shortcutIntent.putExtra(EXTRA_ORIENTATION, orientation);
 
             // The only reason we convert to a String here is because Android inexplicably eats a
             // byte[] when adding the shortcut -- the Bundle received by the launched Activity even
             // lacks the key for the extra.
             byte[] mac = WebappAuthenticator.getMacForUrl(context, url);
             String encodedMac = Base64.encodeToString(mac, Base64.DEFAULT);
             shortcutIntent.putExtra(EXTRA_MAC, encodedMac);
         } else {
             // Add the shortcut as a launcher icon to open in the browser Activity.
             shortcutIntent = BookmarkUtils.createShortcutIntent(context, url);
         }
 
         shortcutIntent.setPackage(context.getPackageName());
         context.sendBroadcast(BookmarkUtils.createAddToHomeIntent(context, shortcutIntent, title,
-                favicon, red, green, blue));
+                icon, red, green, blue));
 
         // User is sent to the homescreen as soon as the shortcut is created.
         Intent homeIntent = new Intent(Intent.ACTION_MAIN);
         homeIntent.addCategory(Intent.CATEGORY_HOME);
         homeIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(homeIntent);
     }
 
     private native long nativeInitialize(long tabAndroidPtr);
     private native void nativeAddShortcut(long nativeShortcutHelper, String userRequestedTitle,
             int launcherLargeIconSize);
     private native void nativeTearDown(long nativeShortcutHelper);
 }