Add prior dismissal and ignore count metrics for all permission actions.

chrome/browser/permissions/permission_uma_util.cc

 // Copyright 2014 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/permissions/permission_uma_util.h"
 
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/metrics/histogram.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
 #include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
@@ skipping 161 matching lines @@
 const char PermissionUmaUtil::kPermissionsPromptShown[] =
     "Permissions.Prompt.Shown";
 const char PermissionUmaUtil::kPermissionsPromptShownGesture[] =
     "Permissions.Prompt.Shown.Gesture";
 const char PermissionUmaUtil::kPermissionsPromptShownNoGesture[] =
     "Permissions.Prompt.Shown.NoGesture";
 const char PermissionUmaUtil::kPermissionsPromptAccepted[] =
     "Permissions.Prompt.Accepted";
 const char PermissionUmaUtil::kPermissionsPromptAcceptedGesture[] =
     "Permissions.Prompt.Accepted.Gesture";
+const char
+    PermissionUmaUtil::kPermissionsPromptAcceptedPriorDismissCountPrefix[] =
+        "Permissions.Prompt.Accepted.PriorDismissCount.";
+const char
+    PermissionUmaUtil::kPermissionsPromptAcceptedPriorIgnoreCountPrefix[] =
+        "Permissions.Prompt.Accepted.PriorIgnoreCount.";
 const char PermissionUmaUtil::kPermissionsPromptAcceptedNoGesture[] =
     "Permissions.Prompt.Accepted.NoGesture";
 const char PermissionUmaUtil::kPermissionsPromptDenied[] =
     "Permissions.Prompt.Denied";
 const char PermissionUmaUtil::kPermissionsPromptDeniedGesture[] =
     "Permissions.Prompt.Denied.Gesture";
+const char
+    PermissionUmaUtil::kPermissionsPromptDeniedPriorDismissCountPrefix[] =
+        "Permissions.Prompt.Denied.PriorDismissCount.";
+const char
+    PermissionUmaUtil::kPermissionsPromptDeniedPriorIgnoreCountPrefix[] =
+        "Permissions.Prompt.Denied.PriorIgnoreCount.";
 const char PermissionUmaUtil::kPermissionsPromptDeniedNoGesture[] =
     "Permissions.Prompt.Denied.NoGesture";
+const char
+    PermissionUmaUtil::kPermissionsPromptDismissedPriorDismissCountPrefix[] =
+        "Permissions.Prompt.Dismissed.PriorDismissCount.";
+const char
+    PermissionUmaUtil::kPermissionsPromptDismissedPriorIgnoreCountPrefix[] =
+        "Permissions.Prompt.Dismissed.PriorIgnoreCount.";
+const char
+    PermissionUmaUtil::kPermissionsPromptIgnoredPriorDismissCountPrefix[] =
+        "Permissions.Prompt.Ignored.PriorDismissCount.";
+const char
+    PermissionUmaUtil::kPermissionsPromptIgnoredPriorIgnoreCountPrefix[] =
+        "Permissions.Prompt.Ignored.PriorIgnoreCount.";

[raymes, 2016/08/22 02:55:09]

Can we group together the strings related to this particular experiment?

[dominickn, 2016/08/22 22:40:51]

