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 1a223f24d4d01ecc59bbc0307868bf1afe4f2fa2..e9c1987e40108c7b5da3e5a516ecbf614bc2e083 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -17624,6 +17624,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Media.DevicePermissionActions" enum="DevicePermissionActions">
+  <obsolete>
+    Removed 10/2015 in favor of Permissions.Action.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     Measures the actions taken in the media infobar, which prompts the users for
@@ -31131,6 +31134,15 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Permissions.Action" enum="PermissionAction">
+  <owner>miguelg@chromium.org</owner>
+  <owner>mlamouri@chromium.org</owner>
+  <summary>
+    Tracks whether a permission was granted, rejected, etc. The suffix of the
+    histogram indicates which particular permission.
+  </summary>
+</histogram>
+
 <histogram name="Permissions.Requested.CrossOrigin" enum="PermissionStatus">
   <owner>keenanb@google.com</owner>
   <owner>jww@chromium.org</owner>
@@ -75918,6 +75930,19 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="PLT.LoadType"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="ContentSettingsTypes">
+  <suffix name="MidiSysEx" label="Midi SysEx permsision actions"/>
+  <suffix name="PushMessaging" label="Push messaging permission actions"/>
+  <suffix name="Notifications" label="Notification permission actions"/>
+  <suffix name="Geolocation" label="Geolocation permission actions"/>
+  <suffix name="ProtectedMedia" label="Protected media permission actions"/>
+  <suffix name="DurableStorage" label="Durable Storage permission actions"/>
+  <affected-histogram name="ContentSettings.PermissionActions"/>
+  <affected-histogram name="ContentSettings.PermissionActionsInsecureOrigin"/>
+  <affected-histogram name="ContentSettings.PermissionActionsSecureOrigin"/>
+  <affected-histogram name="Permissions.Requested.CrossOrigin"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="ContextMenuType" separator=".">
   <suffix name="Link" label="The context menu was shown for a link"/>
   <suffix name="Image" label="The context menu was shown for an image"/>
@@ -79019,17 +79044,16 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="PerformanceMonitor.HighCPU"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PermissionTypes">
+<histogram_suffixes name="PermissionTypes" separator=".">
   <suffix name="MidiSysEx" label="Midi SysEx permsision actions"/>
   <suffix name="PushMessaging" label="Push messaging permission actions"/>
   <suffix name="Notifications" label="Notification permission actions"/>
   <suffix name="Geolocation" label="Geolocation permission actions"/>
   <suffix name="ProtectedMedia" label="Protected media permission actions"/>
   <suffix name="DurableStorage" label="Durable Storage permission actions"/>

[Ilya Sherman, 2015/10/21 22:41:15]

Where are these recorded?

[tsergeant, 2015/10/26 03:21:19]

Nowhere yet. The intention is replace
"ContentSettings.PermissionActions_<something>" with
"Permissions.Action.<something>" (discussed back in patchset 5).

[Ilya Sherman, 2015/10/29 00:20:15]

If these are not recorded, then let's not add them to histograms.xml.

[tsergeant, 2015/10/29 02:55:21]

Done.

-  <affected-histogram name="ContentSettings.PermissionActions"/>
-  <affected-histogram name="ContentSettings.PermissionActionsInsecureOrigin"/>
-  <affected-histogram name="ContentSettings.PermissionActionsSecureOrigin"/>
-  <affected-histogram name="Permissions.Requested.CrossOrigin"/>
+  <suffix name="AudioCapture" label="Microphone permission actions"/>
+  <suffix name="VideoCapture" label="Camera permission actions"/>
+  <affected-histogram name="Permissions.Action"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="PNaClTranslatorTypes" separator=".">