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 c27b5379a70393f970f9a248aaa9d44ce345aa5e..74e447bd9c60107f71f837ea7a744e4a2da9dab9 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -28070,6 +28070,25 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Permissions.Requested.CrossOrigin" enum="ContentSetting">
+  <owner>keenanb@google.com</owner>
+  <owner>jww@chromium.org</owner>
+  <summary>
+    The embedder's permission setting (allowed, blocked, neither) at the time of
+    an cross-origin iframe permission request for a given permission type. See
+    the corresponding histogram suffixes.
+  </summary>
+</histogram>
+
+<histogram name="Permissions.Requested.SameOrigin" enum="PermissionType">
+  <owner>keenanb@google.com</owner>
+  <owner>jww@chromium.org</owner>
+  <summary>
+    The permission type (geolocation, and such) of a same-origin permission
+    request.
+  </summary>
+</histogram>
+
 <histogram name="Platform.AsvGroup">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -72804,7 +72823,7 @@ 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="PermissionActions">
+<histogram_suffixes name="PermissionTypes">

[mlamouri (slow - plz ping), 2015/07/01 11:23:05]

I think that changes isn't correct. CrossOrigin isn't using PermissionActions
while the other histograms in that list do. Though, I'm no histograms expert so
I might be wrong.

   <suffix name="MidiSysEx" label="Midi SysEx permsision actions"/>
   <suffix name="PushMessaging" label="Push messaging permission actions"/>
   <suffix name="Notifications" label="Notification permission actions"/>
@@ -72813,6 +72832,7 @@ To add a new entry, add it with any value and run test to compute valid value.
   <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="PNaClTranslatorTypes" separator=".">