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..ecf07997eb27822d9836fe55550b1534e3b39a12 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,27 +40021,77 @@ 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>
   <summary>
-    This metric, recorded at the time of a permission prompt dismissal, records
+    Renamed to Permissions.Prompt.Dismissed.PriorDismissCount on 17 August 2016.

[Ilya Sherman, 2016/08/18 00:59:00]

Please move this text to an <obsolete> section.  Ditto for any other renamed
histograms.

[dominickn, 2016/08/18 01:21:11]

Done.

+  </summary>
+</histogram>
+
+<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, inclusive of the current
-    dismissal. Every event in a bucket larger than 1 in this histogram will also
-    have an event in each smaller bucket. The suffix of the histogram indicates
-    which particular permission.
+    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>
   <summary>
+    Renamed to Permissions.Prompt.Dismissed.PriorDismissCount on 17 August 2016.
+  </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, inclusive of the current ignore.
-    Every event in a bucket larger than 1 in this histogram will also have an
-    event in each smaller bucket. The suffix of the histogram indicates which
-    particular permission.
+    user cleared their history or site data and prior to the ignore. The suffix
+    of the histogram indicates which particular permission.
   </summary>
 </histogram>
 
@@ -101500,9 +101570,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>