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

chrome/browser/media/media_stream_infobar_delegate_android.cc

Index: chrome/browser/media/media_stream_infobar_delegate_android.cc
diff --git a/chrome/browser/media/media_stream_infobar_delegate_android.cc b/chrome/browser/media/media_stream_infobar_delegate_android.cc
index 2568db367aff18cc0b9488f2750e3aa353f90d65..2bfc3a0671589675ffa7ebc652f38a7ccaf25811 100644
--- a/chrome/browser/media/media_stream_infobar_delegate_android.cc
+++ b/chrome/browser/media/media_stream_infobar_delegate_android.cc
@@ -11,7 +11,6 @@
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/common/content_settings_types.h"
@@ -74,24 +73,6 @@
   return true;
 }
 
-void MediaStreamInfoBarDelegateAndroid::RecordPermissionAcceptedUma(
-    int position,
-    bool persist) {
-  PermissionUmaUtil::PermissionPromptAcceptedWithPersistenceToggle(
-      controller_->GetPermissionTypeForContentSettingsType(
-          GetContentSettingType(position)),
-      persist);
-}
-
-void MediaStreamInfoBarDelegateAndroid::RecordPermissionDeniedUma(
-    int position,
-    bool persist) {
-  PermissionUmaUtil::PermissionPromptDeniedWithPersistenceToggle(
-      controller_->GetPermissionTypeForContentSettingsType(
-          GetContentSettingType(position)),
-      persist);
-}
-
 infobars::InfoBarDelegate::InfoBarIdentifier
 MediaStreamInfoBarDelegateAndroid::GetIdentifier() const {
   return MEDIA_STREAM_INFOBAR_DELEGATE_ANDROID;
@@ -119,24 +100,6 @@
 }
 
 bool MediaStreamInfoBarDelegateAndroid::Accept() {
-  bool persist_permission = true;
-  if (ShouldShowPersistenceToggle()) {
-    persist_permission = persist();
-
-    // TODO(dominickn): fold these metrics calls into
-    // PermissionUmaUtil::PermissionGranted. See crbug.com/638076.
-    if (GetPermissionCount() == 2) {
-      RecordPermissionAcceptedUma(kGroupedInfobarAudioPosition,
-                                  persist_permission);
-      RecordPermissionAcceptedUma(kGroupedInfobarVideoPosition,
-                                  persist_permission);
-    } else {
-      DCHECK_EQ(1, GetPermissionCount());
-      RecordPermissionAcceptedUma(0, persist_permission);
-    }
-  }
-
-  controller_->set_persist(persist_permission);
   if (GetPermissionCount() == 2) {
     controller_->GroupedRequestFinished(
         GetAcceptState(kGroupedInfobarAudioPosition),
@@ -149,23 +112,6 @@
 }
 
 bool MediaStreamInfoBarDelegateAndroid::Cancel() {
-  bool persist_permission = true;
-  if (ShouldShowPersistenceToggle()) {
-    persist_permission = persist();
-
-    // TODO(dominickn): fold these metrics calls into
-    // PermissionUmaUtil::PermissionGranted. See crbug.com/638076.
-    if (GetPermissionCount() == 2) {
-      RecordPermissionDeniedUma(kGroupedInfobarAudioPosition,
-                                persist_permission);
-      RecordPermissionDeniedUma(kGroupedInfobarVideoPosition,
-                                persist_permission);
-    } else {
-      DCHECK_EQ(1, GetPermissionCount());
-      RecordPermissionDeniedUma(0, persist_permission);
-    }
-  }
-  controller_->set_persist(persist_permission);
   controller_->PermissionDenied();
   return true;
 }