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

chrome/browser/media/media_stream_devices_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
 
 #include <map>
 #include <string>
 
 #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;
 class TabSpecificContentSettings;
 
 namespace content {
 class WebContents;
 }
 
 namespace user_prefs {
@@ skipping 10 matching lines @@
 
   // Registers the prefs backing the audio and video policies.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   bool IsAllowedForAudio() const;
   bool IsAllowedForVideo() const;
   bool IsAskingForAudio() const;
   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
   // denied.
   //
   // This differs from PermissionGranted/PermissionDenied as they only operate
   // on the permissions if they are in the ASK state.
   void ForcePermissionDeniedTemporarily();
 
   // Answers a permission request with (possibly) different values for
   // |audio_accepted| and |video_accepted|. Intended for use from
   // MediaStreamInfobarDelegateAndroid.
   // 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;
   base::string16 GetMessageTextFragment() const override;
   GURL GetOrigin() const override;
   void PermissionGranted() override;
   void PermissionDenied() override;
   void Cancelled() override;
   void RequestFinished() override;
   PermissionRequestType GetPermissionRequestType() const override;
 
@@ skipping 55 matching lines @@
   TabSpecificContentSettings* content_settings_;
 
   // The original request for access to devices.
   const content::MediaStreamRequest request_;
 
   // The callback that needs to be Run to notify WebRTC of whether access to
   // audio/video devices was granted or not.
   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);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_