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 30cd03f55469e4aae9bbbb9efe85a856131ac662..655800c4a8d0c4aa34085e62b0ddfa5cf8103de1 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -20638,7 +20638,24 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="JSDialogs.CountOfJSDialogMessageCharacters">
+<histogram name="JSDialogs.CharacterCount" units="characters">
+  <owner>avi@chromium.org</owner>
+  <summary>
+    The count of the number of characters in JavaScript dialog messages grouped
+    by site engagement score.
+  </summary>
+</histogram>
+
+<histogram name="JSDialogs.CharacterCountUserSuppressed" units="characters">
+  <owner>avi@chromium.org</owner>
+  <summary>
+    The count of the number of characters in JavaScript dialog messages that
+    were suppressed by the user. Compare with
+    JSDialogs.CountOfJSDialogMessageCharacters.
+  </summary>
+</histogram>
+
+<histogram name="JSDialogs.CountOfJSDialogMessageCharacters" units="characters">
   <owner>avi@chromium.org</owner>
   <summary>
     The count of the number of characters in JavaScript dialog messages.
@@ -20653,7 +20670,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="JSDialogs.CountOfOnBeforeUnloadMessageCharacters">
+<histogram name="JSDialogs.CountOfOnBeforeUnloadMessageCharacters"
+    units="characters">
   <obsolete>
     Deprecated 2016-02.
   </obsolete>
@@ -20712,6 +20730,22 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="JSDialogs.SiteEngagementOfBeforeUnload" units="%">
+  <owner>avi@chromium.org</owner>
+  <summary>
+    The site engagement values of sites showing onbeforeunload dialogs. Logged
+    once per dialog, whether shown or suppressed.
+  </summary>
+</histogram>
+
+<histogram name="JSDialogs.SiteEngagementOfDialogs" units="%">
+  <owner>avi@chromium.org</owner>
+  <summary>
+    The site engagement values of sites showing dialogs. Logged once per dialog,
+    whether shown or suppressed.
+  </summary>
+</histogram>
+
 <histogram name="Keyboard.KeystrokeDeltas" units="ms">
   <obsolete>
     Deprecated 07/2016 in crbug.com/631204 with KeyboardUmaEventFilter removal.
@@ -100956,6 +100990,14 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="DNS.PrefetchResolution"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="JSDialogs.EngagementList" separator=".">
+  <suffix name="EngagementNone" label="site engagement = 0"/>
+  <suffix name="EngagementLessThanOne" label="site engagement &lt; 1"/>
+  <suffix name="EngagementOneToFive" label="site engagement &gt;= 1, &lt; 5"/>
+  <suffix name="EngagementHigher" label="site engagement &gt;= 5"/>
+  <affected-histogram name="JSDialogs.CharacterCount"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="LateBindingExperiment">
   <suffix name="disable_late_binding" label="socket late binding is disabled"/>
   <suffix name="enable_late_binding" label="socket late binding is enabled"/>