Done.

 const char PermissionUmaUtil::kPermissionsPromptRequestsPerPrompt[] =
     "Permissions.Prompt.RequestsPerPrompt";
 const char PermissionUmaUtil::kPermissionsPromptMergedBubbleTypes[] =
     "Permissions.Prompt.MergedBubbleTypes";
 const char PermissionUmaUtil::kPermissionsPromptMergedBubbleAccepted[] =
     "Permissions.Prompt.MergedBubbleAccepted";
 const char PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied[] =
     "Permissions.Prompt.MergedBubbleDenied";
 
 // Make sure you update histograms.xml permission histogram_suffix if you
 // add new permission
 void PermissionUmaUtil::PermissionRequested(PermissionType permission,
                                             const GURL& requesting_origin,
                                             const GURL& embedding_origin,
                                             Profile* profile) {
   RecordPermissionRequest(permission, requesting_origin, embedding_origin,
                           profile);
 }
 
 void PermissionUmaUtil::PermissionGranted(
     PermissionType permission,
     PermissionRequestGestureType gesture_type,
     const GURL& requesting_origin,
     Profile* profile) {
   RecordPermissionAction(permission, GRANTED, PermissionSourceUI::PROMPT,
                          gesture_type, requesting_origin, profile);
+  RecordPermissionPromptPriorCount(
+      permission, kPermissionsPromptAcceptedPriorDismissCountPrefix,
+      PermissionDecisionAutoBlocker::GetDismissCount(requesting_origin,
+                                                     permission, profile));
+  RecordPermissionPromptPriorCount(
+      permission, kPermissionsPromptAcceptedPriorIgnoreCountPrefix,
+      PermissionDecisionAutoBlocker::GetIgnoreCount(requesting_origin,
+                                                    permission, profile));
 }
 
 void PermissionUmaUtil::PermissionDenied(
     PermissionType permission,
     PermissionRequestGestureType gesture_type,
     const GURL& requesting_origin,
     Profile* profile) {
   RecordPermissionAction(permission, DENIED, PermissionSourceUI::PROMPT,
                          gesture_type, requesting_origin, profile);
+  RecordPermissionPromptPriorCount(
+      permission, kPermissionsPromptDeniedPriorDismissCountPrefix,
+      PermissionDecisionAutoBlocker::GetDismissCount(requesting_origin,
+                                                     permission, profile));
+  RecordPermissionPromptPriorCount(
+      permission, kPermissionsPromptDeniedPriorIgnoreCountPrefix,
+      PermissionDecisionAutoBlocker::GetIgnoreCount(requesting_origin,
+                                                    permission, profile));
 }
 
 void PermissionUmaUtil::PermissionDismissed(
     PermissionType permission,
     PermissionRequestGestureType gesture_type,
     const GURL& requesting_origin,
     Profile* profile) {
   RecordPermissionAction(permission, DISMISSED, PermissionSourceUI::PROMPT,
                          gesture_type, requesting_origin, profile);
+  RecordPermissionPromptPriorCount(
+      permission, kPermissionsPromptDismissedPriorDismissCountPrefix,
+      PermissionDecisionAutoBlocker::GetDismissCount(requesting_origin,
+                                                     permission, profile));
+  RecordPermissionPromptPriorCount(
+      permission, kPermissionsPromptDismissedPriorIgnoreCountPrefix,
+      PermissionDecisionAutoBlocker::GetIgnoreCount(requesting_origin,
+                                                    permission, profile));
 }
 
 void PermissionUmaUtil::PermissionIgnored(
     PermissionType permission,
     PermissionRequestGestureType gesture_type,
     const GURL& requesting_origin,
     Profile* profile) {
   RecordPermissionAction(permission, IGNORED, PermissionSourceUI::PROMPT,
                          gesture_type, requesting_origin, profile);
+  RecordPermissionPromptPriorCount(
+      permission, kPermissionsPromptIgnoredPriorDismissCountPrefix,
+      PermissionDecisionAutoBlocker::GetDismissCount(requesting_origin,
+                                                     permission, profile));
+  RecordPermissionPromptPriorCount(
+      permission, kPermissionsPromptIgnoredPriorIgnoreCountPrefix,
+      PermissionDecisionAutoBlocker::GetIgnoreCount(requesting_origin,
+                                                    permission, profile));
 }
 
 void PermissionUmaUtil::PermissionRevoked(PermissionType permission,
                                           PermissionSourceUI source_ui,
                                           const GURL& revoked_origin,
                                           Profile* profile) {
   // TODO(tsergeant): Expand metrics definitions for revocation to include all
   // permissions.
   if (permission == PermissionType::NOTIFICATIONS ||
       permission == PermissionType::GEOLOCATION ||
@@ skipping 85 matching lines @@
   DCHECK(!requests.empty());
   DCHECK(requests.size() == 1);
 
   PERMISSION_BUBBLE_TYPE_UMA(kPermissionsPromptDenied,
                              requests[0]->GetPermissionRequestType());
   PERMISSION_BUBBLE_GESTURE_TYPE_UMA(
       kPermissionsPromptDeniedGesture, kPermissionsPromptDeniedNoGesture,
       requests[0]->GetGestureType(), requests[0]->GetPermissionRequestType());
 }
 
-void PermissionUmaUtil::PermissionPromptDismissed(
+void PermissionUmaUtil::RecordPermissionPromptPriorCount(
     content::PermissionType permission,
+    const std::string& prefix,
     int count) {
-  switch (permission) {
-    case PermissionType::GEOLOCATION:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.DismissCount.Geolocation",
-                               count);
-      break;
-    case PermissionType::NOTIFICATIONS:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.DismissCount.Notifications",
-                               count);
-      break;
-    case PermissionType::MIDI_SYSEX:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.DismissCount.MidiSysEx",
-                               count);
-      break;
-    case PermissionType::PUSH_MESSAGING:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.DismissCount.PushMessaging",
-                               count);
-      break;
-    case PermissionType::PROTECTED_MEDIA_IDENTIFIER:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.DismissCount.ProtectedMedia",
-                               count);
-      break;
-    case PermissionType::DURABLE_STORAGE:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.DismissCount.DurableStorage",
-                               count);
-      break;
-    case PermissionType::AUDIO_CAPTURE:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.DismissCount.AudioCapture",
-                               count);
-      break;
-    case PermissionType::VIDEO_CAPTURE:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.DismissCount.VideoCapture",
-                               count);
-      break;
-    // The user is not prompted for these permissions, thus there is no dismiss
-    // recorded for them.
-    case PermissionType::MIDI:
-    case PermissionType::BACKGROUND_SYNC:
-    case PermissionType::NUM:
-      NOTREACHED() << "PERMISSION "
-                   << PermissionUtil::GetPermissionString(permission)
-                   << " not accounted for";
-  }
-}
+  // The user is not prompted for these permissions, thus there is no prompt
+  // event to record a prior count for.
+  DCHECK_NE(PermissionType::MIDI, permission);
+  DCHECK_NE(PermissionType::BACKGROUND_SYNC, permission);
+  DCHECK_NE(PermissionType::NUM, permission);
 
