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 d28b4789dda423a00099da197fc678e389ebb08e..490cb34c58b840dd69d064dd998a4d3932e2e456 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -2892,6 +2892,27 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>The default popups setting at profile open.</summary>
 </histogram>
 
+<histogram name="ContentSettings.DefaultPushMessagingSetting"
+    enum="ContentSetting">
+  <owner>miguelg@chromium.org</owner>
+  <summary>
+    The default permission setting for push messages at profile open.
+  </summary>
+</histogram>
+
+<histogram name="ContentSettings.PermissionActions" enum="PermissionAction">
+  <owner>miguelg</owner>
+  <summary>
+    Tracks whether a permission was granted, rejected, etc. The suffix of the
+    histogram indicates which particular permission.
+  </summary>
+</histogram>
+
+<histogram name="ContentSettings.PermissionRequested" enum="PermissionType">
+  <owner>miguelg@chromium.org</owner>
+  <summary>Number of times a given permission was requested.</summary>
+</histogram>
+
 <histogram name="Cookie.ParsedCookieStatus" enum="ParsedCookieStatus">
   <obsolete>
     Deprecated as of 9/2013. Experiment to measure control characters in cookies
@@ -44202,6 +44223,19 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </int>
 </enum>
 
+<enum name="PermissionAction" type="int">
+  <int value="0" label="GRANTED"/>
+  <int value="1" label="DENIED"/>
+  <int value="2" label="DISMISSED"/>
+  <int value="3" label="IGNORED"/>
+</enum>
+
+<enum name="PermissionType" type="int">
+  <int value="0" label="PERMISSION_UNKONWN"/>
+  <int value="1" label="PERMISSION_MIDI_SYSEX"/>
+  <int value="2" label="PERMISSION_PUSH_MESSAGING"/>
+</enum>
+
 <enum name="PhotoEditorFileType" type="int">
   <int value="0" label="jpg"/>
   <int value="1" label="png"/>
@@ -50560,6 +50594,12 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <affected-histogram name="PerformanceMonitor.HighCPU"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="PermissionActions">
+  <suffix name="MidiSysEx" label="Midi SysEx permsision actions"/>
+  <suffix name="PushMessaging" label="Push messaging permission actions"/>
+  <affected-histogram name="ContentSettings.PermissionActions"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="PpapiPluginName">
   <suffix name="libpepflashplayer.so" label="Flash player on Linux or Cros"/>
   <suffix name="libwidevinecdmadapter.so"