Revert of 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 06b96190c33b04f15504340f35089695ba46e35b..1762e30aa0cd1cd0fde8421b8555a188e207ee33 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
@@ -42,11 +42,10 @@
     private SparseArray<String> mContentSettingsToPermissionsMap;
 
     protected PermissionInfoBar(int iconDrawableId, Bitmap iconBitmap, String message,
-            String linkText, String primaryButtonText, String secondaryButtonText,
-            boolean showPersistenceToggle) {
+            String linkText, String primaryButtonText, String secondaryButtonText) {
         super(iconDrawableId, iconBitmap, message, linkText, primaryButtonText,
                 secondaryButtonText);
-        mShowPersistenceToggle = showPersistenceToggle;
+        mShowPersistenceToggle = false;
     }
 
     @Override
@@ -82,6 +81,16 @@
                 : "A WindowAndroid must be specified to request access to content settings";
 
         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 SparseArray<String> generatePermissionsMapping(int[] contentSettings) {
@@ -201,7 +210,7 @@
      * Returns true if the persist switch exists and is toggled on.
      */
     @CalledByNative
-    protected boolean isPersistSwitchOn() {
+    private boolean isPersistSwitchOn() {
         SwitchCompat persistSwitch = (SwitchCompat) getView().findViewById(
                 R.id.permission_infobar_persist_toggle);
         if (mShowPersistenceToggle && persistSwitch != null) {
@@ -233,8 +242,9 @@
         int drawableId = ResourceId.mapToDrawableId(enumeratedIconId);
 
         PermissionInfoBar infoBar = new PermissionInfoBar(drawableId, iconBitmap, message, linkText,
-                buttonOk, buttonCancel, showPersistenceToggle);
+                buttonOk, buttonCancel);
         infoBar.setContentSettings(windowAndroid, contentSettings);
+        infoBar.setShowPersistenceToggle(showPersistenceToggle);
 
         return infoBar;
     }