-void PermissionUmaUtil::PermissionPromptIgnored(
-    content::PermissionType permission,
-    int count) {
-  switch (permission) {
-    case PermissionType::GEOLOCATION:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.IgnoreCount.Geolocation",
-                               count);
-      break;
-    case PermissionType::NOTIFICATIONS:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.IgnoreCount.Notifications",
-                               count);
-      break;
-    case PermissionType::MIDI_SYSEX:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.IgnoreCount.MidiSysEx",
-                               count);
-      break;
-    case PermissionType::PUSH_MESSAGING:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.IgnoreCount.PushMessaging",
-                               count);
-      break;
-    case PermissionType::PROTECTED_MEDIA_IDENTIFIER:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.IgnoreCount.ProtectedMedia",
-                               count);
-      break;
-    case PermissionType::DURABLE_STORAGE:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.IgnoreCount.DurableStorage",
-                               count);
-      break;
-    case PermissionType::AUDIO_CAPTURE:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.IgnoreCount.AudioCapture",
-                               count);
-      break;
-    case PermissionType::VIDEO_CAPTURE:
-      UMA_HISTOGRAM_COUNTS_100("Permissions.Prompt.IgnoreCount.VideoCapture",
-                               count);
-      break;
-    // The user is not prompted for these permissions, thus there is no
-    // ignore recorded for them.
-    case PermissionType::MIDI:
-    case PermissionType::BACKGROUND_SYNC:
-    case PermissionType::NUM:
-      NOTREACHED() << "PERMISSION "
-                   << PermissionUtil::GetPermissionString(permission)
-                   << " not accounted for";
-  }
+  // Expand UMA_HISTOGRAM_COUNTS_100 so that we can use a dynamically suffixed
+  // histogram name.
+  base::Histogram::FactoryGet(
+      prefix + PermissionUtil::GetPermissionString(permission), 1, 100, 50,
+      base::HistogramBase::kUmaTargetedHistogramFlag)
+      ->Add(count);
 }
 
 void PermissionUmaUtil::PermissionPromptAcceptedWithPersistenceToggle(
     content::PermissionType permission,
     bool toggle_enabled) {
   switch (permission) {
     case PermissionType::GEOLOCATION:
       UMA_HISTOGRAM_BOOLEAN("Permissions.Prompt.Accepted.Persisted.Geolocation",
                             toggle_enabled);
       break;
@@ skipping 207 matching lines @@
   if (!deprecated_metric.empty() && rappor_service) {
     rappor::SampleDomainAndRegistryFromGURL(rappor_service, deprecated_metric,
                                             requesting_origin);
 
     std::string rappor_metric = deprecated_metric + "2";
     rappor_service->RecordSample(
         rappor_metric, rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE,
         rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin));
   }
 }