Enable the optional permission prompt persistence toggle on grouped infobars

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

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java
index c434effdfff91ef47813fbf5c7eb40e63ba300b6..3cdbc37212a9ec522b49bf715d8b7b13583fe901 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java
@@ -43,10 +43,11 @@ public class PermissionInfoBar extends ConfirmInfoBar {
     private SparseArray<String> mContentSettingsToPermissionsMap;
 
     protected PermissionInfoBar(int iconDrawableId, Bitmap iconBitmap, String message,
-            String linkText, String primaryButtonText, String secondaryButtonText) {
+            String linkText, String primaryButtonText, String secondaryButtonText,
+            boolean showPersistenceToggle) {
         super(iconDrawableId, iconBitmap, message, linkText, primaryButtonText,
                 secondaryButtonText);
-        mShowPersistenceToggle = false;
+        mShowPersistenceToggle = showPersistenceToggle;
     }
 
     @Override
@@ -79,16 +80,6 @@ public class PermissionInfoBar extends ConfirmInfoBar {
         mContentSettingsToPermissionsMap = generatePermissionsMapping(contentSettings);
     }
 
-    /**
-     * Specifies whether or not this infobar should display a toggle asking the user if they want to
-     * save their choice.
-     *
-     * @param showPersistenceToggle True if the toggle should be displayed.
-     */
-    private void setShowPersistenceToggle(boolean showPersistenceToggle) {
-        mShowPersistenceToggle = showPersistenceToggle;
-    }
-
     private static boolean hasPermission(Context context, String permission) {
         return context.checkPermission(permission, Process.myPid(), Process.myUid())
                 != PackageManager.PERMISSION_DENIED;
@@ -214,7 +205,7 @@ public class PermissionInfoBar extends ConfirmInfoBar {
      * Returns true if the persist switch exists and is toggled on.
      */
     @CalledByNative
-    private boolean isPersistSwitchOn() {
+    protected boolean isPersistSwitchOn() {
         SwitchCompat persistSwitch = (SwitchCompat) getView().findViewById(
                 R.id.permission_infobar_persist_toggle);
         if (mShowPersistenceToggle && persistSwitch != null) {
@@ -246,9 +237,8 @@ public class PermissionInfoBar extends ConfirmInfoBar {
         int drawableId = ResourceId.mapToDrawableId(enumeratedIconId);
 
         PermissionInfoBar infoBar = new PermissionInfoBar(drawableId, iconBitmap, message, linkText,
-                buttonOk, buttonCancel);
+                buttonOk, buttonCancel, showPersistenceToggle);
         infoBar.setContentSettings(windowAndroid, contentSettings);
-        infoBar.setShowPersistenceToggle(showPersistenceToggle);
 
         return infoBar;
     }