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

chrome/browser/permissions/permission_uma_util.h

Index: chrome/browser/permissions/permission_uma_util.h
diff --git a/chrome/browser/permissions/permission_uma_util.h b/chrome/browser/permissions/permission_uma_util.h
index 38aed87f5acc73a33c9d7168b82e7f5a4bcd4f65..f56e40d96c5b0393bcdb6ce0b8b4c2e7156d8c56 100644
--- a/chrome/browser/permissions/permission_uma_util.h
+++ b/chrome/browser/permissions/permission_uma_util.h
@@ -80,6 +80,14 @@ class PermissionUmaUtil {
   static const char kPermissionsPromptMergedBubbleTypes[];
   static const char kPermissionsPromptMergedBubbleAccepted[];
   static const char kPermissionsPromptMergedBubbleDenied[];
+  static const char kPermissionsPromptAcceptedPriorDismissCountPrefix[];
+  static const char kPermissionsPromptAcceptedPriorIgnoreCountPrefix[];
+  static const char kPermissionsPromptDeniedPriorDismissCountPrefix[];
+  static const char kPermissionsPromptDeniedPriorIgnoreCountPrefix[];
+  static const char kPermissionsPromptDismissedPriorDismissCountPrefix[];
+  static const char kPermissionsPromptDismissedPriorIgnoreCountPrefix[];
+  static const char kPermissionsPromptIgnoredPriorDismissCountPrefix[];
+  static const char kPermissionsPromptIgnoredPriorIgnoreCountPrefix[];
 
   static void PermissionRequested(content::PermissionType permission,
                                   const GURL& requesting_origin,
@@ -130,16 +138,6 @@ class PermissionUmaUtil {
   static void PermissionPromptDenied(
       const std::vector<PermissionRequest*>& requests);
 
-  // Records |count| total dismissal actions for a prompt of type |permission|
-  // for a single origin.
-  static void PermissionPromptDismissed(content::PermissionType permission,
-                                        int count);
-
-  // Records |count| total ignore actions for a prompt of type |permission| for
-  // a single origin.
-  static void PermissionPromptIgnored(content::PermissionType permission,
-                                      int count);
-
   // A permission prompt was accepted or denied, and the prompt displayed a
   // persistence toggle. Records whether the toggle was enabled (persist) or
   // disabled (don't persist).
@@ -163,6 +161,13 @@ class PermissionUmaUtil {
                                      const GURL& requesting_origin,
                                      Profile* profile);
 
+  // Records |count| total prior actions for a prompt of type |permission|
+  // for a single origin using |prefix| for the metric.
+  static void RecordPermissionPromptPriorCount(
+      content::PermissionType permission,
+      const std::string& prefix,
+      int count);
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(PermissionUmaUtil);
 };