Enable the optional permission prompt persistence toggle on grouped infobars

chrome/browser/media/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/media_stream_infobar_delegate_android.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
 #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"
 #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 "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 69 matching lines @@
   // 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) {
+      PermissionUmaUtil::PermissionPromptAcceptedWithPersistenceToggle(
+          controller_->GetPermissionTypeForContentSettingsType(
+              GetContentSettingType(kGroupedInfobarAudioPosition)),
+          persist_permission);

[xhwang, 2016/08/23 18:03:58]

Can you have a helper function? This code is a bit hard to read.

void SomeName(position, persist_permission) {
  PermissionUmaUtil::PermissionPromptAcceptedWithPersistenceToggle(
      controller_->GetPermissionTypeForContentSettingsType(
          GetContentSettingType(kGroupedInfobarAudioPosition)),
      persist_permission);
}

[dominickn, 2016/08/23 20:13:16]

Done.

+
+      PermissionUmaUtil::PermissionPromptAcceptedWithPersistenceToggle(
+          controller_->GetPermissionTypeForContentSettingsType(
+              GetContentSettingType(kGroupedInfobarVideoPosition)),
+          persist_permission);
+    } else {
+      DCHECK_EQ(1, GetPermissionCount());
+      PermissionUmaUtil::PermissionPromptAcceptedWithPersistenceToggle(
+          controller_->GetPermissionTypeForContentSettingsType(
+              GetContentSettingType(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) {
+      PermissionUmaUtil::PermissionPromptDeniedWithPersistenceToggle(
+          controller_->GetPermissionTypeForContentSettingsType(
+              GetContentSettingType(kGroupedInfobarAudioPosition)),
+          persist_permission);
+
+      PermissionUmaUtil::PermissionPromptDeniedWithPersistenceToggle(
+          controller_->GetPermissionTypeForContentSettingsType(
+              GetContentSettingType(kGroupedInfobarVideoPosition)),
+          persist_permission);
+    } else {
+      DCHECK_EQ(1, GetPermissionCount());
+      PermissionUmaUtil::PermissionPromptDeniedWithPersistenceToggle(
+          controller_->GetPermissionTypeForContentSettingsType(
+              GetContentSettingType(0)),
+          persist_permission);
+    }
+  }
+  controller_->set_persist(persist_permission);
   controller_->PermissionDenied();
   return true;
 }