Rename ContentSettings.PermissionActions histogram to 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 4a6c7feee73b20c156cd83aeac0e0f31eb604f72..8b2485e7404696480bf318ae9afde91c5f239fc2 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -5105,6 +5105,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="ContentSettings.PermissionActions" enum="PermissionAction">
+  <obsolete>
+    Removed 11/2015 in favor of Permissions.Action.*
+  </obsolete>
   <owner>miguelg@chromium.org</owner>
   <summary>
     Tracks whether a permission was granted, rejected, etc. The suffix of the
@@ -5114,6 +5117,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="ContentSettings.PermissionActionsInsecureOrigin"
     enum="PermissionAction">
+  <obsolete>
+    Removed 11/2015 in favor of Permissions.Action.InsecureOrigin.*
+  </obsolete>
   <owner>miguelg@chromium.org</owner>
   <summary>
     Tracks whether a permission was granted, rejected, etc on an insecure
@@ -5123,6 +5129,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="ContentSettings.PermissionActionsSecureOrigin"
     enum="PermissionAction">
+  <obsolete>
+    Removed 11/2015 in favor of Permissions.Action.SecureOrigin.*
+  </obsolete>
   <owner>miguelg@chromium.org</owner>
   <summary>
     Tracks whether a permission was granted, rejected, etc on a secure origin.
@@ -31600,6 +31609,24 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Permissions.Action.InsecureOrigin" enum="PermissionAction">
+  <owner>miguelg@chromium.org</owner>
+  <owner>mlamouri@chromium.org</owner>
+  <summary>
+    Tracks whether a permission was granted, rejected, etc on an insecure
+    origin. The suffix of the histogram indicates which particular permission.
+  </summary>
+</histogram>
+
+<histogram name="Permissions.Action.SecureOrigin" enum="PermissionAction">
+  <owner>miguelg@chromium.org</owner>
+  <owner>mlamouri@chromium.org</owner>
+  <summary>
+    Tracks whether a permission was granted, rejected, etc on a secure origin.
+    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>
@@ -80151,9 +80178,17 @@ To add a new entry, add it with any value and run test to compute valid value.
 </histogram_suffixes>
 
 <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"/>
   <suffix name="AudioCapture" label="Microphone permission actions"/>
   <suffix name="VideoCapture" label="Camera permission actions"/>
   <affected-histogram name="Permissions.Action"/>
+  <affected-histogram name="Permissions.Action.InsecureOrigin"/>
+  <affected-histogram name="Permissions.Action.SecureOrigin"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="PNaClTranslatorTypes" separator=".">