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

chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc

 // 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.
 
 #include "chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.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 "components/content_settings/core/common/content_settings_types.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/origin_util.h"
 #include "url/gurl.h"
 
 namespace {
 
@@ skipping 38 matching lines @@
     infobars::InfoBar* old_infobar = infobar_service->infobar_at(i);
     if (old_infobar->delegate()->AsMediaStreamInfoBarDelegateAndroid()) {
       infobar_service->ReplaceInfoBar(old_infobar, std::move(infobar));
       return true;
     }
   }
   infobar_service->AddInfoBar(std::move(infobar));
   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;
 }
 
 MediaStreamInfoBarDelegateAndroid::MediaStreamInfoBarDelegateAndroid(
     std::unique_ptr<MediaStreamDevicesController> controller)
     : GroupedPermissionInfoBarDelegate(
           controller->GetOrigin(),
           GetContentSettingsTypes(controller.get())),
       controller_(std::move(controller)) {
   DCHECK(controller_.get());
   DCHECK(controller_->IsAskingForAudio() || controller_->IsAskingForVideo());
 }
 
 void MediaStreamInfoBarDelegateAndroid::InfoBarDismissed() {
   // Deny the request if the infobar was closed with the 'x' button, since
   // we don't want WebRTC to be waiting for an answer that will never come.
   controller_->Cancelled();
 }
 
 MediaStreamInfoBarDelegateAndroid*
 MediaStreamInfoBarDelegateAndroid::AsMediaStreamInfoBarDelegateAndroid() {
   return this;
 }
 
 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),
         GetAcceptState(kGroupedInfobarVideoPosition));
   } else {
     DCHECK_EQ(1, GetPermissionCount());
     controller_->PermissionGranted();
   }
   return true;
 }
 
 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;
 }