Add initial support for runtime permissions in android M.

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 601eb6c023e8f3072926076504509f5e90202b73..5f7b1379d3068c7a3b147d3052823d78d07052b7 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
@@ -8,6 +8,7 @@ import android.graphics.Bitmap;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.chrome.browser.ResourceId;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Provides JNI methods for ConfirmInfoBars
@@ -25,22 +26,27 @@ public class ConfirmInfoBarDelegate {
     /**
      * Creates and begins the process for showing a ConfirmInfoBar.
      * @param nativeInfoBar Pointer to the C++ InfoBar corresponding to the Java InfoBar.
+     * @param windowAndroid The owning window for the infobar.
      * @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 iconBitmap 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.
+     * @param contentSettings The list of ContentSettingTypes being requested by this infobar.
      */
     @CalledByNative
-    InfoBar showConfirmInfoBar(long nativeInfoBar, int enumeratedIconId, Bitmap iconBitmap,
-            String message, String linkText, String buttonOk, String buttonCancel) {
+    InfoBar showConfirmInfoBar(long nativeInfoBar, WindowAndroid windowAndroid,
+            int enumeratedIconId, Bitmap iconBitmap, String message, String linkText,
+            String buttonOk, String buttonCancel, int[] contentSettings) {
         int drawableId = ResourceId.mapToDrawableId(enumeratedIconId);
 
-        ConfirmInfoBar infoBar = new ConfirmInfoBar(nativeInfoBar, null, drawableId, iconBitmap,
-                message, linkText, buttonOk, buttonCancel);
+        ConfirmInfoBar infoBar = new ConfirmInfoBar(
+                nativeInfoBar, null, windowAndroid, drawableId, iconBitmap,
+                message, linkText, buttonOk, buttonCancel, contentSettings);
         return infoBar;
     }
 }