Revert of Enable the optional permission prompt persistence toggle on grouped infobars

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.infobar;
 
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
@@ skipping 23 matching lines @@
     private WindowAndroid mWindowAndroid;
 
     /**
      * Mapping between the required {@link ContentSettingsType}s and their associated Android
      * runtime permissions.  Only {@link ContentSettingsType}s that are associated with runtime
      * permissions will be included in this list while all others will be excluded.
      */
     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
     public void createContent(InfoBarLayout layout) {
         super.createContent(layout);
 
         if (mShowPersistenceToggle) {
             InfoBarControlLayout controlLayout = layout.addControlLayout();
             String description =
                     layout.getContext().getString(R.string.permission_infobar_persist_text);
@@ skipping 12 matching lines @@
      */
     protected void setContentSettings(
             WindowAndroid windowAndroid, int[] contentSettings) {
         mWindowAndroid = windowAndroid;
         assert windowAndroid != null
                 : "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) {
         SparseArray<String> permissionsToRequest = new SparseArray<String>();
         for (int i = 0; i < contentSettings.length; i++) {
             String permission = PrefServiceBridge.getAndroidPermissionForContentSetting(
                     contentSettings[i]);
             if (permission != null && !mWindowAndroid.hasPermission(permission)) {
                 permissionsToRequest.append(contentSettings[i], permission);
             }
         }
         return permissionsToRequest;
@@ skipping 97 matching lines @@
     }
 
     private void onButtonClickedInternal(boolean isPrimaryButton) {
         super.onButtonClicked(isPrimaryButton);
     }
 
     /**
      * 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) {
             return persistSwitch.isChecked();
         }
         return false;
     }
 
     /**
      * Creates and begins the process for showing a PermissionInfoBar.
@@ skipping 11 matching lines @@
      * @param showPersistenceToggle Whether or not a toggle to opt-out of persisting a decision
      *                              should be displayed.
      */
     @CalledByNative
     private static PermissionInfoBar create(WindowAndroid windowAndroid, int enumeratedIconId,
             Bitmap iconBitmap, String message, String linkText, String buttonOk,
             String buttonCancel, int[] contentSettings, boolean showPersistenceToggle) {
         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;
     }
 }