Add support for passing bitmaps to Android infobars

chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java
index d99fb15aa4cb06f40713a95cbaee422b552dad72..601eb6c023e8f3072926076504509f5e90202b73 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java
@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.infobar;
 
+import android.graphics.Bitmap;
+
 import org.chromium.base.CalledByNative;
 import org.chromium.chrome.browser.ResourceId;
 
@@ -26,18 +28,19 @@ public class ConfirmInfoBarDelegate {
      * @param enumeratedIconId ID corresponding to the icon that will be shown for the InfoBar.
      *                         The ID must have been mapped using the ResourceMapper class before
      *                         passing it to this function.
+     * @param bitmap Bitmap to use if there is no equivalent Java resource for enumeratedIconId.
      * @param message Message to display to the user indicating what the InfoBar is for.
      * @param linkText Link text to display in addition to the message.
      * @param buttonOk String to display on the OK button.
      * @param buttonCancel String to display on the Cancel button.
      */
     @CalledByNative
-    InfoBar showConfirmInfoBar(long nativeInfoBar, int enumeratedIconId, String message,
-            String linkText, String buttonOk, String buttonCancel) {
+    InfoBar showConfirmInfoBar(long nativeInfoBar, int enumeratedIconId, Bitmap iconBitmap,
+            String message, String linkText, String buttonOk, String buttonCancel) {
         int drawableId = ResourceId.mapToDrawableId(enumeratedIconId);
 
-        ConfirmInfoBar infoBar = new ConfirmInfoBar(nativeInfoBar, null, drawableId, message,
-                linkText, buttonOk, buttonCancel);
+        ConfirmInfoBar infoBar = new ConfirmInfoBar(nativeInfoBar, null, drawableId, iconBitmap,
+                message, linkText, buttonOk, buttonCancel);
         return infoBar;
     }
 }