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

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index cc783b848d0b4883dbfe31779a3ded257ce5dda8..a5255ab9616a27433b290fa0efa369da1693f497 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -39983,6 +39983,26 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Permissions.Prompt.Accepted.PriorDismissCount">
+  <owner>dominickn@chromium.org</owner>
+  <summary>
+    This metric, recorded at the time of a permission prompt accept, records the
+    total number of prompt dismissal events for this origin since the last time
+    the user cleared their history or site data and prior to the accept. The
+    suffix of the histogram indicates which particular permission.
+  </summary>
+</histogram>
+
+<histogram name="Permissions.Prompt.Accepted.PriorIgnoreCount">
+  <owner>dominickn@chromium.org</owner>
+  <summary>
+    This metric, recorded at the time of a permission prompt accept, records the
+    total number of prompt ignore events for this origin since the last time the
+    user cleared their history or site data and prior to the accept. The suffix
+    of the histogram indicates which particular permission.
+  </summary>
+</histogram>
+
 <histogram name="Permissions.Prompt.Denied" enum="PermissionRequestType">
   <owner>benwells@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
@@ -40001,8 +40021,31 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Permissions.Prompt.Denied.PriorDismissCount">
+  <owner>dominickn@chromium.org</owner>
+  <summary>
+    This metric, recorded at the time of a permission prompt deny, records the
+    total number of prompt dismissal events for this origin since the last time
+    the user cleared their history or site data and prior to the accept. The
+    suffix of the histogram indicates which particular permission.
+  </summary>
+</histogram>
+
+<histogram name="Permissions.Prompt.Denied.PriorIgnoreCount">
+  <owner>dominickn@chromium.org</owner>
+  <summary>
+    This metric, recorded at the time of a permission prompt deny, records the
+    total number of prompt ignore events for this origin since the last time the
+    user cleared their history or site data and prior to the accept. The suffix
+    of the histogram indicates which particular permission.
+  </summary>
+</histogram>
+
 <histogram name="Permissions.Prompt.DismissCount">
   <owner>dominickn@chromium.org</owner>
+  <obsolete>
+    Renamed to Permissions.Prompt.Dismissed.PriorDismissCount on 17 August 2016.
+  </obsolete>
   <summary>
     This metric, recorded at the time of a permission prompt dismissal, records
     the total number of prompt dismissal events for this origin since the last
@@ -40013,8 +40056,31 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>

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

Since these have only been on canary for a very short time, can we just delete
them? isherman@ will know the answer.

[Ilya Sherman, 2016/08/22 20:42:33]

It's generally preferable to mark as <obsolete> so that historical data remains.
 But, if the metrics have *only* been shipped to Canary, deleting might be ok as
well.  I'd still recommend marking as <obsolete> unless you have a particularly
compelling reason to delete.

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

Acknowledged. Leaving as obsolete.

 
+<histogram name="Permissions.Prompt.Dismissed.PriorDismissCount">
+  <owner>dominickn@chromium.org</owner>
+  <summary>
+    This metric, recorded at the time of a permission prompt dismiss, records
+    the total number of prompt dismissal events for this origin since the last
+    time the user cleared their history or site data and prior to the dismiss.
+    The suffix of the histogram indicates which particular permission.
+  </summary>
+</histogram>
+
+<histogram name="Permissions.Prompt.Dismissed.PriorIgnoreCount">
+  <owner>dominickn@chromium.org</owner>
+  <summary>
+    This metric, recorded at the time of a permission prompt dismiss, records
+    the total number of prompt ignore events for this origin since the last time
+    the user cleared their history or site data and prior to the dismiss. The
+    suffix of the histogram indicates which particular permission.
+  </summary>
+</histogram>
+
 <histogram name="Permissions.Prompt.IgnoreCount">
   <owner>dominickn@chromium.org</owner>
+  <obsolete>
+    Renamed to Permissions.Prompt.Dismissed.PriorDismissCount on 17 August 2016.
+  </obsolete>
   <summary>
     This metric, recorded at the time of a permission prompt ignore, records the
     total number of prompt ignore events for this origin since the last time the
@@ -40025,6 +40091,26 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Permissions.Prompt.Ignored.PriorDismissCount">
+  <owner>dominickn@chromium.org</owner>
+  <summary>
+    This metric, recorded at the time of a permission prompt ignore, records the
+    total number of prompt dismissal events for this origin since the last time
+    the user cleared their history or site data and prior to the ignore. The
+    suffix of the histogram indicates which particular permission.
+  </summary>
+</histogram>
+
+<histogram name="Permissions.Prompt.Ignored.PriorIgnoreCount">
+  <owner>dominickn@chromium.org</owner>
+  <summary>
+    This metric, recorded at the time of a permission prompt ignore, records the
+    total number of prompt ignore events for this origin since the last time the
+    user cleared their history or site data and prior to the ignore. The suffix
+    of the histogram indicates which particular permission.
+  </summary>
+</histogram>
+
 <histogram name="Permissions.Prompt.MergedBubbleAccepted"
     enum="PermissionRequestType">
   <owner>benwells@chromium.org</owner>
@@ -101500,9 +101586,15 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="Permissions.Action.InsecureOrigin"/>
   <affected-histogram name="Permissions.Action.SecureOrigin"/>
   <affected-histogram name="Permissions.Prompt.Accepted.Persisted"/>
+  <affected-histogram name="Permissions.Prompt.Accepted.PriorDismissCount"/>
+  <affected-histogram name="Permissions.Prompt.Accepted.PriorIgnoreCount"/>
   <affected-histogram name="Permissions.Prompt.Denied.Persisted"/>
-  <affected-histogram name="Permissions.Prompt.DismissCount"/>
-  <affected-histogram name="Permissions.Prompt.IgnoreCount"/>
+  <affected-histogram name="Permissions.Prompt.Denied.PriorDismissCount"/>
+  <affected-histogram name="Permissions.Prompt.Denied.PriorIgnoreCount"/>
+  <affected-histogram name="Permissions.Prompt.Dismissed.PriorDismissCount"/>
+  <affected-histogram name="Permissions.Prompt.Dismissed.PriorIgnoreCount"/>
+  <affected-histogram name="Permissions.Prompt.Ignored.PriorDismissCount"/>
+  <affected-histogram name="Permissions.Prompt.Ignored.PriorIgnoreCount"/>
   <affected-histogram name="Permissions.Requested.CrossOrigin"/>
 </histogram_suffixes>