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

chrome/browser/media/media_stream_devices_controller.h

Index: chrome/browser/media/media_stream_devices_controller.h
diff --git a/chrome/browser/media/media_stream_devices_controller.h b/chrome/browser/media/media_stream_devices_controller.h
index cd6ba107b4ae9843ceca6909de68d004beb78d27..3becc1d19c7bd93ea4fe977c4a6045446f1f766e 100644
--- a/chrome/browser/media/media_stream_devices_controller.h
+++ b/chrome/browser/media/media_stream_devices_controller.h
@@ -11,7 +11,6 @@
 #include "base/macros.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "components/content_settings/core/common/content_settings.h"
-#include "content/public/browser/permission_type.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 class Profile;
@@ -42,11 +41,6 @@
   bool IsAskingForVideo() const;
   base::string16 GetMessageText() const;
 
-  // Returns the PermissionsType associated with the provided
-  // ContentSettingsType. |content_type| must be a media stream type.
-  content::PermissionType GetPermissionTypeForContentSettingsType(
-      ContentSettingsType content_type) const;
-
   // Forces the permissions to be denied (without being persisted) regardless
   // of what the previous state was.  If the user had previously allowed the
   // site video or audio access, this ignores that and informs the site it was
@@ -62,9 +56,6 @@
   // TODO(tsergeant): Remove this by refactoring Android to use
   // PermissionRequest instead of a custom infobar delegate.
   void GroupedRequestFinished(bool audio_accepted, bool video_accepted);
-
-  bool persist() const { return persist_; }
-  void set_persist(bool persist) { persist_ = persist; }
 
   // PermissionRequest:
   int GetIconId() const override;
@@ -141,7 +132,7 @@
   content::MediaResponseCallback callback_;
 
   // Whether the permissions granted or denied by the user should be persisted.
-  bool persist_;
+  bool persist_permission_changes_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController);
 };