Use PermissionType instead of ContentSettingsType in Android permission infobars

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

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java
index 1b869b8fe8c7c5b1f4a76cd23b3a7e2f74d90613..811c28a1c5f2138e91a699ee31208b484e84a146 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java
@@ -20,19 +20,19 @@ import java.util.ArrayList;
 public class GroupedPermissionInfoBar extends PermissionInfoBar {
     private final int[] mPermissionIcons;
     private final String[] mPermissionText;
-    private final int[] mContentSettings;
+    private final int[] mPermissions;

[raymes, 2016/10/17 01:11:12]

nit: mPermissionTypes (here and below)

     private long mNativeGroupedPermissionInfoBar;
 
     private WindowAndroid mWindowAndroid;
 
     GroupedPermissionInfoBar(String message, String buttonOk, String buttonCancel,
             int[] permissionIcons, String[] permissionText, WindowAndroid windowAndroid,
-            int[] contentSettings, boolean showPersistenceToggle) {
+            int[] permissions, boolean showPersistenceToggle) {
         super(0, null, message, null, buttonOk, buttonCancel, showPersistenceToggle);
         mPermissionIcons = permissionIcons;
         mPermissionText = permissionText;
         mWindowAndroid = windowAndroid;
-        mContentSettings = contentSettings;
+        mPermissions = permissions;
     }
 
     @Override
@@ -73,20 +73,20 @@ public class GroupedPermissionInfoBar extends PermissionInfoBar {
 
             // Only call setContentSettings with the permissions which were actually allowed by the
             // user.
-            ArrayList<Integer> selectedContentSettings = new ArrayList<Integer>();
+            ArrayList<Integer> selectedPermissions = new ArrayList<Integer>();
             for (int i = 0; i < toggleStatus.length; i++) {
                 if (toggleStatus[i]) {
-                    selectedContentSettings.add(Integer.valueOf(mContentSettings[i]));
+                    selectedPermissions.add(Integer.valueOf(mPermissions[i]));
                 }
             }
-            int[] selectedArray = new int[selectedContentSettings.size()];
-            for (int i = 0; i < selectedContentSettings.size(); i++) {
-                selectedArray[i] = selectedContentSettings.get(i).intValue();
+            int[] selectedArray = new int[selectedPermissions.size()];
+            for (int i = 0; i < selectedPermissions.size(); i++) {
+                selectedArray[i] = selectedPermissions.get(i).intValue();
             }
 
             if (mNativeGroupedPermissionInfoBar != 0) {
                 nativeSetPermissionState(mNativeGroupedPermissionInfoBar, toggleStatus);
-                setContentSettings(mWindowAndroid, selectedArray);
+                setPermissions(mWindowAndroid, selectedArray);
             }
         }
         super.onButtonClicked(isPrimaryButton);
@@ -107,17 +107,17 @@ public class GroupedPermissionInfoBar extends PermissionInfoBar {
      *                        permission.
      * @param permissionText String to display for each permission request.
      * @param windowAndroid The window which owns the infobar.
-     * @param contentSettings The list of ContentSettingsTypes requested by the infobar.
+     * @param permissions The list of PermissionTypes requested by the infobar.
      * @param showPersistenceToggle Whether or not a toggle to opt-out of persisting a decision
      *                              should be displayed.
      */
     @CalledByNative
     private static InfoBar create(String message, String buttonOk, String buttonCancel,
             int[] permissionIcons, String[] permissionText, WindowAndroid windowAndroid,
-            int[] contentSettings, boolean showPersistenceToggle) {
+            int[] permissions, boolean showPersistenceToggle) {
         GroupedPermissionInfoBar infobar =
                 new GroupedPermissionInfoBar(message, buttonOk, buttonCancel, permissionIcons,
-                        permissionText, windowAndroid, contentSettings, showPersistenceToggle);
+                        permissionText, windowAndroid, permissions, showPersistenceToggle);
         return infobar;
